From 964222cd49a4e94062458f484f5307abe7bdbbb4 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 2 Oct 2005 23:52:23 +0000 Subject: [PATCH] fixed perl binding thanks to Yoann Package-Manager: portage-2.0.53_rc3 --- dev-libs/libpreludedb/ChangeLog | 9 +++- dev-libs/libpreludedb/Manifest | 14 ++--- ...-0.9.0-r1 => digest-libpreludedb-0.9.0-r2} | 0 .../libpreludedb-0.9.0-perlpathfix.patch | 54 +++++++++++++++---- ...r1.ebuild => libpreludedb-0.9.0-r2.ebuild} | 7 ++- 5 files changed, 63 insertions(+), 21 deletions(-) rename dev-libs/libpreludedb/files/{digest-libpreludedb-0.9.0-r1 => digest-libpreludedb-0.9.0-r2} (100%) rename dev-libs/libpreludedb/{libpreludedb-0.9.0-r1.ebuild => libpreludedb-0.9.0-r2.ebuild} (88%) diff --git a/dev-libs/libpreludedb/ChangeLog b/dev-libs/libpreludedb/ChangeLog index 92f5e4b50a76..7d154776d120 100644 --- a/dev-libs/libpreludedb/ChangeLog +++ b/dev-libs/libpreludedb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libpreludedb # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.16 2005/10/01 04:27:23 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.17 2005/10/02 23:52:23 dragonheart Exp $ + +*libpreludedb-0.9.0-r2 (02 Oct 2005) + + 02 Oct 2005; Daniel Black + files/libpreludedb-0.9.0-perlpathfix.patch, -libpreludedb-0.9.0-r1.ebuild, + +libpreludedb-0.9.0-r2.ebuild: + fixed perl binding thanks to Yoann *libpreludedb-0.9.0-r1 (01 Oct 2005) diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest index f9e34a2952a8..2476a06d9b7c 100644 --- a/dev-libs/libpreludedb/Manifest +++ b/dev-libs/libpreludedb/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 199bf7a0c02ce5f8759c78a5e606b501 libpreludedb-0.9.0-r1.ebuild 1632 +MD5 107e29eb09b7c29c0b40ab5aa9b4c01b ChangeLog 2902 +MD5 e3fc591d96386006ea662c8a8f5e41fc files/digest-libpreludedb-0.9.0-r2 70 +MD5 eb881e3dd50659c2089d28ee33743d87 files/libpreludedb-0.9.0-perlpathfix.patch 2304 +MD5 3786198de96351dc25c5d68227cdb91f libpreludedb-0.9.0-r2.ebuild 1575 MD5 46a99e432c86964e317f92a77160a836 metadata.xml 256 -MD5 f4e0132e0776ce696e34b8aecbec6a3a ChangeLog 2663 -MD5 694ca6484c32cb78ce33e4b6f643c4ea files/libpreludedb-0.9.0-perlpathfix.patch 894 -MD5 e3fc591d96386006ea662c8a8f5e41fc files/digest-libpreludedb-0.9.0-r1 70 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) -iD8DBQFDPhA+mdTrptrqvGERAoCiAJwL0rz9h3fBVfoz8fYQpcE4mtOSFQCeNhkO -1YIQvQCejujtuvF9Xly1hhk= -=/xIx +iD8DBQFDQHLGmdTrptrqvGERAm6jAJsFi6T6cDNEC9y1aKW1YnfX87cTRgCglNGa ++VMe9OV6fclQuNhz6dG3MEM= +=CKtD -----END PGP SIGNATURE----- diff --git a/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r1 b/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r2 similarity index 100% rename from dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r1 rename to dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r2 diff --git a/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch b/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch index 994302885036..370d392400ba 100644 --- a/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch +++ b/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch @@ -1,14 +1,50 @@ ---- libpreludedb-0.9.0/bindings/perl/Makefile.PL.in.orig 2005-10-01 14:18:54.000000000 +1000 -+++ libpreludedb-0.9.0/bindings/perl/Makefile.PL.in 2005-10-01 14:19:09.000000000 +1000 -@@ -6,7 +6,7 @@ +diff -ru libpreludedb-0.9.0.orig/bindings/Makefile.am libpreludedb-0.9.0/bindings/Makefile.am +--- libpreludedb-0.9.0.orig/bindings/Makefile.am 2005-09-15 21:58:10.000000000 +1000 ++++ libpreludedb-0.9.0/bindings/Makefile.am 2005-10-03 09:37:44.000000000 +1000 +@@ -52,7 +52,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@" ], -+ LIBS => ["-lpreludedb", "-L$ENV{LIBDIR} -lpreludedb @LIBPRELUDE_LIBS@" ], - LDDLFLAGS => "@LIBPRELUDE_LDFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@ $Config{lddlflags}"); - if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) { + perl-build: +- cd perl && $(MAKE) ++ cd perl && $(MAKE) LD_RUN_PATH="" + + python-build: + cd python && $(PYTHON) setup.py build +@@ -64,7 +64,7 @@ + # + # Workaround for invalid Makefile generated by MakeMaker when UTF-8 is enabled. + # +- cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) install ++ cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" install + endif + + if HAVE_PYTHON +Only in libpreludedb-0.9.0/bindings: Makefile.am.orig +diff -ru libpreludedb-0.9.0.orig/bindings/Makefile.in libpreludedb-0.9.0/bindings/Makefile.in +--- libpreludedb-0.9.0.orig/bindings/Makefile.in 2005-09-20 20:25:39.000000000 +1000 ++++ libpreludedb-0.9.0/bindings/Makefile.in 2005-10-03 09:37:44.000000000 +1000 +@@ -369,7 +369,7 @@ + @HAVE_SWIG_TRUE@ $(SWIG) -I$(top_srcdir)/src/include -o $@ -python -noproxy -interface _preludedb -module _preludedb libpreludedb.i + + perl-build: +- cd perl && $(MAKE) ++ cd perl && $(MAKE) LD_RUN_PATH="" + + python-build: + cd python && $(PYTHON) setup.py build +@@ -378,7 +378,7 @@ + # + # Workaround for invalid Makefile generated by MakeMaker when UTF-8 is enabled. + # +-@HAVE_PERL_TRUE@ cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) install ++@HAVE_PERL_TRUE@ cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" install + + @HAVE_PYTHON_TRUE@ cd python && $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + +Only in libpreludedb-0.9.0/bindings: Makefile.in.orig +diff -ru libpreludedb-0.9.0.orig/bindings/perl/Makefile.PL.in libpreludedb-0.9.0/bindings/perl/Makefile.PL.in +--- libpreludedb-0.9.0.orig/bindings/perl/Makefile.PL.in 2005-09-15 00:07:46.000000000 +1000 ++++ libpreludedb-0.9.0/bindings/perl/Makefile.PL.in 2005-10-03 09:37:44.000000000 +1000 @@ -21,7 +21,7 @@ if ( -w $Config{"sitelib"} ) { $attributs{"INSTALLDIRS"} = "site"; diff --git a/dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-0.9.0-r2.ebuild similarity index 88% rename from dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild rename to dev-libs/libpreludedb/libpreludedb-0.9.0-r2.ebuild index 5b81947ca0c2..8a069c21b378 100644 --- a/dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-0.9.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild,v 1.1 2005/10/01 04:27:23 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/libpreludedb-0.9.0-r2.ebuild,v 1.1 2005/10/02 23:52:23 dragonheart Exp $ inherit flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="http://www.prelude-ids.org/download/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="debug doc mysql postgres perl python" +IUSE="doc mysql postgres perl python" DEPEND="virtual/libc >=dev-libs/libprelude-0.9.0 @@ -27,7 +27,6 @@ src_unpack() { src_compile() { local myconf - use debug && append-flags -O -ggdb use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no" use mysql && myconf="${myconf} --enable-mysql" || myconf="${myconf} --enable-mysql=no" use postgres && myconf="${myconf} --enable-postgresql" || myconf="${myconf} --enable-postgresql=no" @@ -35,7 +34,7 @@ src_compile() { use python && myconf="${myconf} --enable-python" || myconf="${myconf} --enable-python=no" econf ${myconf} || die "econf failed" - LD_RUN_PATH="" emake -j1 || die "emake failed" + emake -j1 || die "emake failed" # -j1 may not be necessary in the future } -- 2.26.2