version bump thanks to Timo Boettcher <spida@spida.net> in bgu 141500

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 204 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index a1d70bf9e55f..e500fcf8dcc1 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.191 2006/07/03 20:05:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.192 2006/07/23 18:23:15 genstef Exp $
+
+*cups-1.2.2 (23 Jul 2006)
+
+  23 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.2.ebuild:
+  version bump thanks to Timo Boettcher <spida@spida.net> in bgu 141500
 
   03 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> cups-1.1.23-r8.ebuild:
   Stable on sparc wrt #138736
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index cb0c1424d75c..88ede7ca786d 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.22-xpdf2-underflow.patch 2301 RMD160 d8f9f74f97ff380ee0552ab2e1f5499af99ee829 SHA1 05c8a1299819ba157a1e30d49acdeb267daa9cc7 SHA256 b400d696742a95040bf6734fca01f5b49481d3610dd5cf6b63786bd1f35e1dd6
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
 RMD160 d8f9f74f97ff380ee0552ab2e1f5499af99ee829 files/cups-1.1.22-xpdf2-underflow.patch 2301
@@ -71,6 +68,7 @@ RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a files/xpdf-pl3.patch 348
 SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b files/xpdf-pl3.patch 348
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST cups-1.2.1-source.tar.bz2 3475342 RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 SHA1 308dec4039153e62d4206c30d6b1f25469ee868f SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45
+DIST cups-1.2.2-source.tar.bz2 3527322 RMD160 f0faa978ae50c5a0cf9bff43f72ab5ca2d530a3e SHA1 c392e216e1eaa0d5dee437056d70c3457a93e35c SHA256 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776
 EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac SHA1 3958abd83fa55d34622b647f111086d92351965c SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b
 MD5 b1e18a006a467d2c94dd37e0f469db56 cups-1.1.23-r1.ebuild 4132
 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac cups-1.1.23-r1.ebuild 4132
@@ -87,10 +85,14 @@ EBUILD cups-1.2.1-r2.ebuild 5490 RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74
 MD5 880b8c1c029d3f781f495e1572724463 cups-1.2.1-r2.ebuild 5490
 RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74 cups-1.2.1-r2.ebuild 5490
 SHA256 bd756abe2a45445a8af4a5a229ff70647217c1926a020557b497ca4600ffe0d2 cups-1.2.1-r2.ebuild 5490
-MISC ChangeLog 26555 RMD160 87ef6fc818764307f9546286764701cd162532a3 SHA1 60b8f9b8e7e4c9c09205948cdd71e7223c2f7c1c SHA256 63db0910ac4bcc8df5cc99a0aad9066564c5afa072186cc4f79bf55a03986804
-MD5 5a7a5157349112240637b882505b8bd6 ChangeLog 26555
-RMD160 87ef6fc818764307f9546286764701cd162532a3 ChangeLog 26555
-SHA256 63db0910ac4bcc8df5cc99a0aad9066564c5afa072186cc4f79bf55a03986804 ChangeLog 26555
+EBUILD cups-1.2.2.ebuild 5444 RMD160 5e511734f28b36f339099d8e8a6f4c42bb8cbd2b SHA1 89180a2e599e58e6b0c23be2c07825c7f2fe2ec8 SHA256 4114ad135d945b4bba0bd3bfc529043b6c10fabe7c2647ccfc323793e759bb9a
+MD5 48566f4f51d15edbb08a2e0b3a0e2346 cups-1.2.2.ebuild 5444
+RMD160 5e511734f28b36f339099d8e8a6f4c42bb8cbd2b cups-1.2.2.ebuild 5444
+SHA256 4114ad135d945b4bba0bd3bfc529043b6c10fabe7c2647ccfc323793e759bb9a cups-1.2.2.ebuild 5444
+MISC ChangeLog 26727 RMD160 dd20d3f6fb3947174d3621f6d41c6efeeb3953c2 SHA1 0d22973a7f80aacf2c4ee9d11ff01b03c00959a8 SHA256 62317d4c32a1ed35acb483d60c6a8738961a40e3da975a830aedba26f63d1e16
+MD5 5aec8f167d5d9535cd553d3639015ad1 ChangeLog 26727
+RMD160 dd20d3f6fb3947174d3621f6d41c6efeeb3953c2 ChangeLog 26727
+SHA256 62317d4c32a1ed35acb483d60c6a8738961a40e3da975a830aedba26f63d1e16 ChangeLog 26727
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -107,10 +109,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r2 259
 RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r2 259
 SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r2 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEqXicKRy60XGEcJIRAt+lAJ448hWHuEY+AdJt5Wfwfb75t/VnaACgl4gi
-USqM/19q6Ztfv0n48hKrUis=
-=1fIJ
------END PGP SIGNATURE-----
+MD5 6ca104f41098627aed8831c9c787c6f2 files/digest-cups-1.2.2 259
+RMD160 5816b73bced2a425eadfd3ee49d3022e42c4741f files/digest-cups-1.2.2 259
+SHA256 dacf58f7bf93d749bdd7330f57e43ab53d507c143f509920c9a5c4aa106a1c6b files/digest-cups-1.2.2 259
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
new file mode 100644
index 000000000000..11d62f1e630f
--- /dev/null
+++ b/net-print/cups/cups-1.2.2.ebuild
@@ -0,0 +1,183 @@
+# 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.2.ebuild,v 1.1 2006/07/23 18:23:15 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg"
+
+DEP="pam? ( virtual/pam )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
+	slp? ( >=net-libs/openslp-1.0.4 )
+	dbus? ( sys-apps/dbus )
+	png? ( >=media-libs/libpng-1.2.1 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	app-text/libpaper"
+DEPEND="${DEP}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEP}
+	nls? ( virtual/libintl )
+	!virtual/lpr
+	>=app-text/poppler-0.4.3-r1
+	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
+	) )"
+PDEPEND="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}
+	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+
+	# upstream has refused to fix this for me
+	sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	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) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable png) \
+		$(use_enable jpeg) \
+		$(use_enable tiff) \
+		--enable-libpaper \
+		--enable-threads \
+		--enable-static \
+		--disable-pdftops \
+		${myconf} \
+		|| 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
+}
+
+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."
+	einfo
+	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+	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
+		einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
+		einfo "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/digest-cups-1.2.2 b/net-print/cups/files/digest-cups-1.2.2
new file mode 100644
index 000000000000..f0387ee528ad
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.2
@@ -0,0 +1,3 @@
+MD5 091de9109c9252cb37427859e90190ad cups-1.2.2-source.tar.bz2 3527322
+RMD160 f0faa978ae50c5a0cf9bff43f72ab5ca2d530a3e cups-1.2.2-source.tar.bz2 3527322
+SHA256 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776 cups-1.2.2-source.tar.bz2 3527322