Fix handling of bindings (bug #361195). Avoid warning about null runpaths in Perl bindings (bug #350396).

(Portage version: 2.2.0_alpha29_p4/cvs/Linux x86_64)

3 files changed, 52 insertions, 13 deletions

diff --git a/dev-libs/libprelude/ChangeLog b/dev-libs/libprelude/ChangeLog
index 08b936c7c3bb..c1c235358a9b 100644
--- a/dev-libs/libprelude/ChangeLog
+++ b/dev-libs/libprelude/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libprelude
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.74 2011/03/29 22:34:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.75 2011/03/31 01:24:09 arfrever Exp $
+
+  31 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libprelude-1.0.0-r1.ebuild, +files/libprelude-1.0.0-ruby.patch:
+  Fix handling of bindings (bug #361195). Avoid warning about null runpaths in
+  Perl bindings (bug #350396).
 
   29 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   libprelude-1.0.0-r1.ebuild:
diff --git a/dev-libs/libprelude/files/libprelude-1.0.0-ruby.patch b/dev-libs/libprelude/files/libprelude-1.0.0-ruby.patch
new file mode 100644
index 000000000000..1dcc75478152
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-1.0.0-ruby.patch
@@ -0,0 +1,20 @@
+--- configure.in
++++ configure.in
+@@ -465,9 +465,16 @@
+ dnl * Ruby support                                   *
+ dnl **************************************************
+ 
++AC_ARG_WITH(ruby, AC_HELP_STRING(--with-ruby, Enable support for ruby binding @<:@default=auto@:>@),
++            [ruby_required=true])
+ 
+-AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
+ if test x$with_ruby != xno; then
++    AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
++
++    if test x$with_ruby = xno && test x$ruby_required = xtrue; then
++       AC_MSG_ERROR([Could not find ruby binary])
++    fi
++
+     RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts Config::expand("\$(archdir)")'`
+     RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts Config::expand("\$(LIBRUBYARG)")'`
+ 
diff --git a/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild b/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild
index addfe065fa5b..6aa1b251742c 100644
--- a/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild
+++ b/dev-libs/libprelude/libprelude-1.0.0-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="3"
+GENTOO_DEPEND_ON_PERL="no"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
@@ -16,9 +17,12 @@ SRC_URI="${HOMEPAGE}/download/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc easy-bindings perl python swig"
+IUSE="doc lua perl python ruby"
 
 RDEPEND=">=net-libs/gnutls-1.0.17
+	lua? ( dev-lang/lua )
+	perl? ( dev-lang/perl dev-lang/swig )
+	ruby? ( dev-lang/ruby )
 	!net-analyzer/prelude-nids"
 
 DEPEND="${RDEPEND}
@@ -27,19 +31,17 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	if use python; then
 		python_pkg_setup
-
-		if use easy-bindings; then
-			PYTHON_DIRS="bindings/low-level/python bindings/python"
-			PYTHON_MODNAME="prelude.py PreludeEasy.py"
-		else
-			PYTHON_DIRS="bindings/low-level/python"
-			PYTHON_MODNAME="prelude.py"
-		fi
+		PYTHON_DIRS="bindings/low-level/python bindings/python"
+		PYTHON_MODNAME="prelude.py PreludeEasy.py"
 	fi
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libtool.patch
+	epatch "${FILESDIR}"/${P}-ruby.patch
+
+	# Avoid null runpaths in Perl bindings.
+	sed -e 's/ LD_RUN_PATH=""//' -i bindings/Makefile.am bindings/low-level/Makefile.am || die "sed failed"
 
 	# Python bindings are built/installed manually.
 	sed -e "/^SUBDIRS =/s/ python//" -i bindings/low-level/Makefile.am bindings/Makefile.am || die "sed failed"
@@ -49,12 +51,16 @@ src_prepare() {
 
 src_configure() {
 	filter-lfs-flags
+
+	# SWIG is needed to build Perl high-level bindings.
 	econf \
+		--enable-easy-bindings \
 		$(use_enable doc gtk-doc) \
-		$(use_with swig) \
+		$(use_with lua) \
 		$(use_with perl) \
+		$(use_with perl swig) \
 		$(use_with python) \
-		$(use_enable easy-bindings)
+		$(use_with ruby)
 }
 
 src_compile() {
@@ -73,6 +79,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
 
+	if use lua; then
+		rm - "${ED}usr/$(get_libdir)/PreludeEasy.la"
+	fi
+
 	if use perl; then
 		perl_delete_localpod
 		perl_delete_packlist
@@ -86,6 +96,10 @@ src_install() {
 			popd > /dev/null
 		done
 	fi
+
+	if use ruby; then
+		find "${ED}/usr/$(get_libdir)/ruby" -name "*.la" -print0 | xargs -0 rm -f
+	fi
 }
 
 pkg_postinst() {