New revision, fixes bugs #433467 and #430168. Thanks to slepnoga

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 384 insertions, 2 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index b82084640ed8..0a724a30944a 100644
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2012/06/21 18:35:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.18 2012/09/16 08:59:18 pinkbyte Exp $
+
+*hivex-1.3.6-r1 (16 Sep 2012)
+
+  16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org>
+  +files/1.3.6-r1/disable_automagic_cumulative_patch.patch,
+  +hivex-1.3.6-r1.ebuild:
+  New revision, fixes bugs #433467 and #430168. Thanks to slepnoga
 
 *hivex-1.3.6 (21 Jun 2012)
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 5236346f9348..7cb294f4d5c5 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -6,6 +6,7 @@ AUX 1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch 641 SHA256 16a8043e21b739
 AUX 1.3.5/0002-add_per_triplet_in_configure.ac.patch 1134 SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921 SHA512 af9477d48fbb054a4252b3529de768a503699cddaf0d1ce62df2d63ca838683bde565a5d5c8b73c3556b6a5fa314a5ff34b0a74a7d180ebfeab2e513e8a82072 WHIRLPOOL 46d62c6970beb7f1f4082e0be98fb53e5d44c311aaed5a1c505758e4c13e835003e18e1271a28b8398a439fde85c4073a7ad4dd104dff73b9f29a3cd279e95b3
 AUX 1.3.5/0003-fix_python_defenition_configure.ac.patch 579 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1 SHA512 70cf62ce5d744d4ac6086d0ca97e324e166c74b9fe1b87c3b35b55746424df3f49c721899a879a7339d7eb3a3f6fe8671968165b53fce446fc9cfe73a61c70c0 WHIRLPOOL 0ea6425f86f6e3842b44de63b7bef188d7a0646dda4c566a34405ea08e3d75028908e0ced09fadf7a4806624c35551554f4b5cac07bf486b8b2034cd02227293
 AUX 1.3.5/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e
+AUX 1.3.6-r1/disable_automagic_cumulative_patch.patch 10680 SHA256 0564a8e735e4c01c9982e2ec44af8a2854b486a61c193bc7662a8779872e6596 SHA512 b08f54a6ea1f17fb69705934d3a2a5a3b817c370ad3ea135e39c0ed0ef0e485cce323462f79c3ff7855fc5e57568d23f04d71e6c1dd8d058fdb333facaf786ae WHIRLPOOL f57d42fb836bed9c3fed981bff55f2821bd3a3de7fac9baf3e79e50b60bd79e0bc9905fe159916494af5f06ae1d793584627062218eac11f5f3383c91ebadb38
 AUX 1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch 641 SHA256 16a8043e21b7394e8e6eb18e1229b1c598a3dd9559bd8b8e98714baa74dea1d4 SHA512 4f90fcc3be4f470e32b441dcdaf2397551c73c1ef5082a57e6b162854d3a8eac575e4a6d175480312aa238e73c165e5eceae1f190f448a3f2d1b78e281cebcf6 WHIRLPOOL 15a01336bd7b7de556244aded1edbf85034009f28c7df76cd374cca7b0644461ecdc440d824381b835feb2c8681339593f18141300dea1192c21d140b0a9ed97
 AUX 1.3.6/0002-add_per_triplet_in_configure.ac.patch 1134 SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921 SHA512 af9477d48fbb054a4252b3529de768a503699cddaf0d1ce62df2d63ca838683bde565a5d5c8b73c3556b6a5fa314a5ff34b0a74a7d180ebfeab2e513e8a82072 WHIRLPOOL 46d62c6970beb7f1f4082e0be98fb53e5d44c311aaed5a1c505758e4c13e835003e18e1271a28b8398a439fde85c4073a7ad4dd104dff73b9f29a3cd279e95b3
 AUX 1.3.6/0003-fix_python_defenition_configure.ac.patch 579 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1 SHA512 70cf62ce5d744d4ac6086d0ca97e324e166c74b9fe1b87c3b35b55746424df3f49c721899a879a7339d7eb3a3f6fe8671968165b53fce446fc9cfe73a61c70c0 WHIRLPOOL 0ea6425f86f6e3842b44de63b7bef188d7a0646dda4c566a34405ea08e3d75028908e0ced09fadf7a4806624c35551554f4b5cac07bf486b8b2034cd02227293
@@ -20,6 +21,7 @@ DIST hivex-1.3.6.tar.gz 1163454 SHA256 aecc2ba1735a818391a430661f805434bf409c906
 EBUILD hivex-1.3.2-r2.ebuild 1715 SHA256 987bfc1720cdabb7517d4101d5bb0f5ee44e2264d1e0a639ab89301a45bd693e SHA512 0e1f17becaa8379695843a64bf7191b355cf8ea1c046ba8c8335af2bf94365bdfcdd33a95d4b014077f150171b1172349870ba778a5594f119802b6421c0fd4b WHIRLPOOL 76674b3af5a4810048610023ea36b750b24a3a7360b4d5415da37b77148266277e84f5633fcd2745725cbd23791f95d14756c0e7f455a12e3d198e1a0a35bea3
 EBUILD hivex-1.3.3-r1.ebuild 1622 SHA256 70214b0f91d3fbaa840ce685e38f95fa6cfb87c924cfd7c1b0aa9900da4ae85b SHA512 5fc09cc63820af9eda05d18fdc17ea5727fbaad1f44aa3cb7878fdeaa0c3be59b5517dd4be45b8954b8de47a2e3bd45eb654cee8c4c684891972702355875d0e WHIRLPOOL 8cbf0d248e581dfe0e7130d59a7213c8de4290b862067b1cdd75837aee95e7c4c0a18ddfce5a5fde603cff4b8b70d2ef7e2aca62a2a8e7c68f37bd04be26bc32
 EBUILD hivex-1.3.5-r1.ebuild 1659 SHA256 08e3e06bb5189e23085032cc9c6ace4095aead233950224b2bc67bce2ccca52b SHA512 bfcfb52d86fa9ace4198e54abd7b1dffb4bb4c64d070daffeaeff4f4f4d6d55dab1da9a5ac4c47551d5847e81e51646d7f06aba908d6702ac6bfea84d6cdd589 WHIRLPOOL 00f54bf5ced92a91b86ec8695b0fc41db3bbf227c13ac83946f65bb4c59a6a6170dc835f24cdeffe187cd64f0b228ec3dd6cb0b7e0c729cf53a6031836146693
+EBUILD hivex-1.3.6-r1.ebuild 1931 SHA256 e40cd9bda29c63956d249e28bc1425f4f269919cb5805e848b2675bcff4375fd SHA512 3db9851a629000605342848f7148f6fa4c6fbf73c877f2d55ff0db421500b25303ae4b50f32e2aa6c50c4af0d12adfe9b718e903c6f653396bbb39bc00d28926 WHIRLPOOL 2ee93270f3e993b1493a395ce11a006ec3fa5cb4fb6ea4a022c2dd3c6409a9a952c96ddf9992ffd6b90a42972326f176e4c26e4e3baefb995d9390d203b4850f
 EBUILD hivex-1.3.6.ebuild 1656 SHA256 78dca7283601cb2bd21cf14c77d1acaa693a77eb0dd163880c8a19bedd783c73 SHA512 7de85c9c5c9815547d43caadb53d60e6af7217790df822b9cf588b2a718ab449d4731a5b34e8f51003428e7e185667dc830e8e58d4058d21773f5633ea72d26c WHIRLPOOL 2e7943897e37f1f4f72df453f303600cb0c7f46a7585b214f8980b9dedc90f1e6e2e656f64140c64d6937f73d4cf0b0fec7a2981dd0cee99c4bf55cf811a990d
-MISC ChangeLog 4065 SHA256 bd80f4251265a7c1f81b0c4879d67b54b80a91c35715791f2ca413d999d8bbc3 SHA512 e91640bdb2d22e4dfff0d9adfa55b77499fb4a301ee38ace2060e01f3796cee08cddef9657035b63753b3000e128d9966d496f9e42de29bf46f47b5d4576175b WHIRLPOOL b74b54be3e5feae750c3fbb8d3929b826b22cd13f5b235d8cead94bc819489b47aef84b00d554bb572b2c8282f7bb67b358d2783b2f31933dd5e50a463e1b457
+MISC ChangeLog 4299 SHA256 4842fad2b093c466c8801a84830bc4698fca7e47a0a1a214eff5ed5aa9ee0ae5 SHA512 2f6b4bac320a2d5d91a4ae02ac3550ff6f86e4417258f475ce55a08cefce91212220fda39032093993b6747de4089395801b09dfcbe6e0c5e36ffc8e706c7e77 WHIRLPOOL dac74aa1f2eb3800f81aceac272a977c807d79194a2a78122032a253c2ba069899ca5941299e23890711dc1f7c8dfaed7b5a95b86d41bb76fbb714baabafdf5e
 MISC metadata.xml 335 SHA256 6599c2005a7f1100436d99d61ae8fee6378a437bda0dad6ab2a322cb6129b51b SHA512 519508602e6bed84aceb03005c70b2bb24c8f963d1fd72d46d7b0fdf5bb352d945a7b14cd8122302e91a3e1d953243cf1229b24df48cd5394db2a366b43bcca4 WHIRLPOOL fad281cc626b093de22c2b6d0f9d4ca48104044f3425d094c4df0ee5dc5d28c6935cadfafd0ae3555eec1fb61ac1a346851aa283177e48b6e408e4f22b04a014
diff --git a/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch b/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch
new file mode 100644
index 000000000000..72ae84757b19
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch
@@ -0,0 +1,269 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,14 +187,26 @@ AC_CHECK_FUNC([open_memstream])
+ AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
+ 
+ dnl Check for OCaml (optional, for OCaml bindings).
+-AC_PROG_OCAML
+-AC_PROG_FINDLIB
++OCAMLC=no
++OCAMLFIND=no
++AC_ARG_ENABLE([ocaml],
++        AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
++        [],
++        [enable_ocaml=yes])
++AS_IF([test "x$enable_ocaml" != "xno"],
++        [dnl OCAMLC and OCAMLFIND have to be unset first, otherwise
++         dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look.
++         OCAMLC=
++         OCAMLFIND=
++         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"])
+ AM_CONDITIONAL([HAVE_OCAMLOPT],
+-    [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
++               [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
+ 
+-if test "x$OCAMLC" != "xno"; then
++if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then
+     dnl Check if we have caml/unixsupport.h header (OCaml bindings only).
+     old_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS -I$OCAMLLIB"
+@@ -223,28 +235,32 @@ if test "x$OCAMLC" != "xno"; then
+     rm -f conftest conftest.* conftest_ml.*
+ fi
+ 
+-dnl Check for Perl (optional, for Perl bindings).
+-dnl XXX This isn't quite right, we should check for Perl devel library.
++dnl Check for Perl (optional, for Perl bindings and Perl tools).
+ AC_CHECK_PROG([PERL],[perl],[perl],[no])
+ 
+-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([--disable-perl], [Disable Perl language bindings]),
++        [],
++        [enable_perl=yes])
++AS_IF([test "x$enable_perl" != "xno"],[
++        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
++        ])
+ AM_CONDITIONAL([HAVE_PERL],
+-    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
++    [test "x$enable_perl" != "xno" && test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
+ 
+ dnl Check for Python (optional, for Python bindings).
+ PYTHON_PREFIX=
+@@ -252,85 +268,111 @@ PYTHON_VERSION=
+ PYTHON_INCLUDEDIR=
+ PYTHON_INSTALLDIR=
+ 
+-AC_CHECK_PROG([PYTHON],[python],[python],[no])
+-
+-if test "x$PYTHON" != "xno"; then
+-    AC_MSG_CHECKING([Python prefix])
+-    PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
+-    AC_MSG_RESULT([$PYTHON_PREFIX])
+-
+-    AC_MSG_CHECKING([Python version])
+-    PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
+-    PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
+-    PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
+-    AC_MSG_RESULT([$PYTHON_VERSION])
+-
+-    AC_MSG_CHECKING([for Python include path])
+-    if test -z "$PYTHON_INCLUDEDIR"; then
+-        python_path=`$PYTHON -c "import distutils.sysconfig; \
+-                                 print (distutils.sysconfig.get_python_inc ());"`
+-        PYTHON_INCLUDEDIR=$python_path
+-    fi
+-    AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
+-
+-    AC_ARG_WITH([python-installdir],
+-                [AS_HELP_STRING([--with-python-installdir],
+-		                [directory to install python modules @<:@default=check@:>@])],
+-		[PYTHON_INSTALLDIR="$withval"
+-		AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
+-		[PYTHON_INSTALLDIR=check])
+-
+-    if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
+-        PYTHON_INSTALLDIR=
+-        AC_MSG_CHECKING([for Python site-packages path])
+-        if test -z "$PYTHON_INSTALLDIR"; then
+-            PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
+-                                           print (distutils.sysconfig.get_python_lib(1,0));"`
++AC_ARG_ENABLE([python],
++        AS_HELP_STRING([--disable-python], [Disable Python language bindings]),
++        [],
++        [enable_python=yes])
++AS_IF([test "x$enable_python" != "xno"],
++        [
++        AC_CHECK_PROG([PYTHON],[python],[python],[no])
++
++        if test "x$PYTHON" != "xno"; then
++	    AC_MSG_CHECKING([Python prefix])
++            PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
++	    AC_MSG_RESULT([$PYTHON_PREFIX])
++
++	    AC_MSG_CHECKING([Python version])
++            PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
++            PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
++            PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
++	    AC_MSG_RESULT([$PYTHON_VERSION])
++
++            AC_MSG_CHECKING([for Python include path])
++            if test -z "$PYTHON_INCLUDEDIR"; then
++                python_path=`$PYTHON -c "import distutils.sysconfig; \
++                                         print (distutils.sysconfig.get_python_inc ());"`
++                PYTHON_INCLUDEDIR=$python_path
++            fi
++            AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
++
++            AC_ARG_WITH([python-installdir],
++                        [AS_HELP_STRING([--with-python-installdir],
++			                [directory to install python modules @<:@default=check@:>@])],
++			[PYTHON_INSTALLDIR="$withval"
++			AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
++			[PYTHON_INSTALLDIR=check])
++
++	    if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
++	        PYTHON_INSTALLDIR=
++                AC_MSG_CHECKING([for Python site-packages path])
++                if test -z "$PYTHON_INSTALLDIR"; then
++                    PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
++                                                   print (distutils.sysconfig.get_python_lib(1,0));"`
++                fi
++                AC_MSG_RESULT([$PYTHON_INSTALLDIR])
++            fi
++
++            dnl Look for some optional symbols in libpython.
++            old_LIBS="$LIBS"
++
++            PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
++                                           print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
++            AC_CHECK_LIB([c],[PyCapsule_New],
++                         [AC_DEFINE([HAVE_PYCAPSULE_NEW],1,
++                                    [Found PyCapsule_New in libpython])],
++                         [],[$PYTHON_BLDLIBRARY])
++            AC_CHECK_LIB([c],[PyString_AsString],
++                         [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1,
++                                    [Found PyString_AsString in libpython])],
++                         [],[$PYTHON_BLDLIBRARY])
++
++            LIBS="$old_LIBS"
+         fi
+-        AC_MSG_RESULT([$PYTHON_INSTALLDIR])
+-    fi
+-
+-    dnl Look for libpython and some optional symbols in it.
+-    old_LIBS="$LIBS"
+-    if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
+-        dnl libpython3 is called "libpython3.Xmu.so"
+-        LIBPYTHON="python${PYTHON_VERSION}mu"
+-    else
+-        LIBPYTHON="python$PYTHON_VERSION"
+-    fi
+-    AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
+-                 [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
+-
+-    AC_CHECK_FUNCS([PyCapsule_New \
+-                    PyString_AsString])
+-    LIBS="$old_LIBS"
+-fi
+-
+-AC_SUBST(PYTHON_PREFIX)
+-AC_SUBST(PYTHON_VERSION)
+-AC_SUBST(PYTHON_INCLUDEDIR)
+-AC_SUBST(PYTHON_INSTALLDIR)
+ 
++        AC_SUBST(PYTHON_PREFIX)
++        AC_SUBST(PYTHON_VERSION)
++        AC_SUBST(PYTHON_INCLUDEDIR)
++        AC_SUBST(PYTHON_INSTALLDIR)
++        ])
+ AM_CONDITIONAL([HAVE_PYTHON],
+     [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
+ 
+ dnl Check for Ruby and rake (optional, for Ruby bindings).
+ AC_ARG_ENABLE([ruby],
+-        AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
+-        [],
+-        [enable_ruby=yes])
+-AS_IF([test "x$enable_ruby" != "xno"],
+-        [
+-        AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
+-        AC_CHECK_PROG([RAKE],[rake],[rake],[no])
+-        AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
+-        AC_SUBST(RAKE)
++    AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
++    [],
++    [enable_ruby=yes])
++AS_IF([test "x$enable_ruby" != "xno"],[
++    AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
++    AC_CHECK_PROG([RAKE],[rake],[rake],[no])
++
++    AS_IF([test -n "$RUBY" && test -n "$RAKE"],[
++        dnl Find the library.  Note on Debian it's not -lruby.
++        AC_MSG_CHECKING([for C library for Ruby extensions])
++        ruby_cmd='puts RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@'
++        echo running: $RUBY -rrbconfig -e \'$ruby_cmd\' >&AS_MESSAGE_LOG_FD
++        $RUBY -rrbconfig -e "$ruby_cmd" >conftest 2>&AS_MESSAGE_LOG_FD
++        libruby="$(cat conftest)"
++        rm conftest
++        AS_IF([test -n "$libruby"],[
++            AC_MSG_RESULT([-l$libruby])
++            AC_CHECK_LIB([$libruby],[ruby_init],
++                         [have_libruby=1],[have_libruby=])
++
++            dnl Symbols that we substitute when missing.
++            AS_IF([test -n "$have_libruby"],[
++                old_LIBS="$LIBS"
++                LIBS="$LIBS -l$libruby"
++                AC_CHECK_FUNCS([rb_hash_lookup])
++                LIBS="$old_LIBS"
++            ])
++        ],[
++            AC_MSG_RESULT([not found])
+         ])
++    ])
++])
+ AM_CONDITIONAL([HAVE_RUBY],
+-    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
+-
+-AM_CONDITIONAL([HAVE_RUBY],
+-    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
++    [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"])
+ 
+ dnl dnl Check for Java.
+ dnl AC_ARG_WITH(java_home,
diff --git a/app-misc/hivex/hivex-1.3.6-r1.ebuild b/app-misc/hivex/hivex-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..0fbac038d33a
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.6-r1.ebuild
@@ -0,0 +1,104 @@
+# 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-r1.ebuild,v 1.1 2012/09/16 08:59:18 pinkbyte 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 autotools-utils eutils 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}"/"${PVR}"/disable_automagic_cumulative_patch.patch )
+
+DOCS=(README)
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+		python_need_rebuild
+	fi
+	if use perl; then
+		perl-module_pkg_setup
+	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
+
+	if use perl; then
+		pushd perl
+		perl-app_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_test() {
+	if use perl;then
+		pushd perl
+		perl-app_src_install
+		popd
+	fi
+
+	autotools-utils_src_compile check
+}
+
+src_install() {
+	strip-linguas -i po
+
+	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
+
+	if use perl; then
+		fixlocalpod
+	fi
+}