Fix runpath and ldflags in ruby bindings, bug 412099

(Portage version: 2.1.10.57/cvs/Linux x86_64)

9 files changed, 59 insertions, 196 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index eebcc46bfc05..2f9d0766258c 100644
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-misc/hivex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.13 2012/03/25 10:37:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.14 2012/05/02 12:24:25 maksbotan Exp $
+
+*hivex-1.3.5-r1 (02 May 2012)
+*hivex-1.3.2-r2 (02 May 2012)
+*hivex-1.3.3-r1 (02 May 2012)
+
+  02 May 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch,
+  +files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch,
+  +files/ruby_runpath_fix-1.3.2.patch, +hivex-1.3.2-r2.ebuild,
+  +hivex-1.3.3-r1.ebuild, +hivex-1.3.5-r1.ebuild,
+  -files/autoconf_fix-1.3.1.patch, -hivex-1.3.2-r1.ebuild, -hivex-1.3.2.ebuild,
+  -hivex-1.3.3.ebuild, -hivex-1.3.5.ebuild:
+  Fix runpath and ldflags in ruby bindings, bug 412099
 
 *hivex-1.3.5 (25 Mar 2012)
 
diff --git a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch b/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
new file mode 100644
index 000000000000..5b77ede9d5c2
--- /dev/null
+++ b/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
@@ -0,0 +1,11 @@
+--- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
++++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
++     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
diff --git a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
new file mode 100644
index 000000000000..25624c7104d1
--- /dev/null
+++ b/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
@@ -0,0 +1,11 @@
+--- ruby/Rakefile.in	2012-03-13 19:46:43.000000000 +0400
++++ ruby/Rakefile.in	2012-04-15 19:02:42.337118192 +0400
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
++     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
diff --git a/app-misc/hivex/files/autoconf_fix-1.3.1.patch b/app-misc/hivex/files/autoconf_fix-1.3.1.patch
deleted file mode 100644
index 2a9495b51cea..000000000000
--- a/app-misc/hivex/files/autoconf_fix-1.3.1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- configure.ac.orig	2011-08-15 22:29:28.309745342 +0300
-+++ configure.ac	2011-08-15 22:34:54.324549151 +0300
-@@ -170,11 +170,18 @@
- AC_SUBST([LIBXML2_CFLAGS])
- AC_SUBST([LIBXML2_LIBS])
- 
-+
-+dnl ////////////////////////////////////////////////////////////////////////////
- dnl Check for OCaml (optional, for OCaml bindings).
-+
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
-+
-+
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
--    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
-@@ -207,6 +214,8 @@
-     rm -f conftest conftest.* conftest_ml.*
- fi
- 
-+dnl ///////////////////////////////////////////////////////////////////////////////////////
-+
- dnl Check for Perl (optional, for Perl bindings).
- dnl XXX This isn't quite right, we should check for Perl devel library.
- AC_CHECK_PROG([PERL],[perl],[perl],[no])
-@@ -214,21 +223,35 @@
- dnl Check for Perl modules that must be present to compile and
- dnl test the Perl bindings.
- missing_perl_modules=no
--for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
--    AC_MSG_CHECKING([for $pm])
--    if ! perl -M$pm -e1 >/dev/null 2>&1; then
--        AC_MSG_RESULT([no])
--        missing_perl_modules=yes
--    else
--        AC_MSG_RESULT([yes])
--    fi
--done
--if test "x$missing_perl_modules" = "xyes"; then
--    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
--fi
-+
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
-+
- 
- AM_CONDITIONAL([HAVE_PERL],
--    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
-+
-+dnl //////////////////////////////////////////////////////////////////////////////////////////////////
- 
- dnl Check for Python (optional, for Python bindings).
- AC_CHECK_PROG([PYTHON],[python],[python],[no])
-@@ -266,15 +289,21 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_SITE_PACKAGES)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"])
-+    [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
- 
-+AC_ARG_ENABLE([ruby],
-+       AS_HELP_STRING([--with-ruby],[build Ruby binding]))
-+
- AM_CONDITIONAL([HAVE_RUBY],
--    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
- 
- dnl dnl Check for Java.
- dnl AC_ARG_WITH(java_home,
diff --git a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch b/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
new file mode 100644
index 000000000000..5b77ede9d5c2
--- /dev/null
+++ b/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
@@ -0,0 +1,11 @@
+--- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
++++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
++     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
diff --git a/app-misc/hivex/hivex-1.3.2-r1.ebuild b/app-misc/hivex/hivex-1.3.2-r2.ebuild
index 1811354e28c8..22c73a5960f6 100644
--- a/app-misc/hivex/hivex-1.3.2-r1.ebuild
+++ b/app-misc/hivex/hivex-1.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r1.ebuild,v 1.2 2012/03/25 10:37:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $
 
 EAPI=4
 
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 	ruby? ( dev-ruby/rake )
 	"
 PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
-"${FILESDIR}"/python-test-fix-${PV}.patch)
+"${FILESDIR}"/python-test-fix-${PV}.patch
+"${FILESDIR}"/ruby_runpath_fix-${PV}.patch)
 DOCS=(README)
 
 pkg_setup() {
diff --git a/app-misc/hivex/hivex-1.3.2.ebuild b/app-misc/hivex/hivex-1.3.2.ebuild
deleted file mode 100644
index b58fe668537a..000000000000
--- a/app-misc/hivex/hivex-1.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2.ebuild,v 1.5 2011/11/10 12:53:10 maksbotan Exp $
-
-EAPI=4
-
-WANT_AUTOMAKE="1.11"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PYTHON_DEPEND="python? 2:2.6"
-inherit base autotools-utils perl-app python
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline perl python test static-libs ruby"
-
-RDEPEND="virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline )
-	perl? ( dev-perl/IO-stringy )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	perl? (
-	 	test? ( dev-perl/Pod-Coverage
-				dev-perl/Test-Pod-Coverage ) )
-	ruby? ( dev-ruby/rake )
-	"
-PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
-"${FILESDIR}"/python-test-fix-${PV}.patch)
-DOCS=(README)
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		python_need_rebuild
-	fi
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		$(use_enable python)
-		$(use_enable ruby)
-		--disable-rpath )
-
-		autotools-utils_src_configure
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	strip-linguas -i po
-
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	if use perl; then
-		fixlocalpod
-	fi
-}
diff --git a/app-misc/hivex/hivex-1.3.3.ebuild b/app-misc/hivex/hivex-1.3.3-r1.ebuild
index be7e4b5a2c39..3ee596d14e97 100644
--- a/app-misc/hivex/hivex-1.3.3.ebuild
+++ b/app-misc/hivex/hivex-1.3.3-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.3.ebuild,v 1.1 2012/02/26 19:56:32 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.3-r1.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $
 
 EAPI=4
 
 WANT_AUTOMAKE="1.11"
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
 
 PYTHON_DEPEND="python? 2:2.6"
 inherit base autotools-utils perl-app python
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 				dev-perl/Test-Pod-Coverage ) )
 	ruby? ( dev-ruby/rake )
 	"
-PATCHES=("${FILESDIR}"/"${PV}")
+PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
 DOCS=(README)
 
 pkg_setup() {
@@ -48,8 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	EPATCH_SUFFIX=patch  EPATCH_FORCE=yes base_src_prepare
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-misc/hivex/hivex-1.3.5.ebuild b/app-misc/hivex/hivex-1.3.5-r1.ebuild
index 75278a3eed23..cabce4aec22d 100644
--- a/app-misc/hivex/hivex-1.3.5.ebuild
+++ b/app-misc/hivex/hivex-1.3.5-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.5.ebuild,v 1.1 2012/03/25 10:37:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.5-r1.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $
 
 EAPI=4
 
 WANT_AUTOMAKE="1.11"
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+
 USE_RUBY="ruby18"
 RUBY_OPTIONAL=yes
 PYTHON_DEPEND="python? 2:2.6"
@@ -38,7 +40,7 @@ DEPEND="${RDEPEND}
 				dev-perl/Test-Pod-Coverage ) )
 	ruby? ( dev-ruby/rake )
 	"
-PATCHES=("${FILESDIR}"/"${PV}")
+PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
 DOCS=(README)
 
 pkg_setup() {
@@ -50,8 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	EPATCH_SUFFIX=patch  EPATCH_FORCE=yes base_src_prepare
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {