Fixed bug #172341.

5 files changed, 237 insertions, 11 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0443c2e3ea29..b98ea34b475e 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.233 2007/04/07 13:43:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.234 2007/05/01 12:20:07 calchan Exp $
+
+*cups-1.2.10-r1 (01 May 2007)
+
+  01 May 2007; Denis Dupeyron <calchan@gentoo.org> +cups-1.2.10-r1.ebuild:
+  Fixed bug #172341.
 
   07 Apr 2007; Stefan Schweizer <genstef@gentoo.org> cups-1.2.9.ebuild, cups-1.2.10.ebuild:
   Use pstoraster for gs-gpl and -gnu to make them work with gimp-print for
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index fee7bf766651..cf5f69ba8ce1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -54,10 +54,14 @@ DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590d
 DIST cups-1.2.10-source.tar.bz2 3618084 RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f SHA1 241d7a3c52370fb08ed2ffc3fd8f59673d158299 SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
 DIST cups-1.2.6-source.tar.bz2 3566806 RMD160 a239738f711168cb82c11ee20a7aa92b070e5811 SHA1 1e12d2db23c6a46ae8960b9b765be0f1b829bbac SHA256 cdad0e2e461121257e740b8cb1111c7266cea434dd532a8bcc69c69adffe8aa8
 DIST cups-1.2.9-source.tar.bz2 3617594 RMD160 8af1323a8006c3736a15c25c89773292a129161d SHA1 58e67800103e699b4699f17db41da33ddea360fb SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09
-EBUILD cups-1.1.23-r8.ebuild 5010 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd SHA1 db0d26316516da0a744f242e4ca53adaa6160efd SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04
-MD5 2443fd46170a523bf9722e0684ddb257 cups-1.1.23-r8.ebuild 5010
-RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd cups-1.1.23-r8.ebuild 5010
-SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04 cups-1.1.23-r8.ebuild 5010
+EBUILD cups-1.1.23-r8.ebuild 5010 RMD160 81ffb7c1da82031c67f7467803720820bd506fba SHA1 217d4f186b158134118dc70528608d88891f8628 SHA256 0efbc655b1593889a74d21a216ef1a096caf45754904e690c8e095b8878b477c
+MD5 90f13ceca2b119c4fa180a47be0af4f9 cups-1.1.23-r8.ebuild 5010
+RMD160 81ffb7c1da82031c67f7467803720820bd506fba cups-1.1.23-r8.ebuild 5010
+SHA256 0efbc655b1593889a74d21a216ef1a096caf45754904e690c8e095b8878b477c cups-1.1.23-r8.ebuild 5010
+EBUILD cups-1.2.10-r1.ebuild 6324 RMD160 9cc3a59411afb594e73e417ef47a07a8f581b40e SHA1 d3e5be84422d0726bcc5cc644de6883acf3eac59 SHA256 c49383759c470807d3ce22e77ef303321e5e17883f2e4377bf45665ee8772102
+MD5 9fcf7fb6490e0e7f316388d70332f423 cups-1.2.10-r1.ebuild 6324
+RMD160 9cc3a59411afb594e73e417ef47a07a8f581b40e cups-1.2.10-r1.ebuild 6324
+SHA256 c49383759c470807d3ce22e77ef303321e5e17883f2e4377bf45665ee8772102 cups-1.2.10-r1.ebuild 6324
 EBUILD cups-1.2.10.ebuild 6126 RMD160 010e2f6abeb1666c5b0af079f8eecb30b82eec7f SHA1 cbb5fd210344b1ed090fd727611b603ae1e167b3 SHA256 1a4d7eab3c5794c8830df7bfd55b139c887d2a4f1a928b5f569b3a364734e27e
 MD5 9ac8dbee21e55d17a325b1d3a3dfca92 cups-1.2.10.ebuild 6126
 RMD160 010e2f6abeb1666c5b0af079f8eecb30b82eec7f cups-1.2.10.ebuild 6126
@@ -70,10 +74,10 @@ EBUILD cups-1.2.9.ebuild 6117 RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 SH
 MD5 266018349216b2a66a3a19cafa1bebe0 cups-1.2.9.ebuild 6117
 RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 cups-1.2.9.ebuild 6117
 SHA256 dc0d9602eb489de0074fc03045f75ec0da59de95dc0815feb6c16b3e6d599cdc cups-1.2.9.ebuild 6117
-MISC ChangeLog 32598 RMD160 d3db1ed6836a9135f83a860f1088f21ce4138f87 SHA1 6dd7854932ee9f941c4c3700ac8452f6d2f057cb SHA256 c5227593d029546574f1bf3b76acff7eaaa0c61d24253bdd92a05b499ffaeebb
-MD5 a6cb8e7634f7f289697d398efe37b72b ChangeLog 32598
-RMD160 d3db1ed6836a9135f83a860f1088f21ce4138f87 ChangeLog 32598
-SHA256 c5227593d029546574f1bf3b76acff7eaaa0c61d24253bdd92a05b499ffaeebb ChangeLog 32598
+MISC ChangeLog 32726 RMD160 a370e85fc14ae39713afbf340f70caada601919d SHA1 b7619d7ebf7d20a275eba6011d1aa91f453c49a3 SHA256 6fd212236c9b9d56221890fd96a202960a67d55c25a710bf3723ca11e56b9b39
+MD5 75bbf21bb4da35b56e40de41d4821900 ChangeLog 32726
+RMD160 a370e85fc14ae39713afbf340f70caada601919d ChangeLog 32726
+SHA256 6fd212236c9b9d56221890fd96a202960a67d55c25a710bf3723ca11e56b9b39 ChangeLog 32726
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -84,6 +88,9 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 126e6284164bd1c1cc5fc98f1b3f1089 files/digest-cups-1.2.10 262
 RMD160 73673bf65cd75f7e5b15918308b45477ce244a5e files/digest-cups-1.2.10 262
 SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/digest-cups-1.2.10 262
+MD5 126e6284164bd1c1cc5fc98f1b3f1089 files/digest-cups-1.2.10-r1 262
+RMD160 73673bf65cd75f7e5b15918308b45477ce244a5e files/digest-cups-1.2.10-r1 262
+SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/digest-cups-1.2.10-r1 262
 MD5 5b3f9aec328891f1e9bded2d2577bd98 files/digest-cups-1.2.6 259
 RMD160 d5f75c2671a926c71c6698fc3100d9acb106fedd files/digest-cups-1.2.6 259
 SHA256 3f7f97c3ff4a6096c1b2209892b447540a6dca6b1e53d03232340d5e74cdc60a files/digest-cups-1.2.6 259
diff --git a/net-print/cups/cups-1.1.23-r8.ebuild b/net-print/cups/cups-1.1.23-r8.ebuild
index e984ae6afb74..9ba886a8144a 100644
--- a/net-print/cups/cups-1.1.23-r8.ebuild
+++ b/net-print/cups/cups-1.1.23-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.7 2006/11/07 21:59:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.8 2007/05/01 12:20:07 calchan Exp $
 
 WANT_AUTOMAKE=latest
 
diff --git a/net-print/cups/cups-1.2.10-r1.ebuild b/net-print/cups/cups-1.2.10-r1.ebuild
new file mode 100644
index 000000000000..34f71816413e
--- /dev/null
+++ b/net-print/cups/cups-1.2.10-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.10-r1.ebuild,v 1.1 2007/05/01 12:20:07 calchan Exp $
+
+WANT_AUTOMAKE=latest
+
+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.funet.fi/pub/mirrors/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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ldap 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 )
+	ldap? ( net-nds/openldap )
+	dbus? ( 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}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
+	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
+
+	# 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) \
+		$(use_enable ldap) \
+		--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
+
+	# 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
+
+	# .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
+
+	# Fix a symlink collision, see bug #172341
+	dodir /usr/share/ppd
+	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+}
+
+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/digest-cups-1.2.10-r1 b/net-print/cups/files/digest-cups-1.2.10-r1
new file mode 100644
index 000000000000..79f699d58684
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.10-r1
@@ -0,0 +1,3 @@
+MD5 aad696a480b618e61bc7dab11623d3ac cups-1.2.10-source.tar.bz2 3618084
+RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f cups-1.2.10-source.tar.bz2 3618084
+SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36 cups-1.2.10-source.tar.bz2 3618084