default to 106 for the lpadmin gid thanks to Nils Marving <nils@marving.dk> in bug...

Package-Manager: portage-2.1_rc4-r2

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e31c4cea5b8b6ff1935c80671d4913ae5a21a487..0a5b78038e72ba4254af6aff110d995bbc40009b 100644 (file)
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # 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.171 2006/05/30 11:38:52 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.172 2006/06/05 18:47:34 genstef Exp $
+
+  05 Jun 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.0_pre.ebuild,
+  -cups-1.2.0.ebuild, cups-1.2.1.ebuild:
+  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
 
   27 May 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.1.ebuild:
   Add ghostscript PDEPEND, add --with-docdir, readd initd file

diff --git a/net-print/cups/cups-1.2.1.ebuild b/net-print/cups/cups-1.2.1.ebuild
index ee23608b69ada12dc4b2bc689dcd3f5b673c082a..88f3e9ec861ee3341f34ff8cb56630d34b646a4e 100644 (file)
--- a/net-print/cups/cups-1.2.1.ebuild
+++ b/net-print/cups/cups-1.2.1.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.1.ebuild,v 1.2 2006/05/27 09:26:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1.ebuild,v 1.3 2006/06/05 18:47:34 genstef Exp $
 
 inherit eutils pam flag-o-matic multilib autotools
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ssl slp pam samba nls gnutls dbus"
 
 DEP="pam? ( virtual/pam )
@@ -48,7 +48,7 @@ pkg_setup() {
        enewgroup lp
        enewuser lp -1 -1 -1 lp
 
-       enewgroup lpadmin
+       enewgroup lpadmin 106
 }
 
 src_unpack() {
@@ -56,6 +56,9 @@ src_unpack() {
        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