Provide a lpadmin group as debian does, and use that as system group for cups. Restrict test instead of providing a fake src_test.

Package-Manager: portage-2.1_pre10-r4

3 files changed, 26 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ea30617e0ca6..80d467a1887e 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.165 2006/05/07 21:25:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.166 2006/05/08 17:16:42 flameeyes Exp $
+
+  08 May 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.2.0_pre.ebuild:
+  Provide a lpadmin group as debian does, and use that as system group for
+  cups. Restrict test instead of providing a fake src_test.
 
   07 May 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.2.0_pre.ebuild:
   Install inside /usr/libexec to workaround multilib problems, and fix
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 01acb6eb3a8f..5a98c73fe063 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -70,14 +70,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_pre.ebuild 3788 RMD160 9baf100d1fdaac95eb0d2d3eefa5493bba96ba78 SHA1 08651132fa6c9ae6b5c4c451386cab6a888eb47c SHA256 65d75fc3798c9dfb92556ab6a677f82b7da30918ae01ea28dc9f618261a9121c size 3788
-MD5 80c0b9008c3ea2d40b53ecc82236276e cups-1.2.0_pre.ebuild 3788
-RMD160 9baf100d1fdaac95eb0d2d3eefa5493bba96ba78 cups-1.2.0_pre.ebuild 3788
-SHA256 65d75fc3798c9dfb92556ab6a677f82b7da30918ae01ea28dc9f618261a9121c cups-1.2.0_pre.ebuild 3788
-MISC ChangeLog 21997 RMD160 7426ec96076ac1c52f612b9e31805ca1eff14497 SHA1 fa01c13eac846d931e668435e21ae131b63200d0 SHA256 abfc54fd304943e71f2279a37b617e329703413b1cae9320dfe8016f56b9671b size 21997
-MD5 b45bfdbb0770516439b405cb8636c914 ChangeLog 21997
-RMD160 7426ec96076ac1c52f612b9e31805ca1eff14497 ChangeLog 21997
-SHA256 abfc54fd304943e71f2279a37b617e329703413b1cae9320dfe8016f56b9671b ChangeLog 21997
+EBUILD cups-1.2.0_pre.ebuild 3796 RMD160 d213fc4aa5f459486b4db7d8246c59c098b46341 SHA1 edd8ebadb812dc9fd64cbf9a15b4f9f99538bd6c SHA256 43f68b404ab23cc2d285c050af31fe0815cedd8a834f463555149555c3941b5e size 3796
+MD5 4e512f44863c58ca2577685fc02b3e3a cups-1.2.0_pre.ebuild 3796
+RMD160 d213fc4aa5f459486b4db7d8246c59c098b46341 cups-1.2.0_pre.ebuild 3796
+SHA256 43f68b404ab23cc2d285c050af31fe0815cedd8a834f463555149555c3941b5e cups-1.2.0_pre.ebuild 3796
+MISC ChangeLog 22209 RMD160 e1d85035ff717ee3c096106f6d484fdac22b6015 SHA1 5d25e6734b0d587462f813d13ad6985045a3016a SHA256 e93c49a090d47b686c32134900be95abfd7a0593fe9a3e758d6cb49cc8379398 size 22209
+MD5 90038a6d3a293f93bfb1e2065c0f3b42 ChangeLog 22209
+RMD160 e1d85035ff717ee3c096106f6d484fdac22b6015 ChangeLog 22209
+SHA256 e93c49a090d47b686c32134900be95abfd7a0593fe9a3e758d6cb49cc8379398 ChangeLog 22209
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -97,7 +97,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXmXKAiZjviIA2XgRAkE2AJ0bTV1SIeEEdx/FrX/Oxyh0bj3MUACfabo+
-HPcM1zSWqXTCkpDCpYEEHxc=
-=6ODS
+iD8DBQFEX30LAiZjviIA2XgRAkAoAKC3mc2E5+PaBFOYcXdkQDYD/68D4wCgoPKw
+t/+SW5duFyvBRlMLfdSNchg=
+=Tlc7
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.2.0_pre.ebuild b/net-print/cups/cups-1.2.0_pre.ebuild
index 78bc7589e16e..fa9a80abd079 100644
--- a/net-print/cups/cups-1.2.0_pre.ebuild
+++ b/net-print/cups/cups-1.2.0_pre.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2006/05/07 21:25:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.0_pre.ebuild,v 1.5 2006/05/08 17:16:42 flameeyes Exp $
 
 inherit eutils flag-o-matic pam autotools multilib subversion
 
@@ -37,11 +37,18 @@ RDEPEND="${DEP}
 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() {
@@ -58,6 +65,7 @@ src_compile() {
 	econf \
 		--with-cups-user=lp \
 		--with-cups-group=lp \
+		--with-system-groups=lpadmin \
 		--localstatedir=/var \
 		--with-bindnow=$(bindnow-flags) \
 		$(use_enable pam) \
@@ -81,13 +89,6 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_test() {
-	# 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
-	true
-}
-
 src_install() {
 	make BUILDROOT=${D} install || die "make install failed"
 
@@ -98,8 +99,7 @@ src_install() {
 	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat*
 
 	# Do not export all our printers
-	sed -i -e "s:^\(SystemGroup\).*:\1 lp:" \
-		-e "s:^BrowseAllow.*:#\0:" \
+	sed -i -e "s:^BrowseAllow.*:#\0:" \
 		${D}/etc/cups/cupsd.conf
 
 	pamd_mimic_system cups auth account