diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-08 17:16:42 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-08 17:16:42 +0000 |
| commit | 1769a338ada608e880409ed00dee3ae0c01d3006 (patch) | |
| tree | 90773c2cbffdd907257512c64986f7cdc4c36331 /net-print | |
| parent | keyworded for ~amd64 (diff) | |
| download | gentoo-2-1769a338ada608e880409ed00dee3ae0c01d3006.tar.gz gentoo-2-1769a338ada608e880409ed00dee3ae0c01d3006.tar.bz2 gentoo-2-1769a338ada608e880409ed00dee3ae0c01d3006.zip | |
Provide a lpadmin group as debian does, and use that as system group for cups. Restrict test instead of providing a fake src_test.
(Portage version: 2.1_pre10-r4)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.0_pre.ebuild | 20 |
2 files changed, 15 insertions, 11 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/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 |