4 files changed, 19 insertions, 23 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/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}"