Add new snapshot, remove old snapshot.

Package-Manager: portage-2.1.5_rc7

4 files changed, 75 insertions, 88 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index bf616a1f3a5e..c0c4cc856236 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/foomatic-filters
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.57 2008/03/10 04:20:27 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.58 2008/05/07 23:15:51 tgurr Exp $
+
+*foomatic-filters-3.0.20080507 (07 May 2008)
+
+  07 May 2008; Timo Gurr <tgurr@gentoo.org>
+  -files/foomatic-filters-3.0.2-multilib.patch,
+  -foomatic-filters-3.0.2-r1.ebuild, +foomatic-filters-3.0.20080507.ebuild:
+  Add new snapshot, remove old snapshot.
 
   10 Mar 2008; <ricmm@gentoo.org> foomatic-filters-3.0.2-r1.ebuild,
   foomatic-filters-3.0.20060720.ebuild:
diff --git a/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch
deleted file mode 100644
index d02bca2b5bd0..000000000000
--- a/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.in.orig	2005-07-18 18:01:26.000000000 +0100
-+++ configure.in	2005-07-18 18:03:31.000000000 +0100
-@@ -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`
-@@ -38,19 +38,19 @@
- AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
- 
- dnl Check for /usr/lib/cups
--AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
-+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)
-+AC_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+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)
-+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)
-+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.2-r1.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild
deleted file mode 100644
index 091c92e63601..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 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.2-r1.ebuild,v 1.13 2008/03/10 04:20:27 ricmm Exp $
-
-inherit eutils
-
-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 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="cups samba"
-
-DEPEND="samba? ( net-fs/samba )
-	cups? ( >=net-print/cups-1.1.19 )
-	|| (
-		app-text/enscript
-		net-print/cups
-		app-text/a2ps
-		app-text/mpage
-	)
-	virtual/ghostscript"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Search for libs in ${libdir}, not just /usr/lib
-	epatch ${FILESDIR}/${P}-multilib.patch
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	export CUPS=$(cups-config --serverbin) CUPS_FILTERS=$(cups-config --serverbin)/filter
-	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-config --serverbin)/filter/foomatic-gswrapper
-		dosym /usr/bin/foomatic-rip $(cups-config --serverbin)/filter/cupsomatic
-	else
-		rm -r ${D}/$(cups-config --serverbin)/filter
-	fi
-}
diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.20080507.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20080507.ebuild
new file mode 100644
index 000000000000..0fe62f2c390e
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-3.0.20080507.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 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.1 2008/05/07 23:15:51 tgurr 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
+	virtual/ghostscript"
+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
+}