default to 106 for the lpadmin gid thanks to Nils Marving <nils@marving.dk> in bug 134519, add a workaround for my own usb printer problem that is not applied upstream

(Portage version: 2.1_rc4-r2)
 (Unsigned Manifest commit)

5 files changed, 8 insertions, 292 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index b437f09df89f..2e18e77e026c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -59,7 +59,6 @@ MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
 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.0-source.tar.bz2 3456476 RMD160 117d3a713d185bc507cf3a810f6415aa16a2e639 SHA1 d966fa826972b5f9b87cb2932587c7896ee01479 SHA256 893a91d96e68de51f767d97d36d2d321320b3611b7178ea9a9d17ad2777f5f9f
 DIST cups-1.2.1-source.tar.bz2 3475342 RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 SHA1 308dec4039153e62d4206c30d6b1f25469ee868f SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45
 EBUILD cups-1.1.23-r1.ebuild 4130 RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4dbd SHA1 b90b92aeebe6884ee04756ccc66b70c6b04e3430 SHA256 f7eea788f7fab983696ddf7d68f33dc6cc542ae9a7d50658c1195202cfe90fb5
 MD5 b92beaae46fa3940593e9915f4feb8f0 cups-1.1.23-r1.ebuild 4130
@@ -73,22 +72,14 @@ EBUILD cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e
 MD5 bf5afc4432a75abcd25c934233de0406 cups-1.1.23-r7.ebuild 4608
 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e5 cups-1.1.23-r7.ebuild 4608
 SHA256 40e886b9a539b594135464a3fd6a8b63000878e8b1b7e2ebc6d29b22ae6bbb35 cups-1.1.23-r7.ebuild 4608
-EBUILD cups-1.2.0.ebuild 3624 RMD160 7aacf217278f967ee93495e9f893fe98a2e92f90 SHA1 7415baa33710d34961290af93f8bcce492fc4e29 SHA256 6e648932e1ecf1c61fad45f3df823411c29910d6f631b3486a66def6af137e87
-MD5 b4d3bd3865c51737c8e85b68c2cbf5da cups-1.2.0.ebuild 3624
-RMD160 7aacf217278f967ee93495e9f893fe98a2e92f90 cups-1.2.0.ebuild 3624
-SHA256 6e648932e1ecf1c61fad45f3df823411c29910d6f631b3486a66def6af137e87 cups-1.2.0.ebuild 3624
-EBUILD cups-1.2.0_pre.ebuild 3759 RMD160 824b00c3780968ebbd4a37bcae524b8255416fa1 SHA1 b6e24e3ba210a05525a23c6f082896ea4f85b057 SHA256 00a13dd8aed87593569de1c36e4c4c10c68d3de5eff37ce1eca5cd15c455adde
-MD5 b41d0e66360f62c1df0f8f6ec66e04fe cups-1.2.0_pre.ebuild 3759
-RMD160 824b00c3780968ebbd4a37bcae524b8255416fa1 cups-1.2.0_pre.ebuild 3759
-SHA256 00a13dd8aed87593569de1c36e4c4c10c68d3de5eff37ce1eca5cd15c455adde cups-1.2.0_pre.ebuild 3759
-EBUILD cups-1.2.1.ebuild 3908 RMD160 0293676733d3c73885b68dc0efb34391b0a1fe25 SHA1 858c7a0bdbd60b537071157ec6d0bcd4ef495fea SHA256 d162584fa88b5c6e365bad12ff2e5d5282b16aa4b95769f2c076e1cc322ad205
-MD5 9fc826f0b8ad3b2f7118eef7ccce5061 cups-1.2.1.ebuild 3908
-RMD160 0293676733d3c73885b68dc0efb34391b0a1fe25 cups-1.2.1.ebuild 3908
-SHA256 d162584fa88b5c6e365bad12ff2e5d5282b16aa4b95769f2c076e1cc322ad205 cups-1.2.1.ebuild 3908
-MISC ChangeLog 22845 RMD160 55b2a1a5c645a4a353f27c3239b91c0bcff865be SHA1 1524fac9118c240a3dc021a2a715c379c659302d SHA256 05334bf43d468c3dfa89b766fbb411471da1e96d858e681b8fa5076a25fccdfe
-MD5 098cf76e5ddfedbf3bfceddb8ebab950 ChangeLog 22845
-RMD160 55b2a1a5c645a4a353f27c3239b91c0bcff865be ChangeLog 22845
-SHA256 05334bf43d468c3dfa89b766fbb411471da1e96d858e681b8fa5076a25fccdfe ChangeLog 22845
+EBUILD cups-1.2.1.ebuild 4046 RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 SHA1 e35a63b61ef5c68e13ca4e802d3b73286e19a01d SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb
+MD5 9e97662b8b617be6cf75225a2d1129bc cups-1.2.1.ebuild 4046
+RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 cups-1.2.1.ebuild 4046
+SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb cups-1.2.1.ebuild 4046
+MISC ChangeLog 23138 RMD160 4d85a62e19019cfbc81044beed4d6f565c87dfe2 SHA1 583a9bb2bd1e584b00f85261c0e42171e93a4a95 SHA256 3de5fa8287091fddb39ab1b0c58609e8084969993ed1bfc2a228bf958ba6497b
+MD5 72bb42f2ff1cc08caad503f308b2dd71 ChangeLog 23138
+RMD160 4d85a62e19019cfbc81044beed4d6f565c87dfe2 ChangeLog 23138
+SHA256 3de5fa8287091fddb39ab1b0c58609e8084969993ed1bfc2a228bf958ba6497b ChangeLog 23138
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -102,12 +93,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r7 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r7 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r7 262
-MD5 c2fa2abd7ebfa677875ffb60a1a53444 files/digest-cups-1.2.0 259
-RMD160 6960acb39dd3fbf8b3222c6a1a2bcc671c4acd1c files/digest-cups-1.2.0 259
-SHA256 c12a6bf7bcacbc147b8697eae1ea91bf93981a45a11ec6fcfe564dfd69d9fd09 files/digest-cups-1.2.0 259
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-cups-1.2.0_pre 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-cups-1.2.0_pre 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-cups-1.2.0_pre 1
 MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1 259
 RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1 259
 SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1 259
diff --git a/net-print/cups/cups-1.2.0.ebuild b/net-print/cups/cups-1.2.0.ebuild
deleted file mode 100644
index 749e77eea8e6..000000000000
--- a/net-print/cups/cups-1.2.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.0.ebuild,v 1.1 2006/05/08 21:59:56 genstef Exp $
-
-inherit eutils pam flag-o-matic multilib autotools
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls gnutls dbus"
-
-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 )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=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"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-bindnow.patch
-
-	# 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-bindnow=$(bindnow-flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		--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() {
-	make BUILDROOT=${D} install || die "make install failed"
-
-	dodoc {CHANGES,CREDITS,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
-	# cleanups
-	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat*
-
-	pamd_mimic_system cups auth account
-
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-
-	fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \
-		/var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd}
-	keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	einfo "Remote printing: change "
-	echo "Listen localhost:631"
-	einfo "to"
-	echo "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"
-}
diff --git a/net-print/cups/cups-1.2.0_pre.ebuild b/net-print/cups/cups-1.2.0_pre.ebuild
deleted file mode 100644
index 217a2fb070ec..000000000000
--- a/net-print/cups/cups-1.2.0_pre.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.0_pre.ebuild,v 1.6 2006/05/08 18:52:07 genstef Exp $
-
-inherit eutils flag-o-matic pam autotools multilib subversion
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-#SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-#ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-#ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls gnutls dbus"
-
-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 )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=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"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-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
-}
-
-src_compile() {
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-
-	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-bindnow=$(bindnow-flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		--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() {
-	make BUILDROOT=${D} install || die "make install failed"
-
-	dodoc {CHANGES,CREDITS,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
-	# cleanups
-	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat*
-
-	pamd_mimic_system cups auth account
-
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-
-	fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \
-		/var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd}
-	keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	einfo "Remote printing: change "
-	echo "Listen localhost:631"
-	einfo "to"
-	echo "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"
-}
diff --git a/net-print/cups/files/digest-cups-1.2.0 b/net-print/cups/files/digest-cups-1.2.0
deleted file mode 100644
index 241dc7930b9a..000000000000
--- a/net-print/cups/files/digest-cups-1.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a168b0b1c8bb946060e659e1df2927c5 cups-1.2.0-source.tar.bz2 3456476
-RMD160 117d3a713d185bc507cf3a810f6415aa16a2e639 cups-1.2.0-source.tar.bz2 3456476
-SHA256 893a91d96e68de51f767d97d36d2d321320b3611b7178ea9a9d17ad2777f5f9f cups-1.2.0-source.tar.bz2 3456476
diff --git a/net-print/cups/files/digest-cups-1.2.0_pre b/net-print/cups/files/digest-cups-1.2.0_pre
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-print/cups/files/digest-cups-1.2.0_pre
+++ /dev/null
@@ -1 +0,0 @@
-