Bump to 1.3.5, fix autoreconf invocation in 1.3.2-r1. Thanks to slepnoga

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

7 files changed, 185 insertions, 6 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index c1260b2a0c47..eebcc46bfc05 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.12 2012/02/26 19:56:32 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.13 2012/03/25 10:37:40 maksbotan Exp $
+
+*hivex-1.3.5 (25 Mar 2012)
+
+  25 Mar 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch,
+  +files/1.3.5/0002-add_per_triplet_in_configure.ac.patch,
+  +files/1.3.5/0003-fix_python_defenition_configure.ac.patch,
+  +hivex-1.3.5.ebuild, hivex-1.3.2-r1.ebuild:
+  Bump to 1.3.5, fix autoreconf invocation in 1.3.2-r1. Thanks to slepnoga
 
 *hivex-1.3.3 (26 Feb 2012)
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 8e3233e622cc..f890a9453c1e 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,15 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch 1948 RMD160 77c0bdf96bbbe6aacd8bcf380c9abcb40c796df5 SHA1 6e9212a51ad041fedf47eab221d9d781611f562a SHA256 e2f72baf94dee3439179250108e2ae05cf7e7b3d1c94f7e2481ae0d9bd6c2328
 AUX 1.3.3/0002-automake.patch 2095 RMD160 2531edf47fa7a4e20512c30c7fd1c3e1f37f9daf SHA1 4eedd0a1e4317a7aa964da3fbf021a9b0fbfae0c SHA256 89d52f2c0a5ade1e00b6bea33e38004bf3a24fc721ff90c5d930aa24b2f81c82
 AUX 1.3.3/0003_autoconf_fix_automagic-1.3.3.patch 3274 RMD160 4bc135dff127fc00054735658c4e48c10344aaa4 SHA1 2c6390f94d2f1f913246c1c3d8984bc20fec409d SHA256 1562f50ee11b75756ae3c6854b7746085b46904a29581c04ea73a318b10129e4
+AUX 1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch 641 RMD160 dc8098584b55c9f1a7d11c110f58ccd073f02914 SHA1 a2970f81478b284bd578b31dded76a8d1da4ad2a SHA256 16a8043e21b7394e8e6eb18e1229b1c598a3dd9559bd8b8e98714baa74dea1d4
+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 autoconf_fix-1.3.1.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
 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
 DIST hivex-1.3.1.tar.gz 1078397 RMD160 5f42e555fae7c694421714b7e7e9909888b5b2f3 SHA1 71b54636b516f7c08767c826c2c630358f9e52de SHA256 dc18d94c88f088b9423ed429fe2fd95bab51fc66f86b6081a7c73e4093913328
 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
 EBUILD hivex-1.3.1.ebuild 1563 RMD160 3223dad9d06820cc293092e63b4342bb18225360 SHA1 8fd26711441a63047bdbd20a3e2e8ab9faecb8b1 SHA256 c6c0e8e3e611246fc5b7dbeee1ac95042fd087faf9eace150a9afd6d5bfdc762
-EBUILD hivex-1.3.2-r1.ebuild 1663 RMD160 dc2859b669ada581597541efc002275fcbffc39a SHA1 7882a0822a1894da201fe43a318522843c59e966 SHA256 738dce83615f00fc659c9eaf8c6a19246b14fbf1079b5018d91961e472bb9d42
+EBUILD hivex-1.3.2-r1.ebuild 1673 RMD160 48632acd2e93234273828d986466ad3027683cf2 SHA1 0f6594075680de1ecd768d5b96b2d1f00ed31825 SHA256 62eb29913fd071696eba6b26af688e45368e38d2fb24ea0fa6390ca0361cf015
 EBUILD hivex-1.3.2.ebuild 1638 RMD160 e4af5618c5846ed6c17cd9e84352d6fac7f3b6eb SHA1 d714f60236f8b292fab1aa9fe2bb516c9b42e8e2 SHA256 6a39624af7390b633b01d7e6702e4bbdec7c448c4aada755ed2c507f8c3e743a
 EBUILD hivex-1.3.3.ebuild 1628 RMD160 2491f31a2520aa9d908e427ae9b75bc2050f89ff SHA1 3ad3787e5912a25497a94d707c9a75c7f64c967f SHA256 6121c929047bd1a81f840b3ea9dcd0090cdcda01b4feec7451c402f71cd5b090
-MISC ChangeLog 2526 RMD160 83eff83e54473eec9e8fd5c5cc47375724c0299b SHA1 4a3811a5491917658cd27f6d77ddc66f39802b6d SHA256 84609f53ad00b1b6ce04d2d85d73fd264c85b74b38343c8a4ad2fca0d4f46d50
+EBUILD hivex-1.3.5.ebuild 1664 RMD160 02c0ad3357c3e2c2e0617b8cab8d7870e6cc7e04 SHA1 654fa1e0d79705006c9d119462cb4050222f3ec2 SHA256 2bfa842e48a6df4af84148d090c7637f64eecc42d13ae3f8b4def264db5c0953
+MISC ChangeLog 2910 RMD160 0bb9e9014a235bcf8cbcb54ad0c88a9ef9d7c223 SHA1 03ae1e2e91fc4f2ddb4e3930db5873ef65bdd85a SHA256 717136d2ca532f47b7e0fbfcfed16387e791a68d4839bdff5fc43c6771741500
 MISC metadata.xml 335 RMD160 2ce03edff95edf2c05cd80eb8ecce5217b211b77 SHA1 2c474acb945fb3b2dd4853d77be6d8fd6f44aa9b SHA256 6599c2005a7f1100436d99d61ae8fee6378a437bda0dad6ab2a322cb6129b51b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPbvWAAAoJEAmJmMX429remO8H/0L0iqtdTtrBracT9aheghqd
+fgeHIWkI/dgYS8W6BcGoXX6eI8fcPwGct9DI4fxSUcIp0oBNGIVEjaVjOUN/qKol
+55NFqqMsCn9N7eCltpzh4kUTz1FVppsjPnLwFMSB/GUqYTa4tLpr7BA3stRr+j7N
+Y/Q7H3XVQwn5Bx3OgYOaHziIKGjghsIUrUrLpFSlUTonaAcP3g2opYaoE94jff+g
+WQuWVdfrAaZtzwCAdfTZXcZPDIg1p7UdUwzF4T0a+oXz4w6T05HWbEX/+iGAt5pk
+2odB/g+tOWaB/SE3s79Idvu7o9QLUoVIYzlrUxLj8UcnTFqjLRw7DzynSxDbc/I=
+=af8m
+-----END PGP SIGNATURE-----
diff --git a/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch
new file mode 100644
index 000000000000..d82db8a1aff3
--- /dev/null
+++ b/app-misc/hivex/files/1.3.5/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.5/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch
new file mode 100644
index 000000000000..f3339d2bd9f4
--- /dev/null
+++ b/app-misc/hivex/files/1.3.5/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.5/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch
new file mode 100644
index 000000000000..d74b17c1e7c5
--- /dev/null
+++ b/app-misc/hivex/files/1.3.5/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/hivex-1.3.2-r1.ebuild b/app-misc/hivex/hivex-1.3.2-r1.ebuild
index 1b56b5461c24..1811354e28c8 100644
--- a/app-misc/hivex/hivex-1.3.2-r1.ebuild
+++ b/app-misc/hivex/hivex-1.3.2-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/12/01 17:26:53 maksbotan Exp $
+# $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 $
 
 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
@@ -50,7 +51,6 @@ pkg_setup() {
 
 src_prepare() {
 	autotools-utils_src_prepare
-	eautoreconf
 }
 
 src_configure() {
diff --git a/app-misc/hivex/hivex-1.3.5.ebuild b/app-misc/hivex/hivex-1.3.5.ebuild
new file mode 100644
index 000000000000..75278a3eed23
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.5.ebuild
@@ -0,0 +1,82 @@
+# 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 $
+
+EAPI=4
+
+WANT_AUTOMAKE="1.11"
+AUTOTOOLS_IN_SOURCE_BUILD=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}")
+DOCS=(README)
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+		python_need_rebuild
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX=patch  EPATCH_FORCE=yes base_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() {
+	autotools-utils_src_compile check
+}
+
+src_install() {
+	strip-linguas -i po
+
+	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
+
+	if use perl; then
+		fixlocalpod
+	fi
+}