Bump to 1.3.6, thanks to slepnoga

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

7 files changed, 187 insertions, 9 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/Manifest b/app-misc/hivex/Manifest
index 8ac98b0a2b85..3e42e42c5a12 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -9,25 +9,31 @@ AUX 1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch 641 RMD160 dc8098584b55c9
 AUX 1.3.5/0002-add_per_triplet_in_configure.ac.patch 1134 RMD160 eda47001a2c89601cd335eaa32dc09bbd1d86ebb SHA1 c2fbd05bcc7e81fcf2a52fc8abb673ec3ee1446c SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921
 AUX 1.3.5/0003-fix_python_defenition_configure.ac.patch 579 RMD160 201921b3a7d9d89f94219bc4577416c0fa1cd38c SHA1 388fc8b818429a05dbe424235995587bbae86ce4 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1
 AUX 1.3.5/0004-ruby_runpath_fix-1.3.5.patch 846 RMD160 6e5dee0fa04accfe5eb19be71a17656c90761489 SHA1 3d3947e12802a9c13ee3f2f2d22991ed3b41c4e8 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776
+AUX 1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch 641 RMD160 dc8098584b55c9f1a7d11c110f58ccd073f02914 SHA1 a2970f81478b284bd578b31dded76a8d1da4ad2a SHA256 16a8043e21b7394e8e6eb18e1229b1c598a3dd9559bd8b8e98714baa74dea1d4
+AUX 1.3.6/0002-add_per_triplet_in_configure.ac.patch 1134 RMD160 eda47001a2c89601cd335eaa32dc09bbd1d86ebb SHA1 c2fbd05bcc7e81fcf2a52fc8abb673ec3ee1446c SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921
+AUX 1.3.6/0003-fix_python_defenition_configure.ac.patch 579 RMD160 201921b3a7d9d89f94219bc4577416c0fa1cd38c SHA1 388fc8b818429a05dbe424235995587bbae86ce4 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1
+AUX 1.3.6/0004-ruby_runpath_fix-1.3.5.patch 846 RMD160 6e5dee0fa04accfe5eb19be71a17656c90761489 SHA1 3d3947e12802a9c13ee3f2f2d22991ed3b41c4e8 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776
 AUX autoconf_fix-1.3.2.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
 AUX python-test-fix-1.3.2.patch 281 RMD160 5a87dc1bbda092acb5cbe5df220cb71597a421fe SHA1 56a08eb4f2cf5e09e857b398265dcd34cca58502 SHA256 9bed6a09223f6429966b9c49ffa1fa597127190fec79aee99dd514734d3cc53b
 AUX ruby_runpath_fix-1.3.2.patch 860 RMD160 f246f494140f874cfc84c14d7f4d672c0c776ab6 SHA1 6a3bec95ea5ea652b4660a6d224ab21bf15a9d36 SHA256 97eaf90cb14f3f0997a824dc4d45a48c51e67df98f3c456403fb147c4bd35565
 DIST hivex-1.3.2.tar.gz 1082330 RMD160 4c762ee80b5347497559af0c78d7f3962487ca2d SHA1 cdd53de1f6f17a98333b0bde8193458d409fe861 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c
 DIST hivex-1.3.3.tar.gz 1135870 RMD160 16b0cd574435164628ad69facdadf4fe0553f073 SHA1 4565d6e3d94c5ad558f403ab2aa0ad19e7ccf738 SHA256 c6342ad9f3cd55fa4eb2f5d3acbeeb9701c94f0ad31eb9809639f8f6fc2c1676
 DIST hivex-1.3.5.tar.gz 1142710 RMD160 d77697149cf394e00f3e60d72daf21ae290ef774 SHA1 897a2078d43c799bb25f18a6b1ce1779b977c0c2 SHA256 e3614bc5b8fd8ed5268be7183dea015d5ab2007d8b47f1c594e6a947bb834adf
+DIST hivex-1.3.6.tar.gz 1163454 RMD160 6d1d6fdbb3fc45dcca0c2d7ae7f239e7f82ed3b1 SHA1 d3f89b854a36ac75b7db62096ad279f869294c0f SHA256 aecc2ba1735a818391a430661f805434bf409c9068ffa495763b69ea94e47e64
 EBUILD hivex-1.3.2-r2.ebuild 1715 RMD160 fcb9ae18dc8c92d2bbfef6bf11076db102e3877c SHA1 d8674748f64e602eea7c4c1b2c66d653db525078 SHA256 987bfc1720cdabb7517d4101d5bb0f5ee44e2264d1e0a639ab89301a45bd693e
 EBUILD hivex-1.3.3-r1.ebuild 1622 RMD160 20b19f36d4af50042ca5764b7a3585a121b4c5da SHA1 fc3ab0e456123de98f423ece8a124dd04f396553 SHA256 70214b0f91d3fbaa840ce685e38f95fa6cfb87c924cfd7c1b0aa9900da4ae85b
 EBUILD hivex-1.3.5-r1.ebuild 1659 RMD160 880d22625e4bdb4d5f2a9935b6ee9d1c51887879 SHA1 7f082c75870ca2a2520b748ff5df838038038cdb SHA256 08e3e06bb5189e23085032cc9c6ace4095aead233950224b2bc67bce2ccca52b
-MISC ChangeLog 3695 RMD160 efbaef6eb8dbf123359961820a57d20f53118d01 SHA1 a7073a67ce82fac63a34bedf1141e48f936945ee SHA256 19e7b20695eed8e37c0c55281be73f610bfaab9c0d5b0232c19622df781b2ce0
+EBUILD hivex-1.3.6.ebuild 1656 RMD160 7170f4c3919189237e0ae2a391795c8566e7196d SHA1 9c5ed5e0d5cbe8d5d7f7a0a4b8ea799b42dacc98 SHA256 78dca7283601cb2bd21cf14c77d1acaa693a77eb0dd163880c8a19bedd783c73
+MISC ChangeLog 4065 RMD160 9289c3638036155e26ec2941c08eae1f91a8698a SHA1 4c490e24b4b2c51bad8fda4bfcf54d2b2e9b5ee6 SHA256 bd80f4251265a7c1f81b0c4879d67b54b80a91c35715791f2ca413d999d8bbc3
 MISC metadata.xml 335 RMD160 2ce03edff95edf2c05cd80eb8ecce5217b211b77 SHA1 2c474acb945fb3b2dd4853d77be6d8fd6f44aa9b SHA256 6599c2005a7f1100436d99d61ae8fee6378a437bda0dad6ab2a322cb6129b51b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPyjn7AAoJEAmJmMX429re2pMIAJ/7i/ooN/KSP6JqxKpdMZV0
-2glfeTwbl1+NOAHDhw5wGZJQ/xUiavoTLiCYGxfguFvWgJmaJnlzHj4IECAt5kId
-czDUXGOeZr2MtTv+M4BOwM8QeCulondQq1Yoi6hL73NOiNB/VK9yePDHldFTARP+
-6MJ7s5qFXiPFZq40AobGBQtFMTnWALirJsra8n6ITfRZ0WCNQ2MP+Tl7eqG2Tc5z
-NTJhOfpMEY9VHEpI2fwK7ZH5tDeTTmxC4JM55WIfY3i0nNgFO0b3YqN/qpvYqwEi
-kV+8LObMraz7cISKP1vwu97CahHGV0f2BTB3KNIA1Q42na4mV8GTCGqXXoifQg4=
-=trvA
+iQEcBAEBAgAGBQJP42mBAAoJEAmJmMX429reWoQIAKIioB+oH+E0esL5fbxlA7RU
+2hnKWyovkkXRUds0jfr/Q/AcleVd2cdiJsVWV2zR9hq5RCrDSrjq8ibnZMpzatNo
+HX7EkGSXkGgUc62rYU1LazB6DBudSdU02xnhcGIAXYveoJy3ztU19814oWPIjEsJ
+SjRjc2OzjrQ8isixE9/sVgHcFNnBSxV7Ohipx2y4QJN8KJA2Ci8JacXsQ+EkWvAM
+Cd9OD8Cd0HKw+ZSCr9D2QejnVW/s8rPaxfPCXYcEwOu6O+IR4j3hF4uX+1uD5uWz
+7qnDJ6cIWaaJIoAA+4HSkVYOF937L1MUNHMvO9bXVDJCl83SO0opX3yOBymrQfY=
+=NjFZ
 -----END PGP SIGNATURE-----
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
+}