Version bump to latest. Drop overshadowed. 4.0.12 should fix mktemp security issue.

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

3 files changed, 63 insertions, 114 deletions

diff --git a/net-print/foomatic-filters/files/foomatic-filters-3.0.20060601-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-3.0.20060601-multilib.patch
deleted file mode 100644
index 97afdcd1c052..000000000000
--- a/net-print/foomatic-filters/files/foomatic-filters-3.0.20060601-multilib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.ac.orig	2006-06-02 13:26:34.000000000 +0200
-+++ configure.ac	2006-06-02 13:26:49.000000000 +0200
-@@ -13,7 +13,7 @@
- AC_PROG_MAKE_SET
- 
- ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=${libdir}:${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
- 
- dnl Get the operating system and version number...
- uname=`uname`
-@@ -37,23 +37,23 @@
- dnl Check for /etc/printcap
- AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
- 
--dnl Check for /usr/lib/cups
--AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/cups
-+AC_PATH_DIR(CUPS,cups,${libdir}/cups,$LIBSEARCHPATH)
- 
--dnl Check for /usr/lib/cups/filter
--AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/cups/filter
-+AC_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$LIBSEARCHPATH)
- 
--dnl Check for /usr/lib/cups/backend
--AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/cups/backend
-+AC_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$LIBSEARCHPATH)
- 
--dnl Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/ppr
-+AC_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
- 
--dnl Check for /usr/lib/ppr/interfaces
--AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/ppr/interfaces
-+AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
- 
--dnl Check for /usr/lib/ppr/lib
--AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+dnl Check for ${libdir}/ppr/lib
-+AC_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
- 
- AC_ARG_ENABLE(file-converter-check, [  --enable-file-converter-check  check whether a file converter is installed [default=yes]],
- [if eval "test x${enableval} = xno"; then
diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.20080507.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20080507.ebuild
deleted file mode 100644
index bf5d3938f00e..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-3.0.20080507.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.20080507.ebuild,v 1.6 2009/12/26 17:43:09 pva Exp $
-
-inherit autotools eutils versionator
-
-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.12.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.12.ebuild
new file mode 100644
index 000000000000..142ac0db1999
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 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.12.ebuild,v 1.1 2012/03/08 08:48:48 scarabeus Exp $
+
+EAPI=4
+
+inherit autotools eutils versionator
+
+DESCRIPTION="Foomatic wrapper scripts"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${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 dbus"
+
+RDEPEND="
+	dev-lang/perl
+	app-text/ghostscript-gpl
+	cups? ( >=net-print/cups-1.1.19 )
+	!cups? (
+		|| (
+			app-text/enscript
+			app-text/a2ps
+			app-text/mpage
+		)
+	)
+	dbus? ( sys-apps/dbus )"
+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.9-multilib.patch
+	eautoreconf
+
+	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
+		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
+}
+
+src_configure() {
+	econf $(use_enable dbus)
+}
+
+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 "${ED}"/${CUPS_SERVERBIN}/filter
+		rm -r "${ED}"/${CUPS_SERVERBIN}/backend
+	fi
+}