significant upgrade of the cups package. added the latest version:

cups-1.1.10-1

the extra -1 is a makefile fix on their end so ive left it named
cups-1.1.10

Anyway, I've fixed an obscure jpeg support issue, added rc5/rc6
support, completely overhauled the ebuild for maintainability's sake,
integrated the system with our passwd/group database (lp uid/gid),
spiffed up the docs, provided an rc6 style initscript and probably
other stuff im forgetting to mention <g>

14 files changed, 217 insertions, 219 deletions

diff --git a/net-print/cups/cups-1.1.10-r6.ebuild b/net-print/cups/cups-1.1.10-r6.ebuild
new file mode 100644
index 000000000000..66c69606c9cb
--- /dev/null
+++ b/net-print/cups/cups-1.1.10-r6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer System Team <system@gentoo.org>
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.10-r6.ebuild,v 1.1 2001/10/10 09:28:34 woodchip Exp $
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org"
+
+S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-1-source.tar.bz2"
+PROVIDE="virtual/lpr"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	>=media-libs/libpng-1.0.12
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b
+	!net-print/LPRng"
+
+src_unpack() {
+
+	unpack ${A} ; cd ${S}
+	# make sure libcupsimage gets linked with libjpeg
+	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix.diff
+	assert "bad patchfile"
+}
+
+src_compile() {
+
+	local myconf
+	use pam || myconf="${myconf} --disable-pam"
+	use ssl || myconf="${myconf} --disable-ssl"
+
+	./configure --host=${CHOST} ${myconf} --with-cups-user=lp --with-cups-group=lp
+	assert "bad configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+
+	# set these up now or make install will.. and that aint pretty!
+	diropts -m 755 ; dodir /var/spool
+	diropts -m 755 ; dodir /var/log/cups
+	diropts -m 755 ; dodir /etc/cups
+
+	# lets do it this way
+	make \
+	LOCALEDIR=${D}/usr/share/locale \
+	DOCDIR=${D}/usr/share/doc/${P} \
+	REQUESTS=${D}/var/spool/cups \
+	SERVERBIN=${D}/usr/lib/cups \
+	DATADIR=${D}/usr/share/cups \
+	INCLUDEDIR=${D}/usr/include \
+	AMANDIR=${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 \
+	INITDIR=${D}/etc \
+	PREFIX=${D} \
+	install || die "install problem"
+
+	# add a few more docs; pdfs and html get inserted for us in DOCDIR above :)
+	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
+	insinto /usr/share/doc/${P} ; doins LICENSE.html
+
+	# cleanups and fixups
+	rm -rf ${D}/etc/init.d
+	rm -rf ${D}/etc/pam.d
+	rm -rf ${D}/etc/rc*
+	rm -rf ${D}/usr/share/man/cat*
+	dosed "s:#DocumentRoot /usr/share/doc/cups:DocumentRoot /usr/share/doc/${P}:" /etc/cups/cupsd.conf
+	dosed "s:#SystemGroup sys:SystemGroup lp:" /etc/cups/cupsd.conf
+	dosed "s:#User lp:User lp:" /etc/cups/cupsd.conf
+	dosed "s:#Group sys:Group lp:" /etc/cups/cupsd.conf
+
+	# sanity checks
+	chown lp.root ${D}/usr/bin/lppasswd ; chmod 4755 ${D}/usr/bin/lppasswd
+	chown lp.root ${D}/etc/cups/certs ; chmod 711 ${D}/etc/cups/certs
+	chown lp.root ${D}/var/spool/cups ; chmod 0700 ${D}/var/spool/cups
+	chown lp.root ${D}/var/spool/cups/tmp ; chmod 01700 ${D}/var/spool/cups/tmp
+
+	# gentoo config stuff
+	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
+}
diff --git a/net-print/cups/cups-1.1.10.ebuild b/net-print/cups/cups-1.1.10.ebuild
new file mode 100644
index 000000000000..ea500158bdbf
--- /dev/null
+++ b/net-print/cups/cups-1.1.10.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer System Team <system@gentoo.org>
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.10.ebuild,v 1.1 2001/10/10 09:28:34 woodchip Exp $
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org"
+
+S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-1-source.tar.bz2"
+PROVIDE="virtual/lpr"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	>=media-libs/libpng-1.0.12
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b
+	!net-print/LPRng"
+
+src_unpack() {
+
+	unpack ${A} ; cd ${S}
+	# make sure libcupsimage gets linked with libjpeg
+	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix.diff
+	assert "bad patchfile"
+}
+
+src_compile() {
+
+	local myconf
+	use pam || myconf="${myconf} --disable-pam"
+	use ssl || myconf="${myconf} --disable-ssl"
+
+	./configure --host=${CHOST} ${myconf} --with-cups-user=lp --with-cups-group=lp
+	assert "bad configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+
+	# set these up now or make install will.. and that aint pretty!
+	diropts -m 755 ; dodir /var/spool
+	diropts -m 755 ; dodir /var/log/cups
+	diropts -m 755 ; dodir /etc/cups
+
+	# lets do it this way
+	make \
+	LOCALEDIR=${D}/usr/share/locale \
+	DOCDIR=${D}/usr/share/doc/${P} \
+	REQUESTS=${D}/var/spool/cups \
+	SERVERBIN=${D}/usr/lib/cups \
+	DATADIR=${D}/usr/share/cups \
+	INCLUDEDIR=${D}/usr/include \
+	AMANDIR=${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 \
+	INITDIR=${D}/etc \
+	PREFIX=${D} \
+	install || die "install problem"
+
+	# add a few more docs; pdfs and html get inserted for us in DOCDIR above :)
+	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
+	insinto /usr/share/doc/${P} ; doins LICENSE.html
+
+	# cleanups and fixups
+	rm -rf ${D}/etc/init.d
+	rm -rf ${D}/etc/pam.d
+	rm -rf ${D}/etc/rc*
+	rm -rf ${D}/usr/share/man/cat*
+	dosed "s:#DocumentRoot /usr/share/doc/cups:DocumentRoot /usr/share/doc/${P}:" /etc/cups/cupsd.conf
+	dosed "s:#SystemGroup sys:SystemGroup lp:" /etc/cups/cupsd.conf
+	dosed "s:#User lp:User lp:" /etc/cups/cupsd.conf
+	dosed "s:#Group sys:Group lp:" /etc/cups/cupsd.conf
+
+	# sanity checks
+	chown lp.root ${D}/usr/bin/lppasswd ; chmod 4755 ${D}/usr/bin/lppasswd
+	chown lp.root ${D}/etc/cups/certs ; chmod 711 ${D}/etc/cups/certs
+	chown lp.root ${D}/var/spool/cups ; chmod 0700 ${D}/var/spool/cups
+	chown lp.root ${D}/var/spool/cups/tmp ; chmod 01700 ${D}/var/spool/cups/tmp
+
+	# gentoo config stuff
+	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
+	exeinto /etc/rc.d/init.d ; newexe ${FILESDIR}/cupsd.rc5 cupsd
+}
diff --git a/net-print/cups/cups-1.1.7.ebuild b/net-print/cups/cups-1.1.7.ebuild
deleted file mode 100644
index fa104759331a..000000000000
--- a/net-print/cups/cups-1.1.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# Updated by Sebastian Werner <sebastian@werner-productions.de>
-# /home/cvsroot/gentoo-x86/net-print/cups/cups-1.1.6.ebuild,v 1.1 2001/04/28 04:19:58 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.7.ebuild,v 1.6 2001/08/31 03:23:39 pm Exp $
-
-
-S=${WORKDIR}/${PN}-1.1.7
-DESCRIPTION="The Common Unix Printing System"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/1.1.7/${PN}-1.1.7-source.tar.bz2"
-
-HOMEPAGE="http://www.cups.org"
-
-PROVIDE="virtual/lpr"
-
-DEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=media-libs/libpng-1.0.9
-	>=media-libs/tiff-3.5.5
-	!net-print/LPRng"
-
-
-src_compile() {
-
-    local myconf
-    if [ "`use pam`" ]
-    then
-      myconf="--enable-pam"
-    fi
-    if [ "`use ssl`" ]
-    then
-      myconf="${myconf} --enable-ssl"
-    fi
-    try ./configure --prefix=/ -exec-prefix=/usr \
-		    --mandir=/usr/share/man --host=${CHOST} ${myconf}
-    cp config.h config.h.orig
-    sed  -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	config.h.orig > config.h
-    cp Makedefs Makedefs.orig
-    sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	Makedefs.orig > Makedefs 
-    try make 
-}
-
-src_install () {
-
-    cd ${S}
-    try make exec_prefix=${D}/usr  prefix=${D}/ \
-	datadir=${D}/usr/share localstatedir=${D}/var \
-	includedir=${D}/usr/include sysconfdir=${D}/etc \
-	MANDIR=${D}/usr/share/man PAMDIR=${D}/etc/pam.d \
-	INITDIR=${D}/etc/rc.d DOCDIR=${D}/usr/share/cups/doc \
-	install 
-    rm -rf ${D}/etc/rc.d
-    rm -rf ${D}/usr/man/cat*
-    cd ${S}
-    dodoc *.txt 
-    docinto html
-    dodoc LICENSE.html
-
-    insinto /etc/rc.d/init.d
-    insopts -m 755
-    doins ${FILESDIR}/cupsd
-    insinto /etc/pam.d
-    insopts -m 644
-    doins ${FILESDIR}/cups
-
-}
-
-
diff --git a/net-print/cups/cups-1.1.8.ebuild b/net-print/cups/cups-1.1.8.ebuild
deleted file mode 100644
index 983f4d4d8ea4..000000000000
--- a/net-print/cups/cups-1.1.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# Updated by Sebastian Werner <sebastian@werner-productions.de>
-# /home/cvsroot/gentoo-x86/net-print/cups/cups-1.1.6.ebuild,v 1.1 2001/04/28 04:19:58 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.8.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-S=${WORKDIR}/${PN}-1.1.8
-DESCRIPTION="The Common Unix Printing System"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/1.1.8/${PN}-1.1.8-source.tar.bz2"
-
-HOMEPAGE="http://www.cups.org"
-
-PROVIDE="virtual/lpr"
-
-DEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=media-libs/libpng-1.0.9
-	>=media-libs/tiff-3.5.5
-	!net-print/LPRng"
-
-
-src_compile() {
-
-    local myconf
-    if [ "`use pam`" ]
-    then
-      myconf="--enable-pam"
-    fi
-    if [ "`use ssl`" ]
-    then
-      myconf="${myconf} --enable-ssl"
-    fi
-    try ./configure --prefix=/ -exec-prefix=/usr \
-		    --mandir=/usr/share/man --host=${CHOST} ${myconf}
-    cp config.h config.h.orig
-    sed  -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	config.h.orig > config.h
-    cp Makedefs Makedefs.orig
-    sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	Makedefs.orig > Makedefs 
-    try make 
-}
-
-src_install () {
-
-    cd ${S}
-    try make exec_prefix=${D}/usr  prefix=${D}/ \
-	datadir=${D}/usr/share localstatedir=${D}/var \
-	includedir=${D}/usr/include sysconfdir=${D}/etc \
-	MANDIR=${D}/usr/share/man PAMDIR=${D}/etc/pam.d \
-	INITDIR=${D}/etc/rc.d DOCDIR=${D}/usr/share/cups/doc \
-	install 
-    rm -rf ${D}/etc/rc.d
-    rm -rf ${D}/usr/man/cat*
-    cd ${S}
-    dodoc *.txt 
-    docinto html
-    dodoc LICENSE.html
-
-    insinto /etc/rc.d/init.d
-    insopts -m 755
-    doins ${FILESDIR}/cupsd
-    insinto /etc/pam.d
-    insopts -m 644
-    doins ${FILESDIR}/cups
-
-}
-
-
diff --git a/net-print/cups/cups-1.1.9.ebuild b/net-print/cups/cups-1.1.9.ebuild
deleted file mode 100644
index dde0964f9b59..000000000000
--- a/net-print/cups/cups-1.1.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# Updated by Sebastian Werner <sebastian@werner-productions.de>
-# /home/cvsroot/gentoo-x86/net-print/cups/cups-1.1.6.ebuild,v 1.1 2001/04/28 04:19:58 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.9.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Common Unix Printing System"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
-
-HOMEPAGE="http://www.cups.org"
-
-PROVIDE="virtual/lpr"
-
-DEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=media-libs/libpng-1.0.9
-	>=media-libs/tiff-3.5.5
-	!net-print/LPRng"
-
-
-src_compile() {
-
-    local myconf
-    if [ "`use pam`" ]
-    then
-      myconf="--enable-pam"
-    fi
-    if [ "`use ssl`" ]
-    then
-      myconf="${myconf} --enable-ssl"
-    fi
-    try ./configure --prefix=/ -exec-prefix=/usr \
-		    --mandir=/usr/share/man --host=${CHOST} ${myconf}
-    cp config.h config.h.orig
-    sed  -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	config.h.orig > config.h
-    cp Makedefs Makedefs.orig
-    sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
-	Makedefs.orig > Makedefs 
-    try make 
-}
-
-src_install () {
-
-    cd ${S}
-    try make exec_prefix=${D}/usr  prefix=${D}/ \
-	datadir=${D}/usr/share localstatedir=${D}/var \
-	includedir=${D}/usr/include sysconfdir=${D}/etc \
-	MANDIR=${D}/usr/share/man PAMDIR=${D}/etc/pam.d \
-	INITDIR=${D}/etc/rc.d DOCDIR=${D}/usr/share/cups/doc \
-	install 
-    rm -rf ${D}/etc/rc.d
-    rm -rf ${D}/usr/man/cat*
-    cd ${S}
-    dodoc *.txt 
-    docinto html
-    dodoc LICENSE.html
-
-    insinto /etc/rc.d/init.d
-    insopts -m 755
-    doins ${FILESDIR}/cupsd
-    insinto /etc/pam.d
-    insopts -m 644
-    doins ${FILESDIR}/cups
-
-}
-
-
diff --git a/net-print/cups/files/configure-jpeg-buildfix.diff b/net-print/cups/files/configure-jpeg-buildfix.diff
new file mode 100644
index 000000000000..df5cb3c35d10
--- /dev/null
+++ b/net-print/cups/files/configure-jpeg-buildfix.diff
@@ -0,0 +1,12 @@
+diff -u -r cups-1.1.10.orig/configure cups-1.1.10/configure
+--- configure.orig	Fri Aug 17 12:54:44 2001
++++ configure	Mon Oct  8 15:55:28 2001
+@@ -3461,7 +3461,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 3463 "configure"
+ #include "confdefs.h"
+-#include <jpeglib.h>
++/* #include <jpeglib.h> */
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:3468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/net-print/cups/files/cups b/net-print/cups/files/cups.pam
index f38e70184afb..f38e70184afb 100644
--- a/net-print/cups/files/cups
+++ b/net-print/cups/files/cups.pam
diff --git a/net-print/cups/files/cupsd b/net-print/cups/files/cupsd.rc5
index 4a46bf7b637c..4a46bf7b637c 100644
--- a/net-print/cups/files/cupsd
+++ b/net-print/cups/files/cupsd.rc5
diff --git a/net-print/cups/files/cupsd.rc6 b/net-print/cups/files/cupsd.rc6
new file mode 100644
index 000000000000..f2888c1c42d8
--- /dev/null
+++ b/net-print/cups/files/cupsd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cupsd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cupsd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
+	eend $?
+}
diff --git a/net-print/cups/files/digest-cups-1.1.10 b/net-print/cups/files/digest-cups-1.1.10
new file mode 100644
index 000000000000..a78027e13067
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.10
@@ -0,0 +1 @@
+MD5 e5f2b25fa2caa5f26f21432ec1e9eaac cups-1.1.10-1-source.tar.bz2
diff --git a/net-print/cups/files/digest-cups-1.1.10-r6 b/net-print/cups/files/digest-cups-1.1.10-r6
new file mode 100644
index 000000000000..a78027e13067
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.10-r6
@@ -0,0 +1 @@
+MD5 e5f2b25fa2caa5f26f21432ec1e9eaac cups-1.1.10-1-source.tar.bz2
diff --git a/net-print/cups/files/digest-cups-1.1.7 b/net-print/cups/files/digest-cups-1.1.7
deleted file mode 100644
index 79c7b6f76ed7..000000000000
--- a/net-print/cups/files/digest-cups-1.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2345d9762a6ba3e47cd0784e5ca1a36 cups-1.1.7-source.tar.bz2
diff --git a/net-print/cups/files/digest-cups-1.1.8 b/net-print/cups/files/digest-cups-1.1.8
deleted file mode 100644
index ba1392f33341..000000000000
--- a/net-print/cups/files/digest-cups-1.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf25b260672671183f18f26b8f8d71f1 cups-1.1.8-source.tar.bz2
diff --git a/net-print/cups/files/digest-cups-1.1.9 b/net-print/cups/files/digest-cups-1.1.9
deleted file mode 100644
index 83a586038aa2..000000000000
--- a/net-print/cups/files/digest-cups-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a06fe8d7f35a5cb1f484919261cba24 cups-1.1.9-source.tar.bz2