convert to python-single-r1 wrt #467234 and fix build with automake-1.13 wrt #467228

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 178 insertions, 3 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index f05607d7a9da..b136c651c34e 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,14 @@
 # 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.196 2012/12/27 17:25:24 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.197 2013/05/01 13:33:22 hasufell Exp $
+
+*inkscape-0.48.4-r1 (01 May 2013)
+
+  01 May 2013; Julian Ospald <hasufell@gentoo.org> +inkscape-0.48.4-r1.ebuild,
+  +files/inkscape-0.48.4-automake-1.3.patch,
+  +files/inkscape-0.48.4-epython.patch:
+  convert to python-single-r1 wrt #467234 and fix build with automake-1.13 wrt
+  #467228
 
   27 Dec 2012; Agostino Sarubbo <ago@gentoo.org> -inkscape-0.48.3.1.ebuild:
   Remove old
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 4f283f1d5742..373e36dbc96e 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,10 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
 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-automake-1.3.patch 408 SHA256 b08e8dd941ef6f9b836f21e1a2b6f1bde4ed9ec8c4e41a3c8c3592a5b0c2635c SHA512 1e63ba31537976bd3007db76d0ec20200d5d12af30723c57ca940381573c92f14707b7da67aad5eb74027171aa6fe421a1dfce8c7228803810b684e45b107008 WHIRLPOOL c3b23563a4f986ec7cdaea3b69d1fdf7c86482e88ca05a977b3f422a1079d0856bbe9017a6728d194827c1674c61c8982255b1804b29e8620cfcd1895b6b519e
+AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08aa444e45c32ccd564f6962304f3cdb SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 WHIRLPOOL 768acee72f3747fdb23a5bdf0665364a316c8b6d9abaa582a7d897153b38f271db25bc1a9c2d4893a45021f1098565dbedba77360add0d50404f2320cb134d87
 AUX inkscape-0.48.4-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
 AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
+EBUILD inkscape-0.48.4-r1.ebuild 2900 SHA256 63efe1a04e503634f0ac506dbf8839cc18318e17f6731d98cef41eb0f5605748 SHA512 c349c0c84ddcd5cc2ed0ad410767438249109ea46ab62650fbef165046fc7d402c44dc6aa0114931bad7f6b3c7be6d7ddd0772d698f7b3dbf7c8694c87458a6a WHIRLPOOL 9f4ecb0f812dda5d108b1a3be31976539072466e4bf2007b19178287260af7f870d6347086d2a30334710b33bf0a329480bb5153834b5cd572c5ac22ca750f2a
 EBUILD inkscape-0.48.4.ebuild 2579 SHA256 d2d9a8687e1d4d5df0fcb4c9bdba7323fc34ed480f3a8c7016a50fbbebd8ab81 SHA512 aeba369b32633ae8db9c68b833879ca1c0850cd2b227f7807f667c9df009d6e89b04fa97f3c934ed41ef932939341520c1bdcbbd7015ccd60ecbf48bede6877b WHIRLPOOL 8b98a96a6fd6ad8698952550e4076a889601f4405d4028b79ca27677551085b2cde45e44fd45d33ad5287a32e81f8005dfc28aedff50d65c9c90e79eb3104124
-MISC ChangeLog 27609 SHA256 1c41746fb5f7020393a756f1cee39f0aa1097c6cef3711e8cb44a07308439272 SHA512 3c6edbc3e293babb8404faf7cfbe4d460a15da4f879f24181a7c5bfbee174033d150a91633350c3384a95a28626456a30b5962342cd7db4c2b83b46f4cdcd4d5 WHIRLPOOL bf1a09de10f197c87bdc075d4239bd3f4b6aa596c17b453437d880cd49280bf72be63bcbe7ab52febba120eb8dcd801dac351cb4c916d757ac50450bfdf8c51e
+MISC ChangeLog 27903 SHA256 8e0b95402b13b201c4ab172e8aa3b304aa4eebfbd6d8e985f35d1eb104aa460b SHA512 80ec4988bd3c763f050837ff254e9c194fb8e6d2e506d3128f7aa8122c835d466b78120cb955002360baf5266ba6891f8dec7c8f6b75806ef5ca65cbbbcd98e5 WHIRLPOOL 22bcb5313baa9fe49a0acc1129d99d979f2c7eee30176522248206529dfc288148e213278ef67df3819f63bc33f0fa93d797d43ecf4793b99c49939d2d1b4b3f
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRgRmnAAoJEFpvPKfnPDWz2NwH/0TC0efAU7e20q3NfZWioocm
+zlObF/FSTpl0HaMl/LiIu534QnuXcsl3h+CmUMXJtsckXgSuNKVWbvuAcVHn5sPY
+axfUx9ctt6Xtcsp+m1KI2EskK06BeaucWR/s2jzlV18dIwe1s1fTfQqwC2hQT4Kx
+ZSIQW1o3Vlpj80YGnCNKcIvwfozlTXMxo1C5YrdY7kzazjEpjlLJ6Ci2K0h4AFok
+2M4azGM4BfRHOs+puWzGuTJMvoPglEvM1dEShx+5qG+0JqaFU4W+vhIlGK7dPGSH
+RanJC2TW34biCbZOuGYX13Lt7TNYtaqi+2rhbr/qKIFdAdDpreDorZW+a/WDyPI=
+=nO1t
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch
new file mode 100644
index 000000000000..6d649da99dea
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Apr 25 15:06:01 UTC 2013
+Subject: fix building with automake-1.3
+
+--- inkscape-0.48.4/configure.ac
++++ inkscape-0.48.4/configure.ac
+@@ -21,12 +21,12 @@
+   export CC CXX
+ ])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_LANG(C++)
+ AC_ISC_POSIX
+ AC_PROG_CXX
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_AS
+ AC_PROG_RANLIB
+ AC_PROG_INTLTOOL(0.22)
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
new file mode 100644
index 000000000000..2e2483c1b1e3
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-epython.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", "@EPYTHON@" },
+ #endif
+         {"ruby",   "ruby-interpreter",   "ruby"   },
+         {"shell",  "shell-interpreter",  "sh"     },
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
new file mode 100644
index 000000000000..62129ba8e211
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/05/01 13:33:22 hasufell Exp $
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1
+
+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="
+	${PYTHON_DEPS}
+	>=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[${PYTHON_USEDEP}]
+	media-gfx/imagemagick[cxx]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	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[${PYTHON_USEDEP}]
+	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}"/${PN}-0.48.4-epython.patch \
+		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
+		"${FILESDIR}"/${PN}-0.48.4-automake-1.3.patch
+
+	sed -i \
+		-e "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang 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)"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}