version bump

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 256 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9905e6fc38d4..4bc7f06e57e9 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.206 2006/10/14 08:11:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.207 2006/10/21 00:45:55 genstef Exp $
+
+*cups-1.2.5 (21 Oct 2006)
+
+  21 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/cups-1.2.5.patch, +cups-1.2.5.ebuild:
+  version bump
 
   14 Oct 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.2.ebuild,
   cups-1.2.4.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 801c53f4c67f..63b6854d371c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -21,6 +18,10 @@ AUX cups-1.2.1-ssldir.patch 509 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71
 MD5 4cfb62e82b82ffc2291f3bdfcc21e600 files/cups-1.2.1-ssldir.patch 509
 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 files/cups-1.2.1-ssldir.patch 509
 SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7 files/cups-1.2.1-ssldir.patch 509
+AUX cups-1.2.5.patch 1395 RMD160 acf37fec882dbb91947537fe600d1ee5520153da SHA1 def8b180e3c2bdd34404f5dc9dedb88eca51da49 SHA256 47de19bf44129b5a97069d2bda0cd667aad9ed11276657a4a85658c9d921e8fc
+MD5 85dc75369b134bdf9e3069276a1e6464 files/cups-1.2.5.patch 1395
+RMD160 acf37fec882dbb91947537fe600d1ee5520153da files/cups-1.2.5.patch 1395
+SHA256 47de19bf44129b5a97069d2bda0cd667aad9ed11276657a4a85658c9d921e8fc files/cups-1.2.5.patch 1395
 AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
@@ -51,6 +52,7 @@ RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST cups-1.2.4-source.tar.bz2 3546082 RMD160 eb8414dafa5e8a108ae6644a1a62f68ae8cfdc13 SHA1 4a6cb772cf64242b71a716711896c004c3636ad7 SHA256 707910641f5dc30253e548ac32033fe23a70e4e0ac589ce956ee0b8869279dcd
+DIST cups-1.2.5-source.tar.bz2 3565622 RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc SHA1 25703de2bc09aa161bfd1ece88d30926269156df SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a
 EBUILD cups-1.1.23-r8.ebuild 4985 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 SHA1 78928d8874e21abfa07a6dc315182e7b201207a0 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321
 MD5 54a99ab704429d053d41ff1fe558188e cups-1.1.23-r8.ebuild 4985
 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 cups-1.1.23-r8.ebuild 4985
@@ -59,10 +61,14 @@ EBUILD cups-1.2.4.ebuild 5778 RMD160 3f8e024e05c82637e5bd653bf4c6534770ff4c86 SH
 MD5 7fc695393e0d337504f7f94e09d0c3b3 cups-1.2.4.ebuild 5778
 RMD160 3f8e024e05c82637e5bd653bf4c6534770ff4c86 cups-1.2.4.ebuild 5778
 SHA256 b5bceb0517f5521e2d1da22cb9be5414398bc35caadad6119a8cf232ffdc0e52 cups-1.2.4.ebuild 5778
-MISC ChangeLog 29321 RMD160 91a05ef11f8a7c4b1f8b710aeb162e39006ad5e7 SHA1 c8b8c5569f5077737cb6b3e5d02ff0d8eff57f00 SHA256 d22eb98208a6c9a7667c64a2078e75b2760037cd8c86b186c2cb3c65cc9b65d6
-MD5 db2c4f9f9d95bb2503d0b327d5302ad3 ChangeLog 29321
-RMD160 91a05ef11f8a7c4b1f8b710aeb162e39006ad5e7 ChangeLog 29321
-SHA256 d22eb98208a6c9a7667c64a2078e75b2760037cd8c86b186c2cb3c65cc9b65d6 ChangeLog 29321
+EBUILD cups-1.2.5.ebuild 5816 RMD160 3cdf82c8f0ad14bf575592070b1359ac7742d0e5 SHA1 ff604223b20394a6c88139962594c9bc7c7a3bef SHA256 e5c472333299a90044081849c11cebc31752b5cb45f03cb36ec5b427fce75748
+MD5 d2b9303b24da08498db8e3bf5be3d873 cups-1.2.5.ebuild 5816
+RMD160 3cdf82c8f0ad14bf575592070b1359ac7742d0e5 cups-1.2.5.ebuild 5816
+SHA256 e5c472333299a90044081849c11cebc31752b5cb45f03cb36ec5b427fce75748 cups-1.2.5.ebuild 5816
+MISC ChangeLog 29464 RMD160 55d968a752849487ccc1bc4a16831e05279a2aae SHA1 b3c85443a585a6fd4b03b07d71d77cb5342394b3 SHA256 6fb3d96bad295c391abc1e4528456a7c5413ea70aaa7b70015f04615aea30c8b
+MD5 83548ce892eb3b7be396d7eea0e2c48e ChangeLog 29464
+RMD160 55d968a752849487ccc1bc4a16831e05279a2aae ChangeLog 29464
+SHA256 6fb3d96bad295c391abc1e4528456a7c5413ea70aaa7b70015f04615aea30c8b ChangeLog 29464
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -73,10 +79,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 64e535db8d839184a0b4e3a3c7bc9571 files/digest-cups-1.2.4 259
 RMD160 b6fb48422caa94e5e43e654b5dff450e1ba0d940 files/digest-cups-1.2.4 259
 SHA256 a7c03e62e92a4a9a394acd423c6cce5af8e0c6a6afae5b44686c21858e79ec52 files/digest-cups-1.2.4 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFN6aVamhnQswr0vIRAt7YAJ9hkidllAOsGPhyCw4QwsKzCnJfOQCghLaH
-D4VBqhzCOAMsVslJH2WQ4iA=
-=sQBy
------END PGP SIGNATURE-----
+MD5 b8e30436b4c06424b912140b59189cb5 files/digest-cups-1.2.5 259
+RMD160 71eb4e72bce763377f3f0aa0529bb57845026ad4 files/digest-cups-1.2.5 259
+SHA256 02c5089d6f092247fb7edc49dee8dad9dabf7ad7b182368adcdde7451d59cb6e files/digest-cups-1.2.5 259
diff --git a/net-print/cups/cups-1.2.5.ebuild b/net-print/cups/cups-1.2.5.ebuild
new file mode 100644
index 000000000000..1c65609e7e70
--- /dev/null
+++ b/net-print/cups/cups-1.2.5.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.5.ebuild,v 1.1 2006/10/21 00:45:55 genstef Exp $
+
+inherit autotools eutils flag-o-matic multilib pam
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl slp pam php samba nls dbus tiff png ppds jpeg X"
+
+DEP="pam? ( virtual/pam )
+	ssl? ( net-libs/gnutls )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )
+	png? ( >=media-libs/libpng-1.2.1 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	php? ( dev-lang/php )
+	app-text/libpaper"
+DEPEND="${DEP}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEP}
+	nls? ( virtual/libintl )
+	!virtual/lpr
+	>=app-text/poppler-0.4.3-r1
+	X? ( x11-misc/xdg-utils )
+	"
+PDEPEND="
+	ppds? ( || (
+		(
+			net-print/foomatic-filters-ppds
+			net-print/foomatic-db-ppds
+		)
+		net-print/foomatic-filters-ppds
+		net-print/foomatic-db-ppds
+		net-print/hplip
+		media-gfx/gimp-print
+		net-print/foo2zjs
+		net-print/cups-pdf
+	) )
+	samba? ( >=net-fs/samba-3.0.8 )
+	virtual/ghostscript"
+PROVIDE="virtual/lpr"
+
+# upstream includes an interactive test which is a nono for gentoo.
+# therefore, since the printing herd has bigger fish to fry, for now,
+# we just leave it out, even if FEATURES=test
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+
+	enewgroup lpadmin 106
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# upstream does not acknowledge bindnow as a solution
+	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+	epatch ${FILESDIR}/cups-1.2.5.patch
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+	export DSOFLAGS="${LDFLAGS}"
+	econf \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-system-groups=lpadmin \
+		--localstatedir=/var \
+		--with-docdir=/usr/share/cups/html \
+		--with-bindnow=$(bindnow-flags) \
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		--enable-gnutls \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable png) \
+		$(use_enable jpeg) \
+		$(use_enable tiff) \
+		$(use_with php) \
+		--enable-libpaper \
+		--enable-threads \
+		--enable-static \
+		--disable-pdftops \
+		|| die "econf failed"
+
+	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	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() {
+	emake BUILDROOT=${D} install || die "emake install failed"
+	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
+
+	# clean out cups init scripts
+	rm -rf ${D}/etc/{init.d/cups,rc*,pam.d/cups}
+	# install our init scripts
+	newinitd ${FILESDIR}/cupsd.init cupsd
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	# correct path
+	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
+	# it is safer to disable this by default, bug 137130
+	grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \
+		sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd
+
+	# install pdftops filter
+	exeinto /usr/libexec/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+
+	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
+
+	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
+	if use X; then
+		sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop
+	else
+		rm -r ${D}/usr/share/applications
+	fi
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+	einfo "Remote printing: change "
+	einfo "Listen localhost:631"
+	einfo "to"
+	einfo "Listen *:631"
+	einfo "in /etc/cups/cupsd.conf"
+	einfo
+	einfo "For more information about installing a printer take a look at:"
+	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
+
+	local good_gs=false
+	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
+		if has_version ${x} && built_with_use ${x} cups; then
+			good_gs=true
+			break
+		fi
+	done;
+	if ! ${good_gs}; then
+		ewarn
+		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
+	fi
+	if has_version =net-print/cups-1.1*; then
+		ewarn
+		ewarn "The configuration changed with cups-1.2, you may want to save the old"
+		ewarn "one and start from scratch:"
+		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
+		ewarn
+		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
+	fi
+	if [ -e ${ROOT}/usr/lib/cups ]; then
+		ewarn
+		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
+		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
+		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+		ewarn
+		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
+		ewarn "symlinks installed by this package, it wont be needed on later merges."
+		ewarn "You should also run revdep-rebuild"
+
+		# place symlinks to make the update smoothless
+		for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
+			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
+				ln -s ${i} ${i/lib/libexec}
+			fi
+		done
+	fi
+}
diff --git a/net-print/cups/files/cups-1.2.5.patch b/net-print/cups/files/cups-1.2.5.patch
new file mode 100644
index 000000000000..e4a09295fedf
--- /dev/null
+++ b/net-print/cups/files/cups-1.2.5.patch
@@ -0,0 +1,33 @@
+diff -ur cups-1.2.5.orig/scheduler/ipp.c cups-1.2.5/scheduler/ipp.c
+--- cups-1.2.5.orig/scheduler/ipp.c	2006-10-21 02:35:26.000000000 +0200
++++ cups-1.2.5/scheduler/ipp.c	2006-10-21 02:35:41.000000000 +0200
+@@ -4020,14 +4020,14 @@
+     if ((!strcmp(system_paper, "Letter") && have_letter) ||
+         (!strcmp(system_paper, "A4") && have_a4))
+     {
+-      num_defaults = ppd_add_default("PageSize", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("PageRegion", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("PaperDimension", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("ImageableArea", system_paper, 
+-				     num_defaults, &defaults);
++      num_defaults = cupsAddOption("PageSize", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("PageRegion", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("PaperDimension", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("ImageableArea", system_paper, 
++				   num_defaults, &defaults);
+     }
+   }
+ #endif /* HAVE_LIBPAPER */
+@@ -9158,5 +9158,5 @@
+ 
+ 
+ /*
+- * End of "$Id: cups-1.2.5.patch,v 1.1 2006/10/21 00:45:55 genstef Exp $".
++ * End of "$Id: cups-1.2.5.patch,v 1.1 2006/10/21 00:45:55 genstef Exp $".
+  */
diff --git a/net-print/cups/files/digest-cups-1.2.5 b/net-print/cups/files/digest-cups-1.2.5
new file mode 100644
index 000000000000..8e4e8e9db945
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.5
@@ -0,0 +1,3 @@
+MD5 3e5d2c127890fd3ed97e2249c278b6e8 cups-1.2.5-source.tar.bz2 3565622
+RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc cups-1.2.5-source.tar.bz2 3565622
+SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a cups-1.2.5-source.tar.bz2 3565622