Fix poppler depend.

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

5 files changed, 23 insertions, 37 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 00d0a9427be7..019efd5056b5 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.378 2010/01/24 02:02:00 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.379 2010/02/10 19:46:08 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> cups-1.3.11-r1.ebuild,
+  cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
+  Fix poppler depend.
 
   24 Jan 2010; Jonathan Callen <abcd@gentoo.org> cups-1.4.2-r1.ebuild:
   Depend on virtual/poppler-utils, not app-text/poppler-utils
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index a31218ed63a3..7015184668b1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6
 AUX cups-1.3.11-str3200.patch 1782 RMD160 6c9134d1bc90650b882e167a5ae118d0f239b7ae SHA1 adb5b0ef222ad5beb2424bcb93a3c891af6a744e SHA256 2ae6d48ce7071051120740d654787be1bba0258752f4844f55a18f8e03e062e6
@@ -13,15 +10,8 @@ AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
 DIST cups-1.4.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314
-EBUILD cups-1.3.11-r1.ebuild 8581 RMD160 9088f77a46216bf250c060e700e5119b8401c332 SHA1 c36fec7384060c4b59435e3439d27cb16de544c6 SHA256 3badfa053ffa166509b81870afc82d7b49bd0ec5b3e590a9f82a93da298412e9
-EBUILD cups-1.3.11-r2.ebuild 8788 RMD160 27869c67c0ee76cae59cc1c4079718967c08dedb SHA1 d1656886260fe4497cd179082214358158209326 SHA256 a6b47ac96c44b751401cd42e2c9c0ffbab5278b3aab2bb8f1bbc24ef935a270a
-EBUILD cups-1.4.2-r1.ebuild 5304 RMD160 717c3060bbe65879d606d9ae2e39c5446e050b7b SHA1 b15168e3bdbbb549a17b8f76ab10755b818ce645 SHA256 c941697a450108429a754f2acfa27074715f0e844b5858971de9e78d5160654b
-MISC ChangeLog 56430 RMD160 7bf945d5ff54af6a162ea6c6434595f1a84b9087 SHA1 06820ff7a7f5bef824aa9cea84b81e7d4377e122 SHA256 ff3379aac92981a8031689203ae4beff27d3f91a643f0a9614b216f578814b8d
+EBUILD cups-1.3.11-r1.ebuild 8546 RMD160 424bb5b7e46f0b279ef142c775c787ef2e1a555c SHA1 fbcbc4cf5df0fd0cdf85cf069b4072acbdda4215 SHA256 edd70140731bf5ba0a76ff29d4fddcc1be658cb4924198a5bc56deca12c30859
+EBUILD cups-1.3.11-r2.ebuild 8752 RMD160 a00ac578043eeeba36c56aef2ea4da7eb4f5c8c0 SHA1 1cef429b1261025e87263110ae2b01aeba68835a SHA256 e25c684f58ad5de37e33ef489b3b6023b9d8affdf0e454db3d9e8a47f9559462
+EBUILD cups-1.4.2-r1.ebuild 5323 RMD160 87ed7dd322794b292e7af4f263aec4f1eff2b1d9 SHA1 b2a1b588f6b109205ca887df672d1ac6d10a11b9 SHA256 015be68130d5d43e8f90ec7fcdd433e409c3707d9869b634aad2c1362d492e20
+MISC ChangeLog 56582 RMD160 549ed2d5813ad0144f84f99424b42b48fcac8601 SHA1 27a41fc10ba4c7dffcc26d321e2bba25127627b8 SHA256 7dd4ad4f8990588bc89a4a2276488bba23d8a5e402085c9e1a6a33d390977968
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktbqh8ACgkQOypDUo0oQOqLKgCgwfkpUpS35h2CaJrFnfuL1PK5
-MT4AoKfUEvKHc0ZgIbEqzbWr4T9YIOkN
-=AepA
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild
index 5185f2684862..5d9a30b1bc02 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.9 2009/12/26 19:42:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.10 2010/02/10 19:46:08 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
 
 MY_P=${P/_}
@@ -43,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=virtual/poppler-utils-0.4.3-r1
+	>=app-text/poppler-0.12.3-r3[utils]
 	"
 
 PDEPEND="
@@ -91,10 +92,7 @@ pkg_setup() {
 	enewgroup lpadmin 106
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# disable configure automagic for acl/attr, upstream bug STR #2723
 	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
 
@@ -114,7 +112,7 @@ src_unpack() {
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	# Fails to compile on SH
 	use sh && replace-flags -O? -O0
 
@@ -186,8 +184,6 @@ src_compile() {
 	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
 	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
 	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-print/cups/cups-1.3.11-r2.ebuild b/net-print/cups/cups-1.3.11-r2.ebuild
index 124aebc58e40..d1cf3872cda7 100644
--- a/net-print/cups/cups-1.3.11-r2.ebuild
+++ b/net-print/cups/cups-1.3.11-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.2 2009/12/26 19:42:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.3 2010/02/10 19:46:08 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
 
 MY_P=${P/_}
@@ -43,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=virtual/poppler-utils-0.4.3-r1
+	>=app-text/poppler-0.12.3-r3[utils]
 	"
 
 PDEPEND="
@@ -91,10 +92,7 @@ pkg_setup() {
 	enewgroup lpadmin 106
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# disable configure automagic for acl/attr, upstream bug STR #2723
 	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
 
@@ -117,7 +115,7 @@ src_unpack() {
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	# Fails to compile on SH
 	use sh && replace-flags -O? -O0
 
@@ -189,8 +187,6 @@ src_compile() {
 	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
 	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
 	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-print/cups/cups-1.4.2-r1.ebuild b/net-print/cups/cups-1.4.2-r1.ebuild
index 27c1d3bf36ee..69087fed7bc1 100644
--- a/net-print/cups/cups-1.4.2-r1.ebuild
+++ b/net-print/cups/cups-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.3 2010/01/24 02:02:00 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.4 2010/02/10 19:46:08 ssuominen Exp $
 
 EAPI="2"
 
@@ -36,7 +36,7 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	app-text/libpaper
 	dev-libs/libgcrypt
 	dev-libs/libusb
-	virtual/poppler-utils
+	>=app-text/poppler-0.12.3-r3[utils]
 	!net-print/cupsddk"
 
 DEPEND="${COMMON_DEPEND}"