Cleanup

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 7 insertions, 282 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index f888b9d27974..969406654cee 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/foomatic-filters
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.75 2012/02/01 17:02:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.76 2012/02/07 22:08:56 dilfridge Exp $
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -foomatic-filters-3.0.20060720.ebuild,
+  -files/foomatic-filters-4.0.3-multilib.patch, -foomatic-filters-4.0.5.ebuild,
+  -foomatic-filters-4.0.7.ebuild, -files/foomatic-filters-4.0.7-multilib.patch:
+  Cleanup
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> foomatic-filters-4.0.9.ebuild:
   Marking foomatic-filters-4.0.9 ppc for bug 379559
diff --git a/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch
deleted file mode 100644
index ca8fa2b22219..000000000000
--- a/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index acd2f0c..9b333b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname regcomp setenv strcasecmp strchr strcspn
- 
- 
- ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:${libdir}:${libdir}64:/usr/local/lib:${prefix}/libexec:${libdir}exec:/usr/local/libexec
- 
- uname=`uname`
- uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
- 	AC_SUBST(CUPS_FILTERS)
- 	AC_SUBST(CUPS_BACKENDS)
- else
--	# Check for /usr/lib/cups
--	AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups
-+	AC_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
- 
--	# Check for /usr/lib/cups/filter
--	AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups/filter
-+	AC_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
- 
--	# Check for /usr/lib/cups/backend
--	AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups/backend
-+	AC_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
- fi
- 
--# Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr
-+AC_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
- 
--# Check for /usr/lib/ppr/interfaces
--AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/interfaces
-+AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
- 
--# Check for /usr/lib/ppr/lib
--AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/lib
-+AC_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
- 
- AC_CHECK_HEADERS([ghostscript/ierrors.h ghostscript/iapi.h])
- AC_CHECK_LIB(gs, gsapi_new_instance)
diff --git a/net-print/foomatic-filters/files/foomatic-filters-4.0.7-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-4.0.7-multilib.patch
deleted file mode 100644
index 5e5a13d2d314..000000000000
--- a/net-print/foomatic-filters/files/foomatic-filters-4.0.7-multilib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index acd2f0c..9b333b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname regcomp setenv strcasecmp strchr strcspn
- 
- 
- ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:${libdir}:${libdir}64:/usr/local/lib:${prefix}/libexec:${libdir}exec:/usr/local/libexec
- 
- uname=`uname`
- uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
- 	AC_SUBST(CUPS_FILTERS)
- 	AC_SUBST(CUPS_BACKENDS)
- else
--	# Check for /usr/lib/cups
--	FM_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups
-+	FM_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
- 
--	# Check for /usr/lib/cups/filter
--	FM_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups/filter
-+	FM_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
- 
--	# Check for /usr/lib/cups/backend
--	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
-+	# Check for ${libdir}/cups/backend
-+	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
- fi
- 
--# Check for /usr/lib/ppr
--FM_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr
-+FM_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
- 
--# Check for /usr/lib/ppr/interfaces
--FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/interfaces
-+FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
- 
--# Check for /usr/lib/ppr/lib
--FM_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/lib
-+FM_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
- 
- AC_CHECK_HEADERS([ghostscript/ierrors.h ghostscript/iapi.h])
- AC_CHECK_LIB(gs, gsapi_new_instance)
diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild
deleted file mode 100644
index b22bc918dc8c..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.19 2009/12/26 17:43:09 pva Exp $
-
-inherit eutils versionator autotools
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-DESCRIPTION="Foomatic wrapper scripts"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
-	http://www.linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cups"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.19 )
-	!cups? (
-		|| (
-			app-text/enscript
-			app-text/a2ps
-			app-text/mpage
-		)
-	)
-	dev-lang/perl
-	app-text/ghostscript-gpl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use cups; then
-		CUPS_SERVERBIN="$(cups-config --serverbin)"
-	else
-		CUPS_SERVERBIN=""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Search for libs in ${libdir}, not just /usr/lib
-	epatch "${FILESDIR}"/foomatic-filters-3.0.20060601-multilib.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
-		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
-
-	if use cups; then
-		dosym /usr/bin/foomatic-gswrapper ${CUPS_SERVERBIN}/filter/foomatic-gswrapper
-		dosym /usr/bin/foomatic-rip ${CUPS_SERVERBIN}/filter/cupsomatic
-	else
-		rm -r "${D}"/${CUPS_SERVERBIN}/filter
-		rm -r "${D}"/${CUPS_SERVERBIN}/backend
-	fi
-}
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild
deleted file mode 100644
index fc894b12af4e..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild,v 1.2 2011/05/06 15:49:10 jlec Exp $
-
-EAPI=2
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Foomatic wrapper scripts"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cups"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.19 )
-	!cups? (
-		|| (
-			app-text/enscript
-			app-text/a2ps
-			app-text/mpage
-		)
-	)
-	dev-lang/perl
-	app-text/ghostscript-gpl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	if use cups; then
-		CUPS_SERVERBIN="$(cups-config --serverbin)"
-	else
-		CUPS_SERVERBIN=""
-	fi
-
-	# Search for libs in ${libdir}, not just /usr/lib
-	epatch "${FILESDIR}"/${PN}-4.0.3-multilib.patch
-	eautoreconf
-
-	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
-		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic || die
-
-	if use cups; then
-		dosym /usr/bin/foomatic-gswrapper "${CUPS_SERVERBIN}/filter/foomatic-gswrapper"
-		dosym /usr/bin/foomatic-rip "${CUPS_SERVERBIN}/filter/cupsomatic"
-	else
-		rm -r "${D}"/${CUPS_SERVERBIN}/filter
-		rm -r "${D}"/${CUPS_SERVERBIN}/backend
-	fi
-}
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild
deleted file mode 100644
index 83698a56c2eb..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild,v 1.1 2011/05/06 15:49:10 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Foomatic wrapper scripts"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cups"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.19 )
-	!cups? (
-		|| (
-			app-text/enscript
-			app-text/a2ps
-			app-text/mpage
-		)
-	)
-	dev-lang/perl
-	app-text/ghostscript-gpl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	if use cups; then
-		CUPS_SERVERBIN="$(cups-config --serverbin)"
-	else
-		CUPS_SERVERBIN=""
-	fi
-
-	# Search for libs in ${libdir}, not just /usr/lib
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	eautoreconf
-
-	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
-		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
-}
-
-src_install() {
-	default
-
-	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
-
-	if use cups; then
-		dosym /usr/bin/foomatic-gswrapper "${CUPS_SERVERBIN}/filter/foomatic-gswrapper"
-		dosym /usr/bin/foomatic-rip "${CUPS_SERVERBIN}/filter/cupsomatic"
-	else
-		rm -r "${D}"/${CUPS_SERVERBIN}/filter
-		rm -r "${D}"/${CUPS_SERVERBIN}/backend
-	fi
-}