18 files changed, 43 insertions, 716 deletions
diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
index 757e02a48757..26c0d970a66e 100644
--- a/net-print/apsfilter/Manifest
+++ b/net-print/apsfilter/Manifest
@@ -1,5 +1,6 @@
-MD5 67687964b22a5b37eb0ef31510041514 files/digest-apsfilter-7.2.2 68
-MD5 c66ba22f3f09fd2d8a86a033651a22b3 files/digest-apsfilter-7.2.5 68
-MD5 5f6f0adc14bd9a8975e3664835cf13e6 apsfilter-7.2.2.ebuild 1068
 MD5 f86190949e42833a77b9d41229be0d5a ChangeLog 788
+MD5 5f6f0adc14bd9a8975e3664835cf13e6 apsfilter-7.2.2.ebuild 1068
 MD5 05ea7021a958898f37952a41cbffa171 apsfilter-7.2.5.ebuild 1230
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 67687964b22a5b37eb0ef31510041514 files/digest-apsfilter-7.2.2 68
+MD5 c66ba22f3f09fd2d8a86a033651a22b3 files/digest-apsfilter-7.2.5 68
diff --git a/net-print/apsfilter/metadata.xml b/net-print/apsfilter/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/net-print/apsfilter/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 8c90a303b670..5571e0f74eb1 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,4 +1,5 @@
 MD5 7f589148b15eececd99a9509639444e7 cups-pdf-1.0.ebuild 1009
 MD5 f66e650c8e1bb85cbc137467a8162168 ChangeLog 418
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 63d30955280af99d1bc5c3c73d00c038 files/README.gentoo 1141
 MD5 538c06d645a95a87338ea30b2d9b35ac files/digest-cups-pdf-1.0 62
diff --git a/net-print/cups-pdf/metadata.xml b/net-print/cups-pdf/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/net-print/cups-pdf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f451f8a32abf..87f8c00232c9 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,35 +1,26 @@
-MD5 a71bdcfa185edff9f5960bb419f3c8df cups-1.1.19.ebuild 3620
-MD5 d046c66626623f8ae75958f962c29dbe cups-1.1.18-r1.ebuild 3750
-MD5 66aa54b02f913417a66671dbd634e7ad cups-1.1.16.ebuild 3499
-MD5 f2919d88bc222109c6a892ea01397ccf cups-1.1.18-r3.ebuild 3860
-MD5 808c77e6178aa8b6785c34746e02c1a6 cups-1.1.18.ebuild 3743
+MD5 d78a12ad31e092e1b68a52b194fe7a25 ChangeLog 6172
+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
+MD5 5f52182bcf38543eab703c2c04895738 cups-1.1.17_pre20021025.ebuild 3773
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 c248952ab6aaefaa970b5130525988f4 cups-1.1.18-r5.ebuild 3659
-MD5 b81dc4d474ce39d1c7760ff8c0e0ca6e cups-1.1.18-r2.ebuild 3791
+MD5 a71bdcfa185edff9f5960bb419f3c8df cups-1.1.19.ebuild 3620
 MD5 8f89a4986895a42fff11a87876cc13db cups-1.1.19-r1.ebuild 3734
-MD5 000460630c38e7b26d79bc2d7f8d067d cups-1.1.18-r4.ebuild 3864
-MD5 5f52182bcf38543eab703c2c04895738 cups-1.1.17_pre20021025.ebuild 3773
-MD5 d78a12ad31e092e1b68a52b194fe7a25 ChangeLog 6172
-MD5 41bc05dc406a74ccb81469035d595c7f cups-1.1.14-r4.ebuild 3137
-MD5 d668826632fc35de75182b57d217be29 files/foomatic-gswrapper 1710
-MD5 7f2456e05feba9417282438030ea7590 files/cupsomatic 38029
 MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix-1.1.15.diff 308
-MD5 de470d7981a50cb64ac432505df0300f files/cupsd.rc6 492
+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 37d02371d229bd9d500eeea1a2506003 files/digest-cups-1.1.16 72
-MD5 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18 72
-MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19 72
+MD5 543135cac63f9e38f45d656c1b1ef36c files/cups.xinetd 366
+MD5 15f6b6e65285629a82a5d80abec81b1c files/cupsd.conf-1.1.18 20509
+MD5 de470d7981a50cb64ac432505df0300f files/cupsd.rc6 492
+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 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18-r1 72
-MD5 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18-r2 72
-MD5 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18-r3 72
-MD5 23295c953b3c5dfed3b9ecff049f3421 files/digest-cups-1.1.18-r4 72
+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-r1 72
+MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
-MD5 15f6b6e65285629a82a5d80abec81b1c files/cupsd.conf-1.1.18 20509
-MD5 5484493b0e4d631f7ccea67f988ff0e6 files/cups-1.1.18-str75.patchv2 7223
-MD5 dc2809ac1071076672c0a439ddd2c097 files/configure-jpeg-buildfix.diff 432
-MD5 543135cac63f9e38f45d656c1b1ef36c files/cups.xinetd 366
-MD5 6d28fcd42e297a9264764472c29b8f99 files/digest-cups-1.1.17_pre20021025 149
+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.18-r1.ebuild b/net-print/cups/cups-1.1.18-r1.ebuild
deleted file mode 100644
index fd39689f1639..000000000000
--- a/net-print/cups/cups-1.1.18-r1.ebuild
+++ /dev/null
@@ -1,135 +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-r1.ebuild,v 1.4 2003/07/16 14:31:38 pvdabeel 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 ~alpha"
-
-inherit flag-o-matic
-filter-flags -fomit-frame-pointer
-
-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
-
-#	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(after cups itself! even if it's"
-	einfo "already installed!)"
-	einfo
-}
diff --git a/net-print/cups/cups-1.1.18-r2.ebuild b/net-print/cups/cups-1.1.18-r2.ebuild
deleted file mode 100644
index 46e2cfee8f12..000000000000
--- a/net-print/cups/cups-1.1.18-r2.ebuild
+++ /dev/null
@@ -1,136 +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-r2.ebuild,v 1.3 2003/07/16 14:31:38 pvdabeel 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
-	x86? ( >=sys-apps/hotplug-20020401-r1 )"
-RDEPEND="${DEPEND} !virtual/lpr"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-
-inherit flag-o-matic
-filter-flags -fomit-frame-pointer
-
-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
-
-#	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(after cups itself! even if it's"
-	einfo "already installed!)"
-	einfo
-}
diff --git a/net-print/cups/cups-1.1.18-r3.ebuild b/net-print/cups/cups-1.1.18-r3.ebuild
deleted file mode 100644
index 3478da22c296..000000000000
--- a/net-print/cups/cups-1.1.18-r3.ebuild
+++ /dev/null
@@ -1,138 +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-r3.ebuild,v 1.4 2003/07/16 14:31:38 pvdabeel 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
-	x86? ( >=sys-apps/hotplug-20020401-r1 )"
-RDEPEND="${DEPEND} !virtual/lpr"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-
-inherit flag-o-matic
-filter-flags -fomit-frame-pointer
-
-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
-
-#	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
-
-	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.18-r4.ebuild b/net-print/cups/cups-1.1.18-r4.ebuild
deleted file mode 100644
index a58969d82e2f..000000000000
--- a/net-print/cups/cups-1.1.18-r4.ebuild
+++ /dev/null
@@ -1,138 +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-r4.ebuild,v 1.6 2003/07/16 14:31:38 pvdabeel 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
-	usb? ( >=sys-apps/hotplug-20020401-r1 )"
-RDEPEND="${DEPEND} !virtual/lpr"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha hppa"
-
-inherit flag-o-matic
-filter-flags -fomit-frame-pointer
-
-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
-
-#	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
-
-	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.18.ebuild b/net-print/cups/cups-1.1.18.ebuild
deleted file mode 100644
index ef602accc706..000000000000
--- a/net-print/cups/cups-1.1.18.ebuild
+++ /dev/null
@@ -1,135 +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.ebuild,v 1.6 2003/02/13 15:24:10 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 alpha"
-
-inherit flag-o-matic
-filter-flags -fomit-frame-pointer
-
-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
-
-#	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(after cups itself! even if it's"
-	einfo "already installed!)"
-	einfo
-}
diff --git a/net-print/cups/files/digest-cups-1.1.18 b/net-print/cups/files/digest-cups-1.1.18
deleted file mode 100644
index 0d007fa65558..000000000000
--- a/net-print/cups/files/digest-cups-1.1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a8a423a8268d088bffa19f6515883a7 cups-1.1.18-source.tar.bz2 3491321
diff --git a/net-print/cups/files/digest-cups-1.1.18-r1 b/net-print/cups/files/digest-cups-1.1.18-r1
deleted file mode 100644
index 0d007fa65558..000000000000
--- a/net-print/cups/files/digest-cups-1.1.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a8a423a8268d088bffa19f6515883a7 cups-1.1.18-source.tar.bz2 3491321
diff --git a/net-print/cups/files/digest-cups-1.1.18-r2 b/net-print/cups/files/digest-cups-1.1.18-r2
deleted file mode 100644
index 0d007fa65558..000000000000
--- a/net-print/cups/files/digest-cups-1.1.18-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a8a423a8268d088bffa19f6515883a7 cups-1.1.18-source.tar.bz2 3491321
diff --git a/net-print/cups/files/digest-cups-1.1.18-r3 b/net-print/cups/files/digest-cups-1.1.18-r3
deleted file mode 100644
index 0d007fa65558..000000000000
--- a/net-print/cups/files/digest-cups-1.1.18-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a8a423a8268d088bffa19f6515883a7 cups-1.1.18-source.tar.bz2 3491321
diff --git a/net-print/cups/files/digest-cups-1.1.18-r4 b/net-print/cups/files/digest-cups-1.1.18-r4
deleted file mode 100644
index 0d007fa65558..000000000000
--- a/net-print/cups/files/digest-cups-1.1.18-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a8a423a8268d088bffa19f6515883a7 cups-1.1.18-source.tar.bz2 3491321
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/net-print/cups/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/net-print/fax4cups/Manifest b/net-print/fax4cups/Manifest
index 4442423d4f18..5de55ebc91ba 100644
--- a/net-print/fax4cups/Manifest
+++ b/net-print/fax4cups/Manifest
@@ -1,3 +1,4 @@
 MD5 c08d175dca12ee58f357d96604af372a fax4cups-1.23.ebuild 705
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 3ef65a274426c71ec67f84f632e9ed3e ChangeLog 391
 MD5 7956a31b83df33c70e9f633407f52dc8 files/digest-fax4cups-1.23 64
diff --git a/net-print/fax4cups/metadata.xml b/net-print/fax4cups/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/net-print/fax4cups/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>