From fdc906ff50c98f2b3e88067c00e08a1caaca72b2 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 5 Jun 2006 18:47:34 +0000 Subject: [PATCH] default to 106 for the lpadmin gid thanks to Nils Marving in bug 134519, add a workaround for my own usb printer problem that is not applied upstream Package-Manager: portage-2.1_rc4-r2 --- net-print/cups/ChangeLog | 8 +++++++- net-print/cups/cups-1.2.1.ebuild | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index e31c4cea5b8b..0a5b78038e72 100644 --- 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 -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 + in bug 134519, add a workaround for my own usb printer problem that is not + applied upstream 27 May 2006; Stefan Schweizer 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 ee23608b69ad..88f3e9ec861e 100644 --- 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 -- 2.26.2