Bump CUPS to 1.4.3

3 files changed, 65 insertions, 31 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index c5b7b63..e0d1fed 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-print/cups
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.4.3 (27 Apr 2010)
+
+  27 Apr 2010; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.1.ebuild,
+  +cups-1.4.3.ebuild:
+  Version bump.
+
   08 Dec 2009; Daniel Solano Gómez <gentoo@sattvik.com> Manifest:
   Updated manifest for correct source file length.
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 61f5b81..388c47e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -10,9 +10,9 @@ 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.10-source.tar.bz2 3778970 RMD160 9c8f5366f84b5f9087f7a29bace677db309a933f SHA1 48689f07104106216d35198cc90ed56df33faf38 SHA256 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
-DIST cups-1.4.1-source.tar.bz2 4449577 RMD160 d6db8ff3c7b0e56e147d227dcac0c8ca92f190cf SHA1 e53cadf8d9fa5b52b224fc29364a879feb0f3508 SHA256 cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba
+DIST cups-1.4.3-source.tar.bz2 4461101 RMD160 6c5ab282405d6a1132163c727583f3a572307d88 SHA1 0dd9e3d709614d26cce77728b9263556c94c9559 SHA256 47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97
 EBUILD cups-1.3.10-r2.ebuild 8377 RMD160 f8fc53e54687346ff6d199945297e13e47c34a4a SHA1 921b568a256079876fd5d0f10b9f1a2185cb8cf0 SHA256 1fdbd5e6130d71cdad5c33b5ce21a363882503a95295d04a19778a70e167df71
 EBUILD cups-1.3.11-r1.ebuild 8596 RMD160 b0d66238eb7208a6a7e6a90d2840579efaeb8ef5 SHA1 6cd1234623797c01391176cb8947dbeb4873a579 SHA256 06473c41740c28f1dd655faa4e781519cc6b7888fbbb8c9812ddde3db74d71a3
-EBUILD cups-1.4.1.ebuild 5125 RMD160 ab6a6ec500853bcee204f353e8d279f5594247a4 SHA1 5b42e16e212adddfcfdc2e1be93bd3bb9a9dbf9b SHA256 31aa6db1061e1425f0ba1c8a8a8265c09b4da5f6746b85571169547490c77ecd
-MISC ChangeLog 538 RMD160 fc6d2d9fc1846a808b9254e93911d2fbcd0ef59c SHA1 2760de7d36e707d2279282974e9ab62834f3c3e8 SHA256 03d6e9317627275b207e6a1ff5083d43293e1ca8b5562fd2db7b3f415b006e15
+EBUILD cups-1.4.3.ebuild 5401 RMD160 c25fce6488bd72dc0f9eabb17688b3c7072da79b SHA1 9c4b67e5e4ae736333aebec481b9aa4fd67b8c86 SHA256 28b1473f495412940f0163b0bf9388d9789d9f4d777ccd272cac15001c277623
+MISC ChangeLog 681 RMD160 442c66d470742d1af2a2b0612e3c0cc3c1fb69e3 SHA1 4ac032055cb605ea25e9a2920a4fa8b2ad12451d SHA256 1112b4995c3eac3d7c04ca8937fd3b9caa991a466aba04756f183c865ed67edc
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.4.1.ebuild b/net-print/cups/cups-1.4.3.ebuild
index 0745361..a8dcea9 100644
--- a/net-print/cups/cups-1.4.1.ebuild
+++ b/net-print/cups/cups-1.4.3.ebuild
@@ -1,10 +1,10 @@
-# 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.4.1.ebuild,v 1.2 2009/09/17 15:36:38 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.3.ebuild,v 1.1 2010/03/31 23:01:18 tgurr Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic multilib pam versionator
+inherit autotools eutils flag-o-matic multilib pam versionator
 
 MY_P=${P/_}
 
@@ -15,13 +15,21 @@ SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 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 zeroconf"
+IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +tiff +usb X xinetd"
 
-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
+		)
+	)
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
-	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg? ( >=media-libs/jpeg-6b:0 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam )
@@ -30,23 +38,24 @@ 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 )
+	usb? ( dev-libs/libusb )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	app-text/libpaper
-	app-text/poppler-utils
-	dev-libs/libgcrypt
-	dev-libs/libusb
-	!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/poppler-0.12.3-r3[utils]
+"
 
 PROVIDE="virtual/lpr"
 
@@ -57,6 +66,11 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 pkg_setup() {
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
@@ -64,14 +78,27 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# remove default optimizations and do not strip by default
+	sed -e 's:OPTIM="-Os -g":OPTIM="":' \
+		-e 's:INSTALL_STRIP="-s":INSTALL_STRIP="":' \
+		-i config-scripts/cups-compiler.m4
+
 	# create a missing symlink to allow https printing via IPP, bug #217293
 	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+
+	AT_M4DIR=config-scripts eaclocal
 	epatch "${FILESDIR}/${PN}-1.4.1-group_fix.patch"
+	eautoconf
 }
 
 src_configure() {
-	local myconf
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
 
+	local myconf
 	if use ssl || use gnutls ; then
 		myconf="${myconf} \
 			$(use_enable gnutls) \
@@ -88,9 +115,9 @@ src_configure() {
 		--with-cups-user=lp \
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
-		--with-pdftops=pdftops \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
-		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
@@ -103,15 +130,15 @@ src_configure() {
 		$(use_enable slp) \
 		$(use_enable static) \
 		$(use_enable tiff) \
-		$(use_enable zeroconf dnssd) \
+		$(use_enable usb libusb) \
 		$(use_with java) \
 		$(use_with perl) \
 		$(use_with php) \
 		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
-		--enable-libusb \
 		--enable-threads \
-		--enable-pdftops \
+		--disable-dnssd \
 		${myconf}
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
@@ -130,8 +157,6 @@ src_install() {
 
 	# install our init script
 	local neededservices
-	use zeroconf && has_version 'net-dns/avahi' && neededservices="$neededservices avahi-daemon"
-	use zeroconf && has_version 'net-misc/mDNSResponder' && neededservices="$neededservices mDNSResponderPosix"
 	use dbus && neededservices="$neededservices dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
@@ -150,8 +175,11 @@ src_install() {
 		rm -rf "${D}"/etc/xinetd.d
 	fi
 
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
 
 	use X || rm -r "${D}"/usr/share/applications