Add new snapshot, move mips to unstable, remove old snapshot.

Package-Manager: portage-2.1.5_rc7

6 files changed, 62 insertions, 112 deletions

diff --git a/net-print/foomatic-db-engine/ChangeLog b/net-print/foomatic-db-engine/ChangeLog
index 161e31721152..914cb794c3a0 100644
--- a/net-print/foomatic-db-engine/ChangeLog
+++ b/net-print/foomatic-db-engine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/foomatic-db-engine
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.41 2007/11/20 03:20:26 kumba Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.42 2008/05/07 23:14:38 tgurr Exp $
+
+*foomatic-db-engine-3.0.20080507 (07 May 2008)
+
+  07 May 2008; Timo Gurr <tgurr@gentoo.org>
+  -files/flex-configure-LANG.patch, -files/perl-module.diff,
+  -foomatic-db-engine-3.0.2.ebuild, foomatic-db-engine-3.0.20060720.ebuild,
+  +foomatic-db-engine-3.0.20080507.ebuild:
+  Add new snapshot, move mips to unstable, remove old snapshot.
 
   20 Nov 2007; Joshua Kinard <kumba@gentoo.org>
   foomatic-db-engine-3.0.20060720.ebuild:
diff --git a/net-print/foomatic-db-engine/files/flex-configure-LANG.patch b/net-print/foomatic-db-engine/files/flex-configure-LANG.patch
deleted file mode 100644
index 3ef76ef911c0..000000000000
--- a/net-print/foomatic-db-engine/files/flex-configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/net-print/foomatic-db-engine/files/perl-module.diff b/net-print/foomatic-db-engine/files/perl-module.diff
deleted file mode 100644
index e0c895f42176..000000000000
--- a/net-print/foomatic-db-engine/files/perl-module.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN Makefile.in.1 Makefile.in
---- Makefile.in.1	2002-07-19 16:18:47.000000000 -0500
-+++ Makefile.in	2002-10-17 13:58:09.000000000 -0500
-@@ -178,10 +178,10 @@
- install-bin: check-config lib/Makefile
- #	This is the only way to get the Perl-generated Makefile using
- #	$(DESTDIR) properly
--	( cd lib && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
--	)
-+#	( cd lib && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
-+#	)
- 	install -d $(DESTDIR)$(BINDIR)
- 	install -d $(DESTDIR)$(SBINDIR)
- 	install -d $(DESTDIR)$(ETCDIR)
-diff -Naur Makefile.in.1 Makefile.in
---- Makefile.in.1	2003-07-11 16:00:57.000000000 +0200
-+++ Makefile.in	2003-07-11 16:01:02.000000000 +0200
-@@ -40,7 +40,7 @@
- FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # foomatic-rip path for a "make inplace" installation
--LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
-+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # Locations for installing the components of this package
- BINDIR=$(bindir)
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.2.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.2.ebuild
deleted file mode 100644
index 02969379f99a..000000000000
--- a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.2.ebuild,v 1.15 2006/07/15 03:16:26 vapier Exp $
-
-inherit perl-app eutils
-
-DESCRIPTION="Generates ppds out of xml foomatic printer description files"
-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"
-IUSE=""
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-misc/curl
-	net-print/foomatic-filters"
-
-src_compile() {
-	epatch ${FILESDIR}/perl-module-3.0.1.diff
-	epatch ${FILESDIR}/flex-configure-LANG.patch
-	econf || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	# install perl modules
-	cd lib
-	perl-app_src_prep
-	perl-app_src_compile
-	perl-module_src_test
-	perl-module_src_install
-}
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild
index 1c8a470633c1..85bc822db08e 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild,v 1.12 2007/11/20 03:20:26 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20060720.ebuild,v 1.13 2008/05/07 23:14:38 tgurr Exp $
 
 inherit perl-app eutils versionator
 
@@ -12,7 +12,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild
new file mode 100644
index 000000000000..b4106b1ae8c0
--- /dev/null
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild,v 1.1 2008/05/07 23:14:38 tgurr Exp $
+
+inherit eutils perl-app versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
+DESCRIPTION="Generates ppds out of xml foomatic printer description files"
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	net-print/foomatic-filters"
+PDEPEND="net-print/foomatic-db"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/perl-module-3.0.20070508.diff"
+	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	cd lib
+	perl-app_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd lib
+	perl-module_src_install
+}
+
+src_test() {
+	cd lib
+	perl-module_src_test
+}