Install Perl stuff in vendor-dir (bug #294892). Use newer configure flags. Respect LDFLAGS.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 38 insertions, 12 deletions

diff --git a/dev-libs/libpreludedb/ChangeLog b/dev-libs/libpreludedb/ChangeLog
index 7e424221a8af..4584a330b3b5 100644
--- a/dev-libs/libpreludedb/ChangeLog
+++ b/dev-libs/libpreludedb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpreludedb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.45 2010/05/27 04:55:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.46 2010/05/27 16:27:51 jer Exp $
+
+*libpreludedb-1.0.0-r1 (27 May 2010)
+
+  27 May 2010; Jeroen Roovers <jer@gentoo.org> -libpreludedb-1.0.0.ebuild,
+  +libpreludedb-1.0.0-r1.ebuild, +files/libpreludedb-1.0.0-ldflags.patch:
+  Install Perl stuff in vendor-dir (bug #294892). Use newer configure flags.
+  Respect LDFLAGS.
 
 *libpreludedb-1.0.0 (27 May 2010)
 
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index f5ac30701c41..79af75652589 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,3 +1,4 @@
+AUX libpreludedb-1.0.0-ldflags.patch 708 RMD160 60186fa8f67fadd376fc89c9b1f69fc4bcb639f5 SHA1 cebfcf367294a9e55e4740a9819f22b1aa5aca75 SHA256 2bb826b5e03e6293286a27e3e64194c6ff84c090d72eb88a4ca37775521dbfcb
 DIST libpreludedb-0.9.13.tar.gz 699987 RMD160 335feb172e86111ab93d7dfd8fd473643ffcd6de SHA1 e8dcb2e5a19cadfa0fdf6feed9ba5c09cea02745 SHA256 163d1b05063972c3988aeab3fd71ade722c39c8e3a141ea3f031995cd507386c
 DIST libpreludedb-0.9.15.1.tar.gz 810742 RMD160 cecb601fd04fcbbab03bb9d49a15a0f80adcd92d SHA1 dce8c3de03c186796e66c965da9be7af91125d3a SHA256 711b453b3528944bed1baa6c4f7fac823c141f0777a8c9c58437b1eb4e11756c
 DIST libpreludedb-0.9.2.tar.gz 565906 RMD160 ceb5e6015e0288efa45c6fbf7fa12ca18369cc32 SHA1 51cd6a29ad1a4932e2e84a672e92381a1404a495 SHA256 5b930911c3048d34ffa6cb088177681e77ad3e23dc8b7e3e5916acab43664d98
@@ -5,6 +6,6 @@ DIST libpreludedb-1.0.0.tar.gz 940838 RMD160 814ccbb697e8686cebaf8e0574d169a72b7
 EBUILD libpreludedb-0.9.13.ebuild 1221 RMD160 2d6a8dca75941227a88429d72146395d82d72046 SHA1 ff3fc2ef3bbe7ad268e358407b3940cc7b9fbd24 SHA256 07917e509f321c6bbdfc433a94f5393d663b0e78f255fc1a63f5460009b84f75
 EBUILD libpreludedb-0.9.15.1.ebuild 1277 RMD160 c542f36039268fcb67c5eac8e4c174dc6dd60fe0 SHA1 41258e13038415530abd90a771823e9a5bc9c01e SHA256 cad0f94bb36cfe700a2f3b90bb7d2d39e3875b1d2e97911c01805a9dd5e6ce50
 EBUILD libpreludedb-0.9.2.ebuild 1483 RMD160 3dee5fd987cbd21c685536f79fce01c81cf0454e SHA1 be2d70dce5e97f82d59c23647973ecaf5ea2a3e1 SHA256 2379dbac5c4fe109fe3110621661e7effa1766dd40b8c1a58aa300a6a52961dd
-EBUILD libpreludedb-1.0.0.ebuild 1262 RMD160 bab70975cc9532c3d82e66bbc7aeb4ee3e913064 SHA1 99216ef1c199aba27691ebf0f56985595fe63dc4 SHA256 84f8eaaae16287cb1a6dc62950bd7d95620ab66567c55cccde62b5f3ec25cfab
-MISC ChangeLog 7004 RMD160 702cf7a5e01fa93bba9c265ae765304bda7f6b00 SHA1 bdba1608e99e6337af86851a54f4fb5719e33db2 SHA256 87cb8a52cd22ab615ca1526c7254a295b4a794379d6ad73b8b10052a6d1d1611
+EBUILD libpreludedb-1.0.0-r1.ebuild 1377 RMD160 db209bd0182191c382fec5abe818007871638df2 SHA1 4b8e3c521bdc6c1d37f124dc2f6eecd4880b6d9c SHA256 255824df35a22c2170cf77b054fa544d8251e61fd1da1fb6f53c99396fa683c3
+MISC ChangeLog 7288 RMD160 28f0e3cb8a38a4676ac3852992f9467bfd0f5960 SHA1 cca22f2891de58467a33907775b21d962e251a7e SHA256 bf84f146ff4c03f9ccb8435ea08c86a42de590896dc8ffdc7bbd157acafdc8f5
 MISC metadata.xml 328 RMD160 5839cc4dbc47e956e7ae4efff5512c6b46168a0f SHA1 5a3c9fb921748c7f254564376cb743087417acfb SHA256 3e61ecfe069b9d471dfb459b351ba94fe92311d9ef31117b5ca7cc505a6af0e0
diff --git a/dev-libs/libpreludedb/files/libpreludedb-1.0.0-ldflags.patch b/dev-libs/libpreludedb/files/libpreludedb-1.0.0-ldflags.patch
new file mode 100644
index 000000000000..b9e8f71417a6
--- /dev/null
+++ b/dev-libs/libpreludedb/files/libpreludedb-1.0.0-ldflags.patch
@@ -0,0 +1,11 @@
+--- bindings/perl/Makefile.PL.in.orig	2009-07-13 17:43:26.000000000 +0200
++++ bindings/perl/Makefile.PL.in	2010-05-27 18:19:22.000000000 +0200
+@@ -7,7 +7,7 @@
+ my %attributs = (NAME => 'PreludeDB',
+ 		 INC => '-I@top_srcdir@/src/include @LIBPRELUDE_CFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@',
+ 		 LIBS => ["-L@top_builddir@/src/.libs -lpreludedb", "-L$ENV{LIBDIR} -lpreludedb @LIBPRELUDE_LIBS@" ],
+-		 LDDLFLAGS => "@LIBPRELUDE_LDFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@ $Config{lddlflags}");
++		 LDDLFLAGS => "@LDFLAGS@ @LIBPRELUDE_LDFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@ $Config{lddlflags}");
+ 
+ if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
+     foreach my $filename ( qw/PreludeDB.c PreludeDB.pm/ ) {
diff --git a/dev-libs/libpreludedb/libpreludedb-1.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-1.0.0-r1.ebuild
index d391137d82c9..bd9a48ce1742 100644
--- a/dev-libs/libpreludedb/libpreludedb-1.0.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-1.0.0-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/libpreludedb-1.0.0.ebuild,v 1.1 2010/05/27 04:55:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/libpreludedb-1.0.0-r1.ebuild,v 1.1 2010/05/27 16:27:51 jer Exp $
 
-inherit flag-o-matic eutils perl-module
+EAPI="2"
+
+inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="Prelude-IDS framework for easy access to the Prelude database"
 HOMEPAGE="http://www.prelude-technologies.com"
@@ -20,26 +22,31 @@ RDEPEND=">=dev-libs/libprelude-0.9.9
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
 	local myconf
 
 	econf \
-		$(use_with doc gtk-doc) \
+		$(use_enable doc gtk-doc) \
 		$(use_with mysql) \
-		$(use_with postgres pgsql) \
+		$(use_with postgres postgresql) \
 		$(use_with sqlite sqlite3) \
 		$(use_with perl) \
 		$(use_with swig) \
 		$(use_with python) \
 		|| die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
 
-	use perl && fixlocalpod
+	if use perl; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
 }
 
 pkg_postinst() {