stable bump

19 files changed, 30 insertions, 668 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 019a3615010e..8a8f765a4e41 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2003/07/25 08:59:42 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.47 2003/07/29 13:20:02 lanius Exp $
+
+  29 Jul 2003; lanius@gentoo.org cups-1.1.14-r4.ebuild, cups-1.1.15-r2.ebuild,
+  cups-1.1.16.ebuild, cups-1.1.18-r5.ebuild, cups-1.1.19-r1.ebuild,
+  files/configure-jpeg-buildfix-1.1.15.diff:
+  bumped 1.1.19-r1 to stable, cleaned up old packages
 
   25 Jul 2003; lanius@gentoo.org files/cupsd.rc6:
   added use logger to init.d script (bug #25214)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 6d50768824e2..1a2abec2ff87 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,26 +1,17 @@
-MD5 4075512ba8f05f13257b147e45ca3e97 ChangeLog 6486
-MD5 d654d8b57ac94bca75d9bc9b62123297 cups-1.1.14-r4.ebuild 3138
-MD5 c3545164f28e775ffa88bb9769c995f0 cups-1.1.15-r2.ebuild 3275
-MD5 3103d46299e7ba6689c0cd89334cb985 cups-1.1.16.ebuild 3500
-MD5 5f52182bcf38543eab703c2c04895738 cups-1.1.17_pre20021025.ebuild 3773
+MD5 4c7738279d91929c6f947daa77858984 ChangeLog 6733
+MD5 c248952ab6aaefaa970b5130525988f4 cups-1.1.18-r5.ebuild 3659
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 94a5b0aa188c852fd5ce5cf57f3fb35e cups-1.1.18-r5.ebuild 3660
+MD5 ec2483403547fe93498a26ced706c2bc cups-1.1.19-r1.ebuild 3745
 MD5 a71bdcfa185edff9f5960bb419f3c8df cups-1.1.19.ebuild 3620
-MD5 fa0d61b07344a292e758a17d09b8be4e cups-1.1.19-r1.ebuild 3751
-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 cc4ea180acf9945f4c121de0c02093e7 files/cups.pam 233
-MD5 ea78abb13208bbcb5b870b53abc64a7e files/cups.xinetd 367
+MD5 4d42d58387ed0a01b5f4e49ace9a8c0a files/cups.pam 232
+MD5 543135cac63f9e38f45d656c1b1ef36c files/cups.xinetd 366
 MD5 15f6b6e65285629a82a5d80abec81b1c files/cupsd.conf-1.1.18 20509
 MD5 0d7d8bca89796c3b0f58e7cb70db9e88 files/cupsd.rc6 519
 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
-MD5 37d02371d229bd9d500eeea1a2506003 files/digest-cups-1.1.16 72
-MD5 6d28fcd42e297a9264764472c29b8f99 files/digest-cups-1.1.17_pre20021025 149
 MD5 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18-r5 72
 MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
-MD5 a3301abd5242f434926ff77967e352d0 files/foomatic-gswrapper 1711
+MD5 d668826632fc35de75182b57d217be29 files/foomatic-gswrapper 1710
 MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19-r1 72
diff --git a/net-print/cups/cups-1.1.14-r4.ebuild b/net-print/cups/cups-1.1.14-r4.ebuild
deleted file mode 100644
index b9b8eab3c062..000000000000
--- a/net-print/cups/cups-1.1.14-r4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.14-r4.ebuild,v 1.9 2003/02/13 15:23:22 vapier Exp $
-
-IUSE="ssl slp pam"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org"
-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"
-RDEPEND="${DEPEND} !virtual/lpr"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# make sure libcupsimage gets linked with libjpeg
-	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix.diff || die
-	patch -p1 < ${FILESDIR}/disable-strip.patch || 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
-
-	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
-	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
-}
-
-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}
-}
diff --git a/net-print/cups/cups-1.1.15-r2.ebuild b/net-print/cups/cups-1.1.15-r2.ebuild
deleted file mode 100644
index ed0087b96f8d..000000000000
--- a/net-print/cups/cups-1.1.15-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.15-r2.ebuild,v 1.8 2003/02/13 15:23:28 vapier Exp $
-
-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}-1-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"
-RDEPEND="${DEPEND} !virtual/lpr"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-	# make sure libcupsimage gets linked with libjpeg
-	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
-	patch -p1 < ${FILESDIR}/disable-strip.patch || 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
-
-	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
-	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
-
-}
-
-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"
-	einfo
-
-}
diff --git a/net-print/cups/cups-1.1.16.ebuild b/net-print/cups/cups-1.1.16.ebuild
deleted file mode 100644
index 9601e24c3b4d..000000000000
--- a/net-print/cups/cups-1.1.16.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.16.ebuild,v 1.4 2003/02/13 15:23:34 vapier Exp $
-
-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"
-RDEPEND="${DEPEND} !virtual/lpr"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	#make sure libcupsimage gets linked with libjpeg
-	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
-	patch -p1 < ${FILESDIR}/disable-strip.patch || die
-	#known problem, probably will be fixed next release //woodchip; #9188
-	cd pdftops && cp Makefile Makefile.orig
-	sed -e 's|FTFont.o||' \
-		-e 's|SFont.o||' \
-		-e 's|T1Font.o||' \
-		-e 's|TTFont.o||' Makefile.orig > Makefile
-}
-
-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
-
-	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
-	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
-}
-
-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"
-	einfo
-}
diff --git a/net-print/cups/cups-1.1.17_pre20021025.ebuild b/net-print/cups/cups-1.1.17_pre20021025.ebuild
deleted file mode 100644
index 92413766c7a9..000000000000
--- a/net-print/cups/cups-1.1.17_pre20021025.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.17_pre20021025.ebuild,v 1.8 2003/07/16 14:31:38 pvdabeel Exp $
-
-IUSE="ssl slp pam"
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org"
-
-PORIG="cups-1.1.16"
-PPATCH="cups-1.1.17_pre20021025"
-
-S=${WORKDIR}/${PORIG}
-SRC_URI="ftp://ftp.easysw.com/pub/cups/1.1.16/${PORIG}-source.tar.bz2
-	mirror://gentoo/${PPATCH}.diff.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"
-RDEPEND="${DEPEND} !virtual/lpr"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-
-src_unpack() {
-	unpack ${PORIG}-source.tar.bz2 || die
-	cd ${S} || die
-	#make sure libcupsimage gets linked with libjpeg 
-#	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
-#	patch -p1 < ${FILESDIR}/disable-strip.patch || die
-
-	bzip2 -dc ${DISTDIR}/${PPATCH}.diff.bz2 | patch -p1 || die
-	WANT_AUTOCONF_2_5=1 autoconf || die
-
-	#known problem, probably will be fixed next release //woodchip; #9188
-	#covered by above patch...
-#	cd pdftops && cp Makefile Makefile.orig
-#	sed -e 's|FTFont.o||' \
-#		-e 's|SFont.o||' \
-#		-e 's|T1Font.o||' \
-#		-e 's|TTFont.o||' Makefile.orig > Makefile
-}
-
-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
-
-	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
-	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
-}
-
-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"
-	einfo
-}
diff --git a/net-print/cups/cups-1.1.18-r5.ebuild b/net-print/cups/cups-1.1.18-r5.ebuild
deleted file mode 100644
index 7b9be806d1eb..000000000000
--- a/net-print/cups/cups-1.1.18-r5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.18-r5.ebuild,v 1.3 2003/06/17 18:24:08 woodchip 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
-
-	epatch ${FILESDIR}/${P}-str75.patchv2
-
-	#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
-	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
-}
diff --git a/net-print/cups/cups-1.1.19-r1.ebuild b/net-print/cups/cups-1.1.19-r1.ebuild
index 78a48ec4872f..c6273e3912b5 100644
--- a/net-print/cups/cups-1.1.19-r1.ebuild
+++ b/net-print/cups/cups-1.1.19-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2003/07/23 09:23:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.19-r1.ebuild,v 1.4 2003/07/29 13:20:02 lanius Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,7 +27,7 @@ has_version net-print/foomatic && newdepend ">=net-print/foomatic-3.0.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 
 filter-flags -fomit-frame-pointer
 
diff --git a/net-print/cups/files/configure-jpeg-buildfix-1.1.15.diff b/net-print/cups/files/configure-jpeg-buildfix-1.1.15.diff
deleted file mode 100644
index 6c706a48d51e..000000000000
--- a/net-print/cups/files/configure-jpeg-buildfix-1.1.15.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure~	2002-06-17 03:43:29.000000000 -0400
-+++ configure	2002-06-17 03:42:55.000000000 -0400
-@@ -6359,7 +6359,6 @@
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
--#include <jpeglib.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
diff --git a/net-print/cups/files/digest-cups-1.1.14-r4 b/net-print/cups/files/digest-cups-1.1.14-r4
deleted file mode 100644
index b2cf7e05bf18..000000000000
--- a/net-print/cups/files/digest-cups-1.1.14-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7cc9725d94568b24f5ade78fb7e26480 cups-1.1.14-source.tar.bz2 5408714
diff --git a/net-print/cups/files/digest-cups-1.1.15-r2 b/net-print/cups/files/digest-cups-1.1.15-r2
deleted file mode 100644
index 3b9c060869de..000000000000
--- a/net-print/cups/files/digest-cups-1.1.15-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 971a14d35f61ea19871616f437e199a2 cups-1.1.15-1-source.tar.bz2 2962392
diff --git a/net-print/cups/files/digest-cups-1.1.16 b/net-print/cups/files/digest-cups-1.1.16
deleted file mode 100644
index a310d4c80d58..000000000000
--- a/net-print/cups/files/digest-cups-1.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4856f3104529341a13652142a8c176e6 cups-1.1.16-source.tar.bz2 3394088
diff --git a/net-print/cups/files/digest-cups-1.1.17_pre20021025 b/net-print/cups/files/digest-cups-1.1.17_pre20021025
deleted file mode 100644
index b9ec9d78c035..000000000000
--- a/net-print/cups/files/digest-cups-1.1.17_pre20021025
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4856f3104529341a13652142a8c176e6 cups-1.1.16-source.tar.bz2 3394088
-MD5 c85e2726ba02c85886e1e9720eba9a72 cups-1.1.17_pre20021025.diff.bz2 921966
diff --git a/net-print/foomatic/ChangeLog b/net-print/foomatic/ChangeLog
index 5cbf19fa5e77..7d794881a5dd 100644
--- a/net-print/foomatic/ChangeLog
+++ b/net-print/foomatic/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/foomatic
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/ChangeLog,v 1.12 2003/07/16 14:46:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/ChangeLog,v 1.13 2003/07/29 13:19:17 lanius Exp $
+
+  29 Jul 2003; lanius@gentoo.org foomatic-3.0.0.ebuild:
+  stable bump
 
 *foomatic-3.0.0 (16 Jul 2003)
 
diff --git a/net-print/foomatic/Manifest b/net-print/foomatic/Manifest
index 6fa1d6b9095c..5b7ca7090817 100644
--- a/net-print/foomatic/Manifest
+++ b/net-print/foomatic/Manifest
@@ -1,7 +1,7 @@
-MD5 1d38215919fd492ff0326171faabc41c ChangeLog 1806
+MD5 716c32bda4d2068a65331fb7539225a9 ChangeLog 1877
 MD5 4cea2f84c71cd98c953a8705b2e8358f foomatic-2.0.0.ebuild 1163
 MD5 0b9b88a8c9866950b9eedfbc2621bde2 foomatic-2.0.2.ebuild 1175
-MD5 eb1f4180d581e67b736bf0a09307513b foomatic-3.0.0.ebuild 675
+MD5 5194ce4af18701d41639688842981e6a foomatic-3.0.0.ebuild 669
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 046741b15c8760c082192130eb039f7b files/digest-foomatic-2.0.0 66
 MD5 6a9b6266c601f3cac0d0e7b58179f7ce files/digest-foomatic-2.0.2 66
diff --git a/net-print/foomatic/foomatic-3.0.0.ebuild b/net-print/foomatic/foomatic-3.0.0.ebuild
index 24d089fa1042..f42986c3753f 100644
--- a/net-print/foomatic/foomatic-3.0.0.ebuild
+++ b/net-print/foomatic/foomatic-3.0.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/foomatic-3.0.0.ebuild,v 1.2 2003/07/23 09:20:07 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/foomatic-3.0.0.ebuild,v 1.3 2003/07/29 13:19:17 lanius Exp $
 
 DESCRIPTION="The Foomatic printing meta package"
 HOMEPAGE="http://www.linuxprinting.org/foomatic"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
 DEPEND="net-print/foomatic-filters
diff --git a/net-print/hpijs/ChangeLog b/net-print/hpijs/ChangeLog
index 6d4f2d8f442c..746b72a9f9ac 100644
--- a/net-print/hpijs/ChangeLog
+++ b/net-print/hpijs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/hpijs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.12 2003/07/16 14:59:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.13 2003/07/29 13:21:07 lanius Exp $
+
+  29 Jul 2003; lanius@gentoo.org hpijs-1.4.1.ebuild:
+  stable bump
 
 *hpijs-1.4.1 (16 Jul 2003)
 
diff --git a/net-print/hpijs/Manifest b/net-print/hpijs/Manifest
index 886493efab8d..131fba82e364 100644
--- a/net-print/hpijs/Manifest
+++ b/net-print/hpijs/Manifest
@@ -1,9 +1,9 @@
-MD5 aa437b847b37a12c04060fd2df1ab35c ChangeLog 1572
+MD5 6a12025d898283820e9abe6acc0d1efa ChangeLog 1640
 MD5 b5d0832a52412ad4f493931254b372ef hpijs-1.2.2-r1.ebuild 1697
 MD5 0377dd078d150bee0932a8e9f314349d hpijs-1.2.2.ebuild 1505
 MD5 bda7c182e6c9efa8c1fea711917c85eb hpijs-1.3.1.ebuild 1483
 MD5 e1a13618d261ad09f57440e7813f6b5f hpijs-1.3.ebuild 1506
-MD5 00b064a61d29187f67a9035d5b4fe094 hpijs-1.4.1.ebuild 2005
+MD5 663f55cb1e83aa84c54320ceab771280 hpijs-1.4.1.ebuild 1999
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 87ebdebe7df10e17d9ae4de8eb1cba8f files/digest-hpijs-1.2.2 63
 MD5 f70bb3ce628e7e39a89afcf922e251d7 files/digest-hpijs-1.2.2-r1 130
diff --git a/net-print/hpijs/hpijs-1.4.1.ebuild b/net-print/hpijs/hpijs-1.4.1.ebuild
index d0e1610f63d9..44107721e4ac 100644
--- a/net-print/hpijs/hpijs-1.4.1.ebuild
+++ b/net-print/hpijs/hpijs-1.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.4.1.ebuild,v 1.2 2003/07/23 09:27:10 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.4.1.ebuild,v 1.3 2003/07/29 13:21:07 lanius Exp $
 
 DESCRIPTION="The HP Inkjet server for Ghostscript. Provides best output for HP Inkjet Printers"
 HOMEPAGE="http://hpinkjet.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ppc alpha sparc hppa amd64"
 SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
 	http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-1.4-1.tar.gz"
 DEPEND="app-text/ghostscript