Fix poppler/xpdf depend for the stable package and remove unused ebuilds

(Portage version: 2.1_pre3-r1)

10 files changed, 10 insertions, 649 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 3e454e868f84..02abde97aea0 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.149 2006/01/09 15:32:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.150 2006/01/10 18:51:12 genstef Exp $
+
+  10 Jan 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.1.23-r2.ebuild,
+  -cups-1.1.23-r3.ebuild, cups-1.1.23-r4.ebuild, -cups-1.1.23-r5.ebuild,
+  -cups-1.1.23-r6.ebuild:
+  Fix poppler/xpdf depend for the stable package and remove unused ebuilds
 
   09 Jan 2006; Jeroen Roovers <jer@gentoo.org> cups-1.1.23-r7.ebuild:
   Marked hppa stable (bug #117495).
diff --git a/net-print/cups/cups-1.1.23-r2.ebuild b/net-print/cups/cups-1.1.23-r2.ebuild
deleted file mode 100644
index 353770105b39..000000000000
--- a/net-print/cups/cups-1.1.23-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r2.ebuild,v 1.4 2005/10/03 11:37:14 matsuu Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl slp pam samba nls"
-
-DEP="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	nls? ( sys-devel/gettext )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	use amd64 && epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	( cd pdftops; epatch ${FILESDIR}/xpdf-goo-sizet.patch )
-	( cd pdftops; epatch ${FILESDIR}/cups-1.1.22-xpdf2-underflow.patch )
-	( cd pdftops; epatch ${FILESDIR}/xpdf-pl3.patch )
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_test() {
-	# upstream includes an interactive test which is a nono for gentoo.
-	# therefore, since the printing herd has bigger fish to fry, for now,
-	# we just leave it out, even if FEATURES=test
-	true
-}
-
-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/$(get_libdir)/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/$(get_libdir) \
-	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
-
-	# 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
-
-	sed -i -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
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
-	fi
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.types
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.conv
-}
-
-
-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 "If you're using a USB printer, \"emerge coldplug; rc-update add"
-	einfo "coldplug boot\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-}
diff --git a/net-print/cups/cups-1.1.23-r3.ebuild b/net-print/cups/cups-1.1.23-r3.ebuild
deleted file mode 100644
index 8d27d7885fba..000000000000
--- a/net-print/cups/cups-1.1.23-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r3.ebuild,v 1.6 2005/07/29 15:54:28 smithj Exp $
-
-inherit eutils flag-o-matic pam
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-http://www.srz.de/Members/bla/cups/filter/pdftops/pdftops.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl slp pam samba nls cjk"
-
-DEP="pam? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	nls? ( sys-devel/gettext )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr
-	app-text/xpdf"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	WANT_AUTOCONF=2.5 autoconf || die
-
-	# disable builtin xpdf
-	sed -i -e "s:pdftops::" Makefile
-}
-
-src_compile() {
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_test() {
-	# upstream includes an interactive test which is a nono for gentoo.
-	# therefore, since the printing herd has bigger fish to fry, for now,
-	# we just leave it out, even if FEATURES=test
-	true
-	}
-
-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/$(get_libdir)/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/$(get_libdir) \
-	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
-
-	# 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
-
-	sed -i -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
-
-	pamd_mimic_system cups auth account
-
-	newinitd ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs
-
-	# Let foreign charset PDF's print. (Bug: 67493)
-	dosym /etc/xpdfrc /etc/cups/pdftops.conf
-
-	# install pdftops filter
-	exeinto /usr/lib/cups/filter/
-	newexe ${DISTDIR}/pdftops.pl pdftops
-	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
-}
-
-pkg_postrm() {
-	# cleanups
-	rm -fR /usr/share/doc/${PF}
-}
-
-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 "If you're using a USB printer, \"emerge coldplug; rc-update add"
-	einfo "coldplug boot\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	if useq cjk ; then
-		einfo
-		einfo "If you want CJK support on PDF's you'll need to re-emerge"
-		einfo "appt-text/xpdf with your LINGUAS variable set instead of"
-		einfo "the CJK flag. (Bug: 67493)"
-	fi
-}
diff --git a/net-print/cups/cups-1.1.23-r4.ebuild b/net-print/cups/cups-1.1.23-r4.ebuild
index 0e501955eec1..bdf8be43160d 100644
--- a/net-print/cups/cups-1.1.23-r4.ebuild
+++ b/net-print/cups/cups-1.1.23-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1.23-r4.ebuild,v 1.14 2005/12/17 17:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r4.ebuild,v 1.15 2006/01/10 18:51:12 genstef Exp $
 
 inherit eutils flag-o-matic pam
 
@@ -31,7 +31,8 @@ DEPEND="${DEP}
 	>=sys-devel/autoconf-2.58"
 RDEPEND="${DEP}
 	!virtual/lpr
-	app-text/xpdf"
+	|| ( >=app-text/poppler-0.4.3-r1
+	<app-text/xpdf-3.01-r4 )"
 PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
 PROVIDE="virtual/lpr"
 
diff --git a/net-print/cups/cups-1.1.23-r5.ebuild b/net-print/cups/cups-1.1.23-r5.ebuild
deleted file mode 100644
index 1de1d5945466..000000000000
--- a/net-print/cups/cups-1.1.23-r5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r5.ebuild,v 1.1 2005/12/14 20:01:19 dang Exp $
-
-inherit eutils flag-o-matic pam autotools
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl slp pam samba nls cjk gnutls"
-
-DEP="pam? ( virtual/pam )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-		gnutls? ( net-libs/gnutls )
-		)
-	slp? ( >=net-libs/openslp-1.0.4 )
-	nls? ( sys-devel/gettext )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr
-	app-text/xpdf"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	epatch ${FILESDIR}/cups-gentooalt.patch
-	epatch ${FILESDIR}/${P}-bindnow.patch
-	eautoconf
-
-	# disable builtin xpdf
-	sed -i -e "s:pdftops::" Makefile
-}
-
-src_compile() {
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-
-	use ssl && \
-		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
-
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--localstatedir=/var \
-		--with-bindnow=$(bindnow_flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_test() {
-	# upstream includes an interactive test which is a nono for gentoo.
-	# therefore, since the printing herd has bigger fish to fry, for now,
-	# we just leave it out, even if FEATURES=test
-	true
-}
-
-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/$(get_libdir)/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/$(get_libdir) \
-	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
-
-	# cleanups
-	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \
-		${D}/etc/cups/{certs,interfaces,ppd} ${D}/var
-
-	sed -i -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
-
-	pamd_mimic_system cups auth account
-
-	newinitd ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs
-
-	# Let foreign charset PDF's print. (Bug: 67493)
-	dosym /etc/xpdfrc /etc/cups/pdftops.conf
-
-	# install pdftops filter
-	exeinto /usr/lib/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
-}
-
-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 "If you're using a USB printer, \"emerge coldplug; rc-update add"
-	einfo "coldplug boot\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	if useq cjk ; then
-		einfo
-		einfo "If you want CJK support on PDF's you'll need to re-emerge"
-		einfo "app-text/xpdf with your LINGUAS variable set instead of"
-		einfo "the CJK flag. (Bug: 67493)"
-	fi
-}
diff --git a/net-print/cups/cups-1.1.23-r6.ebuild b/net-print/cups/cups-1.1.23-r6.ebuild
deleted file mode 100644
index 84c1460a6706..000000000000
--- a/net-print/cups/cups-1.1.23-r6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r6.ebuild,v 1.1 2005/12/25 19:23:47 genstef Exp $
-
-inherit eutils flag-o-matic pam autotools
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl slp pam samba nls cjk gnutls"
-
-DEP="pam? ( virtual/pam )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-		gnutls? ( net-libs/gnutls )
-		)
-	slp? ( >=net-libs/openslp-1.0.4 )
-	nls? ( sys-devel/gettext )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr
-	app-text/xpdf"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	epatch ${FILESDIR}/cups-gentooalt.patch
-	epatch ${FILESDIR}/${P}-bindnow.patch
-	epatch ${FILESDIR}/cupsaddsmb.patch
-	eautoconf
-
-	# disable builtin xpdf
-	sed -i -e "s:pdftops::" Makefile
-}
-
-src_compile() {
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-
-	use ssl && \
-		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
-
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--localstatedir=/var \
-		--with-bindnow=$(bindnow_flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_test() {
-	# upstream includes an interactive test which is a nono for gentoo.
-	# therefore, since the printing herd has bigger fish to fry, for now,
-	# we just leave it out, even if FEATURES=test
-	true
-}
-
-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/$(get_libdir)/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/$(get_libdir) \
-	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
-
-	# cleanups
-	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \
-		${D}/etc/cups/{certs,interfaces,ppd} ${D}/var
-
-	sed -i -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
-
-	pamd_mimic_system cups auth account
-
-	newinitd ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs
-
-	# Let foreign charset PDF's print. (Bug: 67493)
-	dosym /etc/xpdfrc /etc/cups/pdftops.conf
-
-	# install pdftops filter
-	exeinto /usr/lib/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
-}
-
-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 "If you're using a USB printer, \"emerge coldplug; rc-update add"
-	einfo "coldplug boot\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	if useq cjk ; then
-		einfo
-		einfo "If you want CJK support on PDF's you'll need to re-emerge"
-		einfo "app-text/xpdf with your LINGUAS variable set instead of"
-		einfo "the CJK flag. (Bug: 67493)"
-	fi
-}
diff --git a/net-print/cups/files/digest-cups-1.1.23-r2 b/net-print/cups/files/digest-cups-1.1.23-r2
deleted file mode 100644
index 64352b8bc3d5..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
diff --git a/net-print/cups/files/digest-cups-1.1.23-r3 b/net-print/cups/files/digest-cups-1.1.23-r3
deleted file mode 100644
index e2b40a0ffe53..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
-MD5 f6149424fd2880c5017da501e876de59 pdftops.pl 5630
diff --git a/net-print/cups/files/digest-cups-1.1.23-r5 b/net-print/cups/files/digest-cups-1.1.23-r5
deleted file mode 100644
index 64352b8bc3d5..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
diff --git a/net-print/cups/files/digest-cups-1.1.23-r6 b/net-print/cups/files/digest-cups-1.1.23-r6
deleted file mode 100644
index 64352b8bc3d5..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521