Version Bump per bug 269865

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 123 insertions, 3 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/Manifest b/net-print/foomatic-db-engine/Manifest
index bc24b6371430..4da569f5bc79 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.0.3-perl-module.patch 922 RMD160 9d0384ee472f62bbb89b53b0c0e33862f12ac23f SHA1 25ab0380c6a81f93861ab3eb62fd3fee195c59f0 SHA256 db0d7182c6b3ae04e3a13995a29a2b3f676cab57169bb15a8b9aaa74225963e2
+AUX 4.0.3-respect-ldflag.patch 719 RMD160 0b87caa11a98951511ffdf3064c163275ce15e37 SHA1 08b9e17e6881b00e4c91d9d12fa9dba0fc24c818 SHA256 007dfd177d93e7e936493096fae70c17cd55dc23199eab2fbf67e2a71a900c95
 AUX perl-module-3.0.1.diff 1037 RMD160 adb44d47a250d4018bfe59ca2aa1565ca596e64d SHA1 47c41490a3b967cdac3d7c68f5efa50610bf623f SHA256 97385f93bf353c50b77844e71397f2b01f7ae999b2a467a7a298a31b5b699c95
 AUX perl-module-3.0.20070508.diff 1051 RMD160 320464fe114d8cf5b2cb7ea8d64a05a08c260460 SHA1 0cc9bb2339d27595ca1a0a46e9992a598644de82 SHA256 72555e1174f730929b013e8fac18b0f28cf2401a3e69f2431e62588952257f19
 DIST foomatic-db-engine-3.0-20060720.tar.gz 314205 RMD160 12df8a9a9e18192862f1334758ff861096dd4aed SHA1 295c52857def6d704b26a58078367cde592f930b SHA256 c5331e4445b49bb7fd4909a38eb0bf2e325f7d653b06b3dbc8a9f507685e0b02
 DIST foomatic-db-engine-3.0-20070508.tar.gz 330272 RMD160 a2881c9178a7a0431567cc9d164dfeb08dc583a9 SHA1 4c39abcefa8ee259983441d69f1c3eca4b502579 SHA256 a7317dd175ee476b4956205d32eee4fd84bba95e9065e04d41179311cc9535d7
 DIST foomatic-db-engine-3.0-20080507.tar.gz 333437 RMD160 3c1d2bd6e9d3dcba1428c0f90e4dd9405efbe10f SHA1 4f343e2649f1b8cba062dd9accb51a0ef1f681e5 SHA256 4792f0635c8c9c1e598718ceb3a586e7987900583d1e855441660516784daf26
+DIST foomatic-db-engine-4.0.3.tar.gz 343161 RMD160 b37ff62173c15ead94243f008b27d91269e30f10 SHA1 8dcd6ec787f0a9e7e18ba1e3b81a045cb7876fab SHA256 8e2116527c1b456881e3fa02ee2108202c5c1e8932b2a1fc859374cf77515227
 EBUILD foomatic-db-engine-3.0.20060720.ebuild 1239 RMD160 117b7b28f5bfefb857bc36a204bb86d6a0c11bd0 SHA1 a86bc996f3153094ea75238be227f4c775e6f2f6 SHA256 b2c1300350bf6e9b645517cd003223b0ca028376357cdfcf5752ea721456c1de
 EBUILD foomatic-db-engine-3.0.20070508.ebuild 1256 RMD160 6b5f8846a483139f2843916a830e0da5b60045b8 SHA1 722a702f42f4cc46621f7ba335dcbd62f85e904b SHA256 175235d027a34e59e14f49e02020d73bd933087bc9c3b2ad225b97585b797c82
 EBUILD foomatic-db-engine-3.0.20080507.ebuild 1265 RMD160 c8d7b4f422d6d0b61bab4f50a0c28c081bf17713 SHA1 0dd2ed80e13259a245b9cd0ed036a186c9d781a8 SHA256 a3205405fbb7adbbbe9c151acdd1128cdb655f115bef5179e58e735ea951c0a4
-MISC ChangeLog 6064 RMD160 38c09108c835e0a46d8a1d4a46490d507cbdb031 SHA1 410f96b1064b2031f2be161e5695f3deb857e561 SHA256 c5eed30c1e7cda5060bda7b7f8b5075dcb6e220dddeb6574b31d592e9aec04aa
+EBUILD foomatic-db-engine-4.0.3.ebuild 1233 RMD160 621a2c7ce3c297ca60ee23b8895cd3e5ea720415 SHA1 e53b6921a9030fced830c5b883850c37951d2d9c SHA256 415e77519acf07ec2b7927eb0ef0a50594db3a832ccac40b417bec3e7176a783
+MISC ChangeLog 6321 RMD160 c6fd0d394c7a6862fde46ecb1b7b7547b1d2b17a SHA1 2d36d61e6a4121b64b5f25c5029cec4224fe6654 SHA256 fbbdb7e4a5ae36b6dd6082a73c5ef7938e2eb97606dff941fd58bf8137b2167e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktsp+MACgkQgAnW8HDreRZVEgCeLmzUZpCnlX6vi7BBf6UMk5D9
+sbYAn026WBRBrJkAjOis+8/M62Ee9tvF
+=THMr
+-----END PGP SIGNATURE-----
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
+}