Version bump. Restrict python extensions to python2 (bug #421111) and respect AR (bug #443694).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 137 insertions, 9 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index e19daf08656a..3806fa14e2e2 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.188 2012/11/10 02:59:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.189 2012/12/18 08:20:07 radhermit Exp $
+
+*inkscape-0.48.4 (18 Dec 2012)
+
+  18 Dec 2012; Tim Harder <radhermit@gentoo.org> +inkscape-0.48.4.ebuild,
+  +files/inkscape-0.48.4-python2.patch:
+  Version bump. Restrict python extensions to python2 (bug #421111) and respect
+  AR (bug #443694).
 
   10 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> inkscape-0.48.3.1.ebuild:
   Drop usage of boost-utils since it's now pointless.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e9b2b01db3b8..43bd1a1b04e2 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,19 +5,22 @@ AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b
 AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
 AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92
 AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a
+AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef SHA512 6f64eea80f19734824de4565698da53d9b033cadef6de0913c88ede5c50a34feb5f500a6c3fe3312f6c8bbaf3a7b6d54680ea0386349076c162c0ecc7b8547d9 WHIRLPOOL dabe6c089491250b3555214beb3e2f45e42bc1a915e7ea8cd89f1e34d2d622c940918808f8a8eb963013769fa218acb3bea1bbf28ce6b5f867b84ab815809aa7
 DIST inkscape-0.48.3.1.tar.bz2 19688778 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88 SHA512 8b1d75daf2ea6f84d70117381b9e1674a70de5783e08f4095f0ca6f81726096951459cfbde43be3e578fbc3a0b1a02f205de8570e70e167a795296a3eca5c8c3 WHIRLPOOL 427b57006df728bba05c0e79b2c7aa6f81f63ed3475393f1bae1356e6b0af07d1bc0aaee73111902d82d28ccd1c9ce4db51ce10333e03221e60d786007738b4f
+DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
 EBUILD inkscape-0.48.3.1.ebuild 2569 SHA256 d549398a8c5a9842a2e021660617d3b33f8594b2a437b8e3d376535707b25aff SHA512 5ef5f829021f3b33b7e03c5d6e337742e8a7dc36aae34d37687a9c0f25e066b60518db09d9c0be43b3618f95ccb6bb8bf33f609a162063a5d04dd2f7402b8ed7 WHIRLPOOL 74c4723ae6a7fc950628e9ad46f3bc0fb80e2843be4e4ded1a1a11f172c3b44d2cd8a102a407adc4ab867f304f01193375e4a3544ecf865afdcf915b909657f4
-MISC ChangeLog 26556 SHA256 50b5abe0c82f5caf723d5ddf4bd52a36ea9aaf1e4922582d72735e0fa7ab6d09 SHA512 d4f3858d7a21fe30b8ff2a3ee91f2930dfb20eaa86f32a3d257f3234dab52b4de0326b1c058d8bdaa411efa99f2576e76b308dc7e4f48189a3b9e639eff808f8 WHIRLPOOL 39eb81653fbe439d06c484fe9cf348d697997ac857f23a93ac535080429c9392c3ce822e921e6fbf10f8253661d2814333eb6aac3613f90946566e0e023ee5e2
+EBUILD inkscape-0.48.4.ebuild 2537 SHA256 3c9e7d6bb1465ca2ca05b4e2a42527317d54cddcac4a7913f534cc746846d0fe SHA512 bd3ff4eda15e59cfa596d2d8dbc51359fd69fc624d73f04b1ae0d2e2788715dab4e2ec5540c846c1025d72a60787ec88a263b05e2eb5bf58dd97133f688fc093 WHIRLPOOL 8d8103bad0a7e08bc5d50ecf34c72945bf9b7348a988affaecc510c14cbff5d64c52fd83b0e2a6060370b3bd849246882ad678958d7f0befb0149c2bd8b89b20
+MISC ChangeLog 26803 SHA256 23aee771cd7ab51ab13fa9cde11b993a3479685f7e7e68d7701950d0a7f15365 SHA512 edff80e63560499f85f81d843ae7f1f23ad976ae3bce4fb8d53fb4fda9daff8f81c9975c12063d3febdc7f3c311a41f1b22f31e7a7cbd689679863d4fea278f4 WHIRLPOOL 4688e834477046c85d1139442f059df3b9ea43c38172bb3ba86b92a4b63af1cb7dc7e0497f49063ce01158e131fbe6975d126c67f1cf00f169ee15f64e2ae9a0
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQncNUAAoJEBzRPIrUMBNCvykIAJyQ7jO2JxHWG56kXq0YG3ud
-Ps/uAUxR7VvtNnBRgmL6wBtrUVrd8Z9iblnLQF0J6XVciTg2LuZ+M+S702QlXLJe
-7uJlZSt8GBYTGDPCAsjxq00vkFiTjAsTckJv9wOCFb6aTjammfKLMx40l3AAhSP0
-GaLGS7PiP6uLtYXcjPtheB5CBEOpwu/FWv0F3H27suK41KVqngcGmTFT95Xgh/ln
-5UiQGgnJEh/riSflZxbmH70daPWAfmSS3aQycg2eJ2MQmu9D5+ygb63+dhmKrWd8
-QhXwgolM95DrND7o2YhW5AVs4PKFE2DAgETNBWHOdelC3RogVaaZwrbPg0L4XBQ=
-=6doO
+iQEcBAEBCAAGBQJQ0Cc8AAoJEEqz6FtPBkyjEZwH/0DB25Qt7pJzrKEHeS/EeyRw
+kJZhK9WHtGxMby8upRw63aMLrK0vXYnxIRPwwinivloqJ//wwCRqj26bJ+8yNRH0
+eBP6y6KcZKkSFRAmKukVnzG9gsUWPuR9qfB/VItaH+HIqQsK8fbr7+EsCKjtuF+6
+DY7Je+isaPnt9VkKkgiUoddgGqtXX24zIcHoAyWa8A0FDzak034VrGtPwgOiEeps
+cypS4JtKZFoOtN7U9XfhmVUmLVZ/AfcKObCyuAd0s/wGpHM9FLI38R2PL3H5lvY2
+h6qE72TphLJMtOwFFFaN5W9EiESZzRzbL3EJKdADhjjdqr/47Z1BOnG8Xr1F7e0=
+=+Pdv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch b/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch
new file mode 100644
index 000000000000..a586053e9192
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.48.4/src/extension/implementation/script.cpp
++++ inkscape-0.48.4/src/extension/implementation/script.cpp
+@@ -89,7 +89,7 @@
+ #ifdef WIN32
+         {"python", "python-interpreter", "pythonw" },
+ #else
+-        {"python", "python-interpreter", "python" },
++        {"python", "python-interpreter", "python2" },
+ #endif
+         {"ruby",   "ruby-interpreter",   "ruby"   },
+         {"shell",  "shell-interpreter",  "sh"     },
diff --git a/media-gfx/inkscape/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
new file mode 100644
index 000000000000..546b3febfdbe
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.1 2012/12/18 08:20:07 radhermit Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+
+GCONF_DEBUG=no
+
+inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
+	dev-cpp/glibmm
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/glib-2.6.5
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml
+	media-gfx/imagemagick[cxx]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/libpng-1.2
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	sci-libs/gsl
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.4.0
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/numpy
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog NEWS README*"
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
+		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
+		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
+		"${FILESDIR}"/${P}-python2.patch
+
+	eautoreconf
+
+	# bug 421111
+	python_convert_shebangs -r 2 share/extensions
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--without-perl
+		--enable-poppler-cairo
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_enable lcms)
+		$(use_enable nls)
+		$(use_with spell aspell)
+		$(use_with spell gtkspell)"
+
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}