Bump to 1.3.6, thanks to slepnoga

(Portage version: 2.1.10.65/cvs/Linux x86_64)

6 files changed, 173 insertions, 1 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index 7d08cc2eabe7..b82084640ed8 100644
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2012/06/02 15:45:44 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.17 2012/06/21 18:35:22 maksbotan Exp $
+
+*hivex-1.3.6 (21 Jun 2012)
+
+  21 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch,
+  +files/1.3.6/0002-add_per_triplet_in_configure.ac.patch,
+  +files/1.3.6/0003-fix_python_defenition_configure.ac.patch,
+  +files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch, +hivex-1.3.6.ebuild:
+  Bump to 1.3.6, thanks to slepnoga
 
   02 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org> -hivex-1.3.1.ebuild:
   Remove old 1.3.1
diff --git a/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch
new file mode 100644
index 000000000000..d82db8a1aff3
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,10 +187,12 @@
+ AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
+ 
+ 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" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]])
+ AM_CONDITIONAL([HAVE_OCAMLOPT],
+     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
+ 
diff --git a/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch
new file mode 100644
index 000000000000..f3339d2bd9f4
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch
@@ -0,0 +1,36 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,8 +245,31 @@
+     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" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
+ 
+ dnl Check for Python (optional, for Python bindings).
+ PYTHON_PREFIX=
diff --git a/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch
new file mode 100644
index 000000000000..d74b17c1e7c5
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -336,8 +336,11 @@
+ AC_SUBST(PYTHON_INCLUDEDIR)
+ AC_SUBST(PYTHON_INSTALLDIR)
+ 
++AC_ARG_ENABLE([python],
++       AS_HELP_STRING([--with-python],[build Python binding]))
++
+ AM_CONDITIONAL([HAVE_PYTHON],
+-    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "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_ARG_ENABLE([ruby],
diff --git a/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch
new file mode 100644
index 000000000000..25624c7104d1
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6/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/hivex-1.3.6.ebuild b/app-misc/hivex/hivex-1.3.6.ebuild
new file mode 100644
index 000000000000..62c89c2d5e1a
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.6.ebuild
@@ -0,0 +1,83 @@
+# 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.6.ebuild,v 1.1 2012/06/21 18:35:22 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"
+
+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}"/"${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
+}
+
+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() {
+	autotools-utils_src_compile check
+}
+
+src_install() {
+	strip-linguas -i po
+
+	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
+
+	if use perl; then
+		fixlocalpod
+	fi
+}