| 1 |
arfrever 11/03/31 01:24:10 |
| 2 |
|
| 3 |
Modified: libprelude-1.0.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix handling of bindings (bug #361195). Avoid warning about null runpaths in Perl bindings (bug #350396). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29_p4/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-libs/libprelude/libprelude-1.0.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: libprelude-1.0.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- libprelude-1.0.0-r1.ebuild 29 Mar 2011 22:34:12 -0000 1.3 |
| 23 |
+++ libprelude-1.0.0-r1.ebuild 31 Mar 2011 01:24:09 -0000 1.4 |
| 24 |
@@ -1,8 +1,9 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild,v 1.3 2011/03/29 22:34:12 arfrever Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild,v 1.4 2011/03/31 01:24:09 arfrever Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
+GENTOO_DEPEND_ON_PERL="no" |
| 32 |
PYTHON_DEPEND="python? 2" |
| 33 |
SUPPORT_PYTHON_ABIS="1" |
| 34 |
RESTRICT_PYTHON_ABIS="3.* *-jython" |
| 35 |
@@ -16,9 +17,12 @@ |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" |
| 39 |
-IUSE="doc easy-bindings perl python swig" |
| 40 |
+IUSE="doc lua perl python ruby" |
| 41 |
|
| 42 |
RDEPEND=">=net-libs/gnutls-1.0.17 |
| 43 |
+ lua? ( dev-lang/lua ) |
| 44 |
+ perl? ( dev-lang/perl dev-lang/swig ) |
| 45 |
+ ruby? ( dev-lang/ruby ) |
| 46 |
!net-analyzer/prelude-nids" |
| 47 |
|
| 48 |
DEPEND="${RDEPEND} |
| 49 |
@@ -27,19 +31,17 @@ |
| 50 |
pkg_setup() { |
| 51 |
if use python; then |
| 52 |
python_pkg_setup |
| 53 |
- |
| 54 |
- if use easy-bindings; then |
| 55 |
- PYTHON_DIRS="bindings/low-level/python bindings/python" |
| 56 |
- PYTHON_MODNAME="prelude.py PreludeEasy.py" |
| 57 |
- else |
| 58 |
- PYTHON_DIRS="bindings/low-level/python" |
| 59 |
- PYTHON_MODNAME="prelude.py" |
| 60 |
- fi |
| 61 |
+ PYTHON_DIRS="bindings/low-level/python bindings/python" |
| 62 |
+ PYTHON_MODNAME="prelude.py PreludeEasy.py" |
| 63 |
fi |
| 64 |
} |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
epatch "${FILESDIR}"/${P}-libtool.patch |
| 68 |
+ epatch "${FILESDIR}"/${P}-ruby.patch |
| 69 |
+ |
| 70 |
+ # Avoid null runpaths in Perl bindings. |
| 71 |
+ sed -e 's/ LD_RUN_PATH=""//' -i bindings/Makefile.am bindings/low-level/Makefile.am || die "sed failed" |
| 72 |
|
| 73 |
# Python bindings are built/installed manually. |
| 74 |
sed -e "/^SUBDIRS =/s/ python//" -i bindings/low-level/Makefile.am bindings/Makefile.am || die "sed failed" |
| 75 |
@@ -49,12 +51,16 @@ |
| 76 |
|
| 77 |
src_configure() { |
| 78 |
filter-lfs-flags |
| 79 |
+ |
| 80 |
+ # SWIG is needed to build Perl high-level bindings. |
| 81 |
econf \ |
| 82 |
+ --enable-easy-bindings \ |
| 83 |
$(use_enable doc gtk-doc) \ |
| 84 |
- $(use_with swig) \ |
| 85 |
+ $(use_with lua) \ |
| 86 |
$(use_with perl) \ |
| 87 |
+ $(use_with perl swig) \ |
| 88 |
$(use_with python) \ |
| 89 |
- $(use_enable easy-bindings) |
| 90 |
+ $(use_with ruby) |
| 91 |
} |
| 92 |
|
| 93 |
src_compile() { |
| 94 |
@@ -73,6 +79,10 @@ |
| 95 |
src_install() { |
| 96 |
emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed" |
| 97 |
|
| 98 |
+ if use lua; then |
| 99 |
+ rm - "${ED}usr/$(get_libdir)/PreludeEasy.la" |
| 100 |
+ fi |
| 101 |
+ |
| 102 |
if use perl; then |
| 103 |
perl_delete_localpod |
| 104 |
perl_delete_packlist |
| 105 |
@@ -86,6 +96,10 @@ |
| 106 |
popd > /dev/null |
| 107 |
done |
| 108 |
fi |
| 109 |
+ |
| 110 |
+ if use ruby; then |
| 111 |
+ find "${ED}/usr/$(get_libdir)/ruby" -name "*.la" -print0 | xargs -0 rm -f |
| 112 |
+ fi |
| 113 |
} |
| 114 |
|
| 115 |
pkg_postinst() { |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
1.75 dev-libs/libprelude/ChangeLog |
| 120 |
|
| 121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/ChangeLog?rev=1.75&view=markup |
| 122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/ChangeLog?rev=1.75&content-type=text/plain |
| 123 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libprelude/ChangeLog?r1=1.74&r2=1.75 |
| 124 |
|
| 125 |
Index: ChangeLog |
| 126 |
=================================================================== |
| 127 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v |
| 128 |
retrieving revision 1.74 |
| 129 |
retrieving revision 1.75 |
| 130 |
diff -u -r1.74 -r1.75 |
| 131 |
--- ChangeLog 29 Mar 2011 22:34:12 -0000 1.74 |
| 132 |
+++ ChangeLog 31 Mar 2011 01:24:09 -0000 1.75 |
| 133 |
@@ -1,6 +1,11 @@ |
| 134 |
# ChangeLog for dev-libs/libprelude |
| 135 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 136 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.74 2011/03/29 22:34:12 arfrever Exp $ |
| 137 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.75 2011/03/31 01:24:09 arfrever Exp $ |
| 138 |
+ |
| 139 |
+ 31 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 140 |
+ libprelude-1.0.0-r1.ebuild, +files/libprelude-1.0.0-ruby.patch: |
| 141 |
+ Fix handling of bindings (bug #361195). Avoid warning about null runpaths in |
| 142 |
+ Perl bindings (bug #350396). |
| 143 |
|
| 144 |
29 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 145 |
libprelude-1.0.0-r1.ebuild: |
Archives