Version bump fixing bug #276782. Remove old.

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

3 files changed, 18 insertions, 20 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d874b2fa9bcf..0cfc3a4aeefa 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.360 2009/07/04 12:57:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.361 2009/07/08 22:41:43 tgurr Exp $
+
+*cups-1.3.11 (08 Jul 2009)
+
+  08 Jul 2009; Timo Gurr <tgurr@gentoo.org> -cups-1.3.9-r1.ebuild,
+  +cups-1.3.11.ebuild:
+  Version bump fixing bug #276782. Remove old.
 
   04 Jul 2009; Brent Baude <ranger@gentoo.org> cups-1.3.10-r2.ebuild:
   stable ppc64, bug 275685
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9beba31462d1..3b972d96fcdc 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,9 +5,9 @@ AUX cups-1.3.9-CVE-2008-5286.patch 761 RMD160 7abe5d746cc2c8135e946de492b7671372
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 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.9-source.tar.bz2 3993875 RMD160 ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e SHA1 c1a596b355201320456b393446286fe3947bce16 SHA256 38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b
+DIST cups-1.3.11-source.tar.bz2 3799424 RMD160 aa263fe29350cee307bbd72ef2f5cb061c2476e0 SHA1 c8304ee8d631bb370fc10fc1fffbe8ebae413df2 SHA256 824b7fe5cefa981f2ce20f356983be182a551f716ccab8f5194fe645b1178303
 EBUILD cups-1.3.10-r1.ebuild 8214 RMD160 d3492e107a7b690b045fc6b38faff59cc6f6ebff SHA1 dcc190c82d3d20386659fa256c4f2c984d02670f SHA256 586a6a1d4d9352b0f4402bcb3d58e2ba977e026dae4644f6d1f4f0fd4cb03f06
 EBUILD cups-1.3.10-r2.ebuild 8334 RMD160 89598c7ec9b6c2b85d890f3abcf5ea8297d76fe5 SHA1 ec8c9e4591033bfc6176dbbb43a1b94b5ae21bc1 SHA256 31fa69fe482fc162fa45cb57fa60e71ca621efd5df15be0b8b9bfbfe1104f4c0
-EBUILD cups-1.3.9-r1.ebuild 8607 RMD160 e64ffa716921655efb8bda41cf3d939ed2991ef5 SHA1 f12a3367f30996c8541e95147cef53fc3eb5ec64 SHA256 226c16e6bff605d4c9aaa9078642494d7a1189a1e5086f1f031053fc982aa4e7
-MISC ChangeLog 53278 RMD160 1f34a9edefda0bb4387a48683ff286eb9277f119 SHA1 c61abfa31bbda16997b1c58861e8a98a8f593214 SHA256 72d9b1f005c5a8c27bc63c677d352773cfc5ed8845e02f41d60f3462d8a73853
+EBUILD cups-1.3.11.ebuild 8335 RMD160 33780184fe8b641b4524233241b6ceaa3de2c753 SHA1 9d91933399d990bc7cb188e801f857bf52810b89 SHA256 7896241625562878e3a38c32e34c95b277d5233543493151b9f7e1b2d0a00462
+MISC ChangeLog 53443 RMD160 34746f4fb63cecb32177313cd71dc327c24069f3 SHA1 0f1ee7dba29a50b60b9f268fa63b5524d1f88531 SHA256 83767d62b251b2b36cb5b2b8b34075ab38cd5f935ff9a2e6e55ed9701ff2764e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.9-r1.ebuild b/net-print/cups/cups-1.3.11.ebuild
index b5b5616bb806..3b5c4404dd1f 100644
--- a/net-print/cups/cups-1.3.9-r1.ebuild
+++ b/net-print/cups/cups-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.9-r1.ebuild,v 1.13 2009/05/26 06:40:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11.ebuild,v 1.1 2009/07/08 22:41:43 tgurr Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.easysw.com/pub/cups/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~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 ) )
@@ -101,8 +101,8 @@ src_unpack() {
 	# create a missing symlink to allow https printing via IPP, bug #217293
 	epatch "${FILESDIR}/${PN}-1.3.7-backend-https.patch"
 
-	# security bug #249727
-	epatch "${FILESDIR}/${PN}-1.3.9-CVE-2008-5286.patch"
+	# detect recent libgnutls versions, upstream bug STR #3178
+	epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
 
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
@@ -154,6 +154,7 @@ src_compile() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
+		--with-pdftops=pdftops \
 		--with-system-groups=lpadmin \
 		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
@@ -171,8 +172,8 @@ src_compile() {
 		$(use_with php) \
 		$(use_with python) \
 		--enable-libpaper \
+		--enable-pdftops \
 		--enable-threads \
-		--disable-pdftops \
 		${myconf}
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
@@ -213,15 +214,6 @@ src_install() {
 		rm -rf "${D}"/etc/xinetd.d
 	fi
 
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
-
-	# only for gs-esp this is correct, see bug #163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu ; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
-	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
 
@@ -240,8 +232,8 @@ src_install() {
 	diropts -m 0740 -o lp -g lp
 	dodir /var/cache/cups/rss
 
-	# create /etc/cups/client.conf, bug #196967
-	echo "ServerName localhost" >> "${D}"/etc/cups/client.conf
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
 }
 
 pkg_preinst() {