use EAPI=2 and replace built_with_use with USE-deps, solves bug #261235

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 18 insertions, 25 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 7cec0b43aeb8..7d629136e014 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.111 2009/01/04 23:14:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.112 2009/03/08 22:05:44 maekke Exp $
+
+  08 Mar 2009; Markus Meier <maekke@gentoo.org> inkscape-0.46-r5.ebuild:
+  use EAPI=2 and replace built_with_use with USE-deps, solves bug #261235
 
   04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> inkscape-0.46-r5.ebuild:
   Change virtual/xft dependency to x11-libs/libXft, bug 253771.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 74c965054ddb..60a6abae8bc1 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -7,13 +7,13 @@ AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da1
 AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
 AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
-EBUILD inkscape-0.46-r5.ebuild 2737 RMD160 a7957a826147bbb2cbc978dc857b854cc2403651 SHA1 7c8784fead3a656486c076666e6c942d8fe1714b SHA256 367927de308a110a77e0080c3087810f44f8fcd09393f2292db6d94de2aeca5a
-MISC ChangeLog 14659 RMD160 52fd6f227ebde4a2722842bad24b3baf35428984 SHA1 a97455ca44df7ecfcf48e4790e0e0c9336fc4eb8 SHA256 9ed32b0c3571835c48e1ae0a32cc2155ba6bc5e057fb171b6a57a47c27b03b41
+EBUILD inkscape-0.46-r5.ebuild 2309 RMD160 d90912566be8ad492e8b6b2804a5cdd2c0829680 SHA1 b22401cd47e61973bd3301327911b32ba6f89137 SHA256 9d9bb528a00cdaf9b44a26aec9bbe4d84fc573362fde3bedae7d577d9a89c1e0
+MISC ChangeLog 14810 RMD160 65d84f24eb312a107d230ed42e81933fea893835 SHA1 0370fb0b66fcf4dcc3c482ba047234d926012bbb SHA256 56b2933bb5d35450152797780f2f38c12ef992ef32874305742922b55a10810d
 MISC metadata.xml 458 RMD160 90cb8f8058926fe666fc2dbec1af647248210f6c SHA1 9af2ef1f67bb9be6e9eecb2dc2f70badeb6277b1 SHA256 52763c744f2f6615fd6f900c3843356432ead07777ebdb548836b1e4fbed20ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAklhQvQACgkQOeoy/oIi7uxhJgCfRNrutikhdzP5ZsSt3OGEbERa
-EKUAoLDQGZh22qcxDZ/pjHwgMyifFtXk
-=UrxY
+iEYEARECAAYFAkm0QZsACgkQkKaRLQcq0GLJpACgmunA3mO/7n39eWuDje1mZIHw
+FzoAnR5S+w0SEfZ2LCJTG0WBpoR7owga
+=EbYs
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.46-r5.ebuild b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
index c53bc6ea28e9..879efaef1254 100644
--- a/media-gfx/inkscape/inkscape-0.46-r5.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.9 2009/01/04 23:14:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.10 2009/03/08 22:05:44 maekke Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils
 
@@ -15,7 +17,7 @@ IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	>=app-text/poppler-bindings-0.8.3
+	>=app-text/poppler-bindings-0.8.3[cairo,gtk]
 	dev-cpp/glibmm
 	>=dev-cpp/gtkmm-2.10.0
 	>=dev-libs/boehm-gc-6.4
@@ -50,7 +52,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/numpy
 	dia? ( app-office/dia )
-	postscript? ( >=media-gfx/pstoedit-3.44 media-gfx/skencil )
+	postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
 	wmf? ( media-libs/libwmf )"
 
 DEPEND="${COMMON_DEPEND}
@@ -60,17 +62,6 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.29"
 
 pkg_setup() {
-	# bug 207070
-	if use postscript && ! built_with_use media-gfx/pstoedit plotutils ; then
-		eerror "you need to emerge media-gfx/pstoedit with plotutils support."
-		die "remerge media-gfx/pstoedit with USE=\"plotutils\""
-	fi
-	# bug 213026 and bug 213706
-	if ! built_with_use app-text/poppler-bindings cairo ; then
-		eerror "you need to emerge app-text/poppler-bindings with cairo	support."
-		die "remerge app-text/poppler-bindings with USE=\"cairo\""
-	fi
-
 	G2CONF="${G2CONF} --with-xft"
 	G2CONF="${G2CONF} $(use_with spell gtkspell)"
 	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
@@ -81,15 +72,14 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_with perl)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
 	epatch "${FILESDIR}"/${P}-bug-174720-1.patch
 	epatch "${FILESDIR}"/${P}-bug-214171.patch
+
+	gnome2_src_prepare
 }
 
 DOCS="AUTHORS ChangeLog NEWS README"