summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-03-08 22:20:59 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-03-08 22:20:59 +0000
commit444d597cbd17519c767cc78c6fe90bfa660d5aa6 (patch)
tree47602a632d2840eddf6f9feae3103911bdce06a1 /net-print
parentEAPI=2; update HOMEPAGE and SRC_URI (bug #308425) (diff)
downloadgentoo-2-444d597cbd17519c767cc78c6fe90bfa660d5aa6.tar.gz
gentoo-2-444d597cbd17519c767cc78c6fe90bfa660d5aa6.tar.bz2
gentoo-2-444d597cbd17519c767cc78c6fe90bfa660d5aa6.zip
Fixed cyclic dependency with app-text/poppler[utils]:
- --with-pdftops add absolute path to disable pdftops autodetection - moved poppler[data] to PDEPEND - moved blocks to RDEPEND - formatted deps for greated readability (Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.3.11-r1.ebuild61
-rw-r--r--net-print/cups/cups-1.3.11-r2.ebuild61
-rw-r--r--net-print/cups/cups-1.4.2-r1.ebuild39
4 files changed, 103 insertions, 64 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 019efd5056b5..deca972ad556 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.379 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.380 2010/03/08 22:20:59 reavertm Exp $
+
+ 08 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> cups-1.3.11-r1.ebuild,
+ cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
+ Fixed cyclic dependency with app-text/poppler[utils]
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:
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild
index 5d9a30b1bc02..f00bcf12cfd0 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-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.3.11-r1.ebuild,v 1.10 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.11 2010/03/08 22:20:59 reavertm Exp $
EAPI=2
inherit autotools eutils flag-o-matic multilib pam
@@ -16,7 +16,15 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+ app-text/libpaper
+ dev-libs/libgcrypt
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
@@ -30,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
png? ( >=media-libs/libpng-1.2.1 )
python? ( dev-lang/python )
slp? ( >=net-libs/openslp-1.0.4 )
- ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+ ssl? (
+ !gnutls? ( >=dev-libs/openssl-0.9.8g )
+ )
tiff? ( >=media-libs/tiff-3.5.5 )
xinetd? ( sys-apps/xinetd )
- zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
- app-text/libpaper
- dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
- !<net-print/foomatic-filters-ppds-20070501
- !<net-print/hplip-1.7.4a-r1"
-
+ zeroconf? (
+ !avahi? ( net-misc/mDNSResponder )
+ )
+"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
+ !<net-print/foomatic-filters-ppds-20070501
+ !<net-print/hplip-1.7.4a-r1
!virtual/lpr
X? ( x11-misc/xdg-utils )
- >=app-text/poppler-0.12.3-r3[utils]
- "
-
+"
PDEPEND="
- ppds? ( || (
- (
+ app-text/ghostscript-gpl
+ >=app-text/poppler-0.12.3-r3[utils]
+ ppds? (
+ || (
+ (
+ net-print/foomatic-filters-ppds
+ net-print/foomatic-db-ppds
+ )
net-print/foomatic-filters-ppds
net-print/foomatic-db-ppds
+ net-print/hplip
+ net-print/gutenprint
+ net-print/foo2zjs
+ net-print/cups-pdf
)
- net-print/foomatic-filters-ppds
- net-print/foomatic-db-ppds
- net-print/hplip
- net-print/gutenprint
- net-print/foo2zjs
- net-print/cups-pdf
- ) )
+ )
samba? ( >=net-fs/samba-3.0.8 )
- app-text/ghostscript-gpl"
+"
PROVIDE="virtual/lpr"
@@ -157,7 +168,7 @@ src_configure() {
--with-cups-group=lp \
--with-docdir=/usr/share/cups/html \
--with-languages=${LINGUAS} \
- --with-pdftops=pdftops \
+ --with-pdftops=/usr/bin/pdftops \
--with-system-groups=lpadmin \
--with-xinetd=/etc/xinetd.d \
$(use_enable acl) \
diff --git a/net-print/cups/cups-1.3.11-r2.ebuild b/net-print/cups/cups-1.3.11-r2.ebuild
index d1cf3872cda7..fe2c010389a1 100644
--- a/net-print/cups/cups-1.3.11-r2.ebuild
+++ b/net-print/cups/cups-1.3.11-r2.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.3.11-r2.ebuild,v 1.3 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.4 2010/03/08 22:20:59 reavertm Exp $
EAPI=2
inherit autotools eutils flag-o-matic multilib pam
@@ -16,7 +16,15 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+ app-text/libpaper
+ dev-libs/libgcrypt
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
@@ -30,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
png? ( >=media-libs/libpng-1.2.1 )
python? ( dev-lang/python )
slp? ( >=net-libs/openslp-1.0.4 )
- ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+ ssl? (
+ !gnutls? ( >=dev-libs/openssl-0.9.8g )
+ )
tiff? ( >=media-libs/tiff-3.5.5 )
xinetd? ( sys-apps/xinetd )
- zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
- app-text/libpaper
- dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
- !<net-print/foomatic-filters-ppds-20070501
- !<net-print/hplip-1.7.4a-r1"
-
+ zeroconf? (
+ !avahi? ( net-misc/mDNSResponder )
+ )
+"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
+ !<net-print/foomatic-filters-ppds-20070501
+ !<net-print/hplip-1.7.4a-r1
!virtual/lpr
X? ( x11-misc/xdg-utils )
- >=app-text/poppler-0.12.3-r3[utils]
- "
-
+"
PDEPEND="
- ppds? ( || (
- (
+ app-text/ghostscript-gpl
+ >=app-text/poppler-0.12.3-r3[utils]
+ ppds? (
+ || (
+ (
+ net-print/foomatic-filters-ppds
+ net-print/foomatic-db-ppds
+ )
net-print/foomatic-filters-ppds
net-print/foomatic-db-ppds
+ net-print/hplip
+ net-print/gutenprint
+ net-print/foo2zjs
+ net-print/cups-pdf
)
- net-print/foomatic-filters-ppds
- net-print/foomatic-db-ppds
- net-print/hplip
- net-print/gutenprint
- net-print/foo2zjs
- net-print/cups-pdf
- ) )
+ )
samba? ( >=net-fs/samba-3.0.8 )
- app-text/ghostscript-gpl"
+"
PROVIDE="virtual/lpr"
@@ -160,7 +171,7 @@ src_configure() {
--with-cups-group=lp \
--with-docdir=/usr/share/cups/html \
--with-languages=${LINGUAS} \
- --with-pdftops=pdftops \
+ --with-pdftops=/usr/bin/pdftops \
--with-system-groups=lpadmin \
--with-xinetd=/etc/xinetd.d \
$(use_enable acl) \
diff --git a/net-print/cups/cups-1.4.2-r1.ebuild b/net-print/cups/cups-1.4.2-r1.ebuild
index 69087fed7bc1..016abcfca388 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.4 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.5 2010/03/08 22:20:59 reavertm Exp $
EAPI="2"
@@ -17,7 +17,16 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +tiff X xinetd"
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+ app-text/libpaper
+ dev-libs/libgcrypt
+ dev-libs/libusb
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
java? ( >=virtual/jre-1.4 )
@@ -30,22 +39,26 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
png? ( >=media-libs/libpng-1.2.1 )
python? ( dev-lang/python )
slp? ( >=net-libs/openslp-1.0.4 )
- ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+ ssl? (
+ !gnutls? ( >=dev-libs/openssl-0.9.8g )
+ )
tiff? ( >=media-libs/tiff-3.5.5 )
xinetd? ( sys-apps/xinetd )
- app-text/libpaper
- dev-libs/libgcrypt
- dev-libs/libusb
- >=app-text/poppler-0.12.3-r3[utils]
- !net-print/cupsddk"
-
+"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
+ !net-print/cupsddk
!virtual/lpr
- X? ( x11-misc/xdg-utils )"
-
-PDEPEND="|| ( app-text/ghostscript-gpl[cups] app-text/ghostscript-gnu[cups] )"
+ X? ( x11-misc/xdg-utils )
+"
+PDEPEND="
+ || (
+ app-text/ghostscript-gpl[cups]
+ app-text/ghostscript-gnu[cups]
+ )
+ >=app-text/poppler-0.12.3-r3[utils]
+"
PROVIDE="virtual/lpr"
@@ -102,7 +115,7 @@ src_configure() {
--with-cups-group=lp \
--with-docdir=/usr/share/cups/html \
--with-languages="${LINGUAS}" \
- --with-pdftops=pdftops \
+ --with-pdftops=/usr/bin/pdftops \
--with-system-groups=lpadmin \
$(use_enable acl) \
$(use_enable dbus) \