init script fix / compatibility with latest foomatic

5 files changed, 149 insertions, 7 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index df24ab9fe015..991dde204545 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.41 2003/07/02 22:17:56 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.42 2003/07/16 15:08:21 lanius Exp $
+
+*cups-1.1.19-r1 (16 Jul 2003)
+
+  16 Jul 2003; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild,
+  files/cupsd.rc6:
+  fixed init script / made compatible with new foomatic
 
 *cups-1.1.19 (02 Jul 2003)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index dee96973e055..c1d351671e70 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,4 +1,4 @@
-MD5 0d26c3455ccf52e1eebf9f3aeba73ec9 ChangeLog 6100
+MD5 8f628f8afe508d286c922a35db45bd90 ChangeLog 6102
 MD5 41bc05dc406a74ccb81469035d595c7f cups-1.1.14-r4.ebuild 3137
 MD5 d5ea1d0e6e41ea35f88c0821f5dd3b4a cups-1.1.15-r2.ebuild 3274
 MD5 66aa54b02f913417a66671dbd634e7ad cups-1.1.16.ebuild 3499
@@ -10,14 +10,15 @@ MD5 000460630c38e7b26d79bc2d7f8d067d cups-1.1.18-r4.ebuild 3864
 MD5 c248952ab6aaefaa970b5130525988f4 cups-1.1.18-r5.ebuild 3659
 MD5 808c77e6178aa8b6785c34746e02c1a6 cups-1.1.18.ebuild 3743
 MD5 c30c0a501249181b79738155f909ae4d cups-1.1.19.ebuild 3612
-MD5 aa5e679947ada75ef594c2d95d4d474e cups-1.1.19-r1.ebuild 3506
+MD5 8f89a4986895a42fff11a87876cc13db cups-1.1.19-r1.ebuild 3734
+MD5 3c88f8a8f80ea74797658455b2d994fd files/.cupsd.rc6.swp 12288
 MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix-1.1.15.diff 308
 MD5 dc2809ac1071076672c0a439ddd2c097 files/configure-jpeg-buildfix.diff 432
 MD5 5484493b0e4d631f7ccea67f988ff0e6 files/cups-1.1.18-str75.patchv2 7223
 MD5 4d42d58387ed0a01b5f4e49ace9a8c0a files/cups.pam 232
 MD5 543135cac63f9e38f45d656c1b1ef36c files/cups.xinetd 366
 MD5 15f6b6e65285629a82a5d80abec81b1c files/cupsd.conf-1.1.18 20509
-MD5 200dcb23e2d49507117db013415a6e93 files/cupsd.rc6 480
+MD5 d099e36522346f4d3c36cd78848eeec8 files/cupsd.rc6 480
 MD5 7f2456e05feba9417282438030ea7590 files/cupsomatic 38029
 MD5 9f459d1a2164887e23368edc897e0490 files/digest-cups-1.1.14-r4 72
 MD5 2334aff554d1eddef103bf89353495a1 files/digest-cups-1.1.15-r2 74
diff --git a/net-print/cups/cups-1.1.19-r1.ebuild b/net-print/cups/cups-1.1.19-r1.ebuild
new file mode 100644
index 000000000000..03a10a6c4236
--- /dev/null
+++ b/net-print/cups/cups-1.1.19-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.19-r1.ebuild,v 1.1 2003/07/16 15:08:21 lanius Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="ssl slp pam"
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org"
+
+S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
+PROVIDE="virtual/lpr"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	>=media-libs/libpng-1.2.1
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b
+	usb? ( >=sys-apps/hotplug-20020401-r1 )"
+RDEPEND="${DEPEND} !virtual/lpr"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+
+filter-flags -fomit-frame-pointer
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	#make sure libcupsimage gets linked with libjpeg 
+	epatch ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
+
+	epatch ${FILESDIR}/disable-strip.patch || die
+
+	WANT_AUTOCONF_2_5=1 autoconf || die
+}
+
+src_compile() {
+	local myconf
+	use pam || myconf="${myconf} --disable-pam"
+	use ssl || myconf="${myconf} --disable-ssl"
+	use slp || myconf="${myconf} --disable-slp"
+
+	./configure \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	dodir /var/spool /var/log/cups /etc/cups
+
+	make \
+	LOCALEDIR=${D}/usr/share/locale \
+	DOCDIR=${D}/usr/share/cups/docs \
+	REQUESTS=${D}/var/spool/cups \
+	SERVERBIN=${D}/usr/lib/cups \
+	DATADIR=${D}/usr/share/cups \
+	INCLUDEDIR=${D}/usr/include \
+	AMANDIR=${D}/usr/share/man \
+	PMANDIR=${D}/usr/share/man \
+	MANDIR=${D}/usr/share/man \
+	SERVERROOT=${D}/etc/cups \
+	LOGDIR=${D}/var/log/cups \
+	SBINDIR=${D}/usr/sbin \
+	PAMDIR=${D}/etc/pam.d \
+	EXEC_PREFIX=${D}/usr \
+	LIBDIR=${D}/usr/lib \
+	BINDIR=${D}/usr/bin \
+	bindir=${D}/usr/bin \
+	INITDIR=${D}/etc \
+	PREFIX=${D} \
+	install || die "install problem"
+
+	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
+	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
+
+	#seems nobody installs it like this anymore.. security risk?
+	#fowners lp.root /usr/bin/lppasswd
+	#fperms 4755 /usr/bin/lppasswd
+
+	# cleanups
+	rm -rf ${D}/etc/init.d
+	rm -rf ${D}/etc/pam.d
+	rm -rf ${D}/etc/rc*
+	rm -rf ${D}/usr/share/man/cat*
+	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
+	rm -rf ${D}/var
+
+	mv ${D}/etc/cups/cupsd.conf ${D}/etc/cups/cupsd.conf.orig
+	sed -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
+		-e "s:^#\(SystemGroup\).*:\1 lp:" \
+		-e "s:^#\(User\).*:\1 lp:" \
+		-e "s:^#\(Group\).*:\1 lp:" \
+		${D}/etc/cups/cupsd.conf.orig > ${D}/etc/cups/cupsd.conf
+	rm -f ${D}/etc/cups/cupsd.conf.orig
+
+	# foomatic cups filters
+	# now provided by foomatic-scripts
+	#exeinto /usr/lib/cups/filter
+	#doexe ${FILESDIR}/cupsomatic
+	#doexe ${FILESDIR}/foomatic-gswrapper
+
+	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
+
+	insinto /etc/cups; newins ${FILESDIR}/cupsd.conf-1.1.18 cupsd.conf
+}
+
+pkg_postinst() {
+	install -d -m0755 ${ROOT}/var/log/cups
+	install -d -m0755 ${ROOT}/var/spool
+	install -m0700 -o lp -d ${ROOT}/var/spool/cups
+	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
+	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
+	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
+
+	einfo
+	einfo "emerge >=app-text/ghostscript-7.05-r1 if you need to print"
+	einfo "to a non-postscript printer(after cups itself! even if it's"
+	einfo "already installed!)"
+	einfo
+	einfo "You will need foomatic >= 3.0 to work with this version of cups"
+	einfo
+}
diff --git a/net-print/cups/files/cupsd.rc6 b/net-print/cups/files/cupsd.rc6
index 5f88ddb191fd..36b9a6f8db46 100644
--- a/net-print/cups/files/cupsd.rc6
+++ b/net-print/cups/files/cupsd.rc6
@@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/files/cupsd.rc6,v 1.7 2003/02/14 23:09:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/files/cupsd.rc6,v 1.8 2003/07/16 15:08:22 lanius Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
 	ebegin "Starting cupsd"
-	start-stop-daemon --start --quiet --background --exec /usr/sbin/cupsd
+	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
 	eend $?
 }
 
diff --git a/net-print/cups/files/digest-cups-1.1.19-r1 b/net-print/cups/files/digest-cups-1.1.19-r1
new file mode 100644
index 000000000000..6ea23d0802d6
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.19-r1
@@ -0,0 +1 @@
+MD5 04cbeed9a8acfe23624f1cb6be9c3eac cups-1.1.19-source.tar.bz2 3691376