Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. Also use EAPI=2.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 17 insertions, 29 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 60a6abae8bc1..cc407298c79f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX inkscape-0.46-bug-174720-0.patch 908 RMD160 ea73954482813cac9644d7dbe99c2f27d1ed9722 SHA1 354f42f93974519391492cda599887dbf89f24ea SHA256 0c42debc80f1cbc254a49f3a737bbadaa8a975d81a850b2448bd1267500ee66e
 AUX inkscape-0.46-bug-174720-1.patch 862 RMD160 c356fe9abfcc79575dcfe58b13240a7ad3939a00 SHA1 b6d3e2f821f0dc877ccb1ff3c5f751406daff767 SHA256 e038344cdb69176eaba5ff5f67e5eea5690608bd69e5b5e4e47b491d55a82394
 AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da11f5291 SHA1 c7e492fcbebc8a417e61eb56f8bc70fe2e78eab5 SHA256 e4d74045d8e30289d6d7095461dbe3df083fd4fbc664f1944763bb6e71170226
 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 2309 RMD160 d90912566be8ad492e8b6b2804a5cdd2c0829680 SHA1 b22401cd47e61973bd3301327911b32ba6f89137 SHA256 9d9bb528a00cdaf9b44a26aec9bbe4d84fc573362fde3bedae7d577d9a89c1e0
-MISC ChangeLog 14810 RMD160 65d84f24eb312a107d230ed42e81933fea893835 SHA1 0370fb0b66fcf4dcc3c482ba047234d926012bbb SHA256 56b2933bb5d35450152797780f2f38c12ef992ef32874305742922b55a10810d
+EBUILD inkscape-0.46-r5.ebuild 2302 RMD160 7f5fc188623eb87270fe60dcc00161ecce29d034 SHA1 a0a7e0d232b5ba88692f17627ff4a67b8be1f18b SHA256 da02d45705eedf78fd857a90a82b06c1b12c393d3cb8b4e4f38123d668ec3439
+MISC ChangeLog 14970 RMD160 e4fb7d7a94f8199102608027fc3de3190aa3392d SHA1 d29e7f26014ba6d4575c1d332fc8a5ccea32004c SHA256 dcb7be1967094a8e428d5093bd612f3c7bcef27ea550ef7f4ab6c860db8ac876
 MISC metadata.xml 458 RMD160 90cb8f8058926fe666fc2dbec1af647248210f6c SHA1 9af2ef1f67bb9be6e9eecb2dc2f70badeb6277b1 SHA256 52763c744f2f6615fd6f900c3843356432ead07777ebdb548836b1e4fbed20ca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm0QZsACgkQkKaRLQcq0GLJpACgmunA3mO/7n39eWuDje1mZIHw
-FzoAnR5S+w0SEfZ2LCJTG0WBpoR7owga
-=EbYs
------END PGP SIGNATURE-----
diff --git a/media-gfx/pdf2svg/ChangeLog b/media-gfx/pdf2svg/ChangeLog
index e12833ad5fc8..e7deec3984b5 100644
--- a/media-gfx/pdf2svg/ChangeLog
+++ b/media-gfx/pdf2svg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pdf2svg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pdf2svg/ChangeLog,v 1.1 2008/06/27 13:05:44 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pdf2svg/ChangeLog,v 1.2 2009/03/30 13:40:33 loki_val Exp $
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> pdf2svg-0.2.1.ebuild:
+  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
+  Also use EAPI=2.
 
 *pdf2svg-0.2.1 (27 Jun 2008)
 
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index 2412b5b943de..be5bae7c8bd0 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2svg-0.2.1.tar.gz 77601 RMD160 ccf1c6304ecb0fe4c54164996f4cf785a6ebaf22 SHA1 12f9d1bde6aa2e396eb7f196b6d8e29ade3cafe6 SHA256 96e6902e0bca6aeb70f3c6621d0d95b346b14c6a0282c12c1e7635f67af0c74b
-EBUILD pdf2svg-0.2.1.ebuild 987 RMD160 b78ebd9108e6378c5e4b50dfde2faf7442ecf843 SHA1 3989f1fe30d96463790c69fcf90873a7f91af076 SHA256 90f90905a3d3c63c747897c1c27cdb1c32638907a44c18d8b96bfd6d87471613
-MISC ChangeLog 364 RMD160 6199d5330f8d84356c5e5e3cff82f306c988abe9 SHA1 e64430a2c8e18578ab96e91dafda71160343cd77 SHA256 ec0e7c5f5dd41fc96250b23c156e94b0479f3c7d64a92cbdfb0b8c109defc47f
+EBUILD pdf2svg-0.2.1.ebuild 878 RMD160 e679299c60793329a055d5dd742cc8ef6654af8d SHA1 ba4ee3b016b279c4d25b53fa661442762f1723d5 SHA256 de9226d1fcb7c1355f33ba38a4ba9b29a345158d2004165d99802d3b70de5a0d
+MISC ChangeLog 540 RMD160 19a551880fb080adeb113f0099d4b49dd0665287 SHA1 3247b6e0a7411b95a8aa098b35b8bec2afe4e651 SHA256 6f2a994fdc2118adc8e0f7c5c8671b94ddfb0881bbcc714c986f0888a16197b8
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
index b1621df20069..5d63cd75bc0d 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild,v 1.1 2008/06/27 13:05:44 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild,v 1.2 2009/03/30 13:40:33 loki_val Exp $
+
+EAPI=2
 
 inherit eutils
 
@@ -13,21 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=app-text/poppler-0.5.4
-	>=x11-libs/cairo-1.2.6
+RDEPEND=">=virtual/poppler-glib-0.5.4[cairo]
+	>=x11-libs/cairo-1.2.6[svg]
 	>=x11-libs/gtk+-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo svg; then
-		die "Re-emerge x11-libs/cairo with USE svg."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i -e \
 		's:#include <stdio.h>:#include <stdio.h>\n#include <stdlib.h>:' \
 		${PN}.c || die "sed failed."