Version Bump per bug 269865

(Portage version: 2.2_rc62/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 108 insertions, 2 deletions

diff --git a/net-print/foomatic-db-engine/ChangeLog b/net-print/foomatic-db-engine/ChangeLog
index 914cb794c3a0..c0a120db116d 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-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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.43 2010/02/05 23:21:02 jlec Exp $
+
+*foomatic-db-engine-4.0.3 (05 Feb 2010)
+
+  05 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/4.0.3-perl-module.patch, +foomatic-db-engine-4.0.3.ebuild,
+  +files/4.0.3-respect-ldflag.patch:
+  Version bump per 269865
+  as-needed fix per bug 248159
 
 *foomatic-db-engine-3.0.20080507 (07 May 2008)
 
diff --git a/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch b/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch
new file mode 100644
index 000000000000..4f3c81fad19b
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3014185..81e090d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
+ 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)
+@@ -186,10 +186,10 @@ check-config:
+ install-bin: check-config lib/Makefile
+ #	This is the only way to get the Perl-generated Makefile using
+ #	$(DESTDIR) properly
+-	( cd lib && \
+-	  $(MAKE) PREFIX=$(PERLPREFIX) && \
+-	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
+-	)
++#	( cd lib && \
++#	  $(MAKE) PREFIX=$(PERLPREFIX) && \
++#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
++#	)
+ 	${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
+ 	${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
+ 	${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR)
diff --git a/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch b/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch
new file mode 100644
index 000000000000..ca23d33543ba
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch
@@ -0,0 +1,15 @@
+--- foomatic-db-engine-4.0.2/Makefile.in.orig	2009-07-23 11:45:28.487999828 +0200
++++ foomatic-db-engine-4.0.2/Makefile.in	2009-07-23 11:45:53.939525006 +0200
+@@ -230,10 +230,10 @@
+ 	( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
+ 
+ foomatic-combo-xml: foomatic-combo-xml.c
+-	$(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
+ 
+ foomatic-perl-data: foomatic-perl-data.c
+-	$(CC) $(CFLAGS) $(XML_CFLAGS) $(XML_LIBS) -o foomatic-perl-data foomatic-perl-data.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS)
+ 
+ man: lib/Foomatic/Defaults.pm
+ 	chmod a+rx ./makeMan
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild
new file mode 100644
index 000000000000..8e9e42b6e8c5
--- /dev/null
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 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-4.0.3.ebuild,v 1.1 2010/02/05 23:21:02 jlec Exp $
+
+EAPI="2"
+
+inherit eutils perl-app versionator
+
+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 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	net-print/foomatic-filters"
+PDEPEND="net-print/foomatic-db"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-perl-module.patch" \
+		"${FILESDIR}/${PV}-respect-ldflag.patch"
+	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
+}
+
+src_configure() {
+	default
+	emake defaults || "emake defaults failed"
+
+	cd lib
+	perl-app_src_configure
+}
+
+src_compile() {
+	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
+}