Non-maintainer Version Bump, notified by euscan

(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)

6 files changed, 71 insertions, 137 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 3bffe4521327..223aa5732171 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/foomatic-filters
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.66 2010/11/23 10:27:17 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.67 2011/05/06 15:49:10 jlec Exp $
+
+*foomatic-filters-4.0.7 (06 May 2011)
+
+  06 May 2011; Justin Lecher <jlec@gentoo.org>
+  -foomatic-filters-3.0.20070501.ebuild, -foomatic-filters-4.0.3.ebuild,
+  -foomatic-filters-4.0.4.ebuild, foomatic-filters-4.0.5.ebuild,
+  +foomatic-filters-4.0.7.ebuild, +files/foomatic-filters-4.0.7-multilib.patch:
+  Non-maintainer Version Bump, notified by euscan
 
 *foomatic-filters-4.0.5 (23 Nov 2010)
 
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
new file mode 100644
index 000000000000..5e5a13d2d314
--- /dev/null
+++ b/net-print/foomatic-filters/files/foomatic-filters-4.0.7-multilib.patch
@@ -0,0 +1,50 @@
+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.20070501.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20070501.ebuild
deleted file mode 100644
index 1260d9b3a0fe..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-3.0.20070501.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.20070501.ebuild,v 1.4 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/~calchan/distfiles/${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.4.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.4.ebuild
deleted file mode 100644
index 96a2672dd775..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-4.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 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.4.ebuild,v 1.1 2010/05/17 20:37:21 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 || die "eautoreconf failed"
-
-	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.5.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild
index a4c5f0a8615c..fc894b12af4e 100644
--- a/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/11/23 10:27:17 jlec Exp $
+# $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"
+EAPI=2
 
 inherit autotools eutils versionator
 
@@ -36,7 +36,7 @@ src_prepare() {
 
 	# Search for libs in ${libdir}, not just /usr/lib
 	epatch "${FILESDIR}"/${PN}-4.0.3-multilib.patch
-	eautoreconf || die "eautoreconf failed"
+	eautoreconf
 
 	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
 		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.3.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild
index edbb4805aa1a..83698a56c2eb 100644
--- a/net-print/foomatic-filters/foomatic-filters-4.0.3.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2010/02/05 23:05:07 jlec Exp $
+# $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="2"
+EAPI=4
 
 inherit autotools eutils versionator
 
@@ -35,17 +35,17 @@ src_prepare() {
 	fi
 
 	# Search for libs in ${libdir}, not just /usr/lib
-	epatch "${FILESDIR}/${P}-multilib.patch"
-	eautoreconf || die "eautoreconf failed"
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	eautoreconf
 
 	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
 		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic || die
+	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
 
 	if use cups; then
 		dosym /usr/bin/foomatic-gswrapper "${CUPS_SERVERBIN}/filter/foomatic-gswrapper"