Fix issue with glibc 2.16, bug #463894. Fix error with ruby 19, bug #444808. Thanks to slepnoga.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

7 files changed, 205 insertions, 96 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index 309f461ae7a3..0ccf12c0e722 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.21 2012/10/21 15:37:45 maksbotan Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.22 2013/03/31 09:03:29 maksbotan Exp $
+
+*hivex-1.3.7-r1 (31 Mar 2013)
+
+  31 Mar 2013; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch,
+  +files/1.3.7/ruby1.9_fix_deprection.patch, +hivex-1.3.7-r1.ebuild,
+  -hivex-1.3.3-r1.ebuild, hivex-1.3.2-r2.ebuild:
+  Fix issue with glibc 2.16, bug #463894. Fix error with ruby 19, bug #444808.
+  Thanks to slepnoga.
 
 *hivex-1.3.7 (21 Oct 2012)
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index cf0793c47991..de539be0b408 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -15,31 +15,32 @@ AUX 1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch 641 SHA256 16a8043e21b739
 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
 AUX 1.3.6/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e
+AUX 1.3.7/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e
+AUX 1.3.7/ruby1.9_fix_deprection.patch 1176 SHA256 59a9bc1809f771474739e3b91b665364a2febfdd43c0840e86201a4025f85454 SHA512 3abd265764e4edb9a6368bb2cc696671cc24d8df234833c11515fc1192da7c1e614f17a34f44102c6925eb2ee7c42d88a98c3d72c07749bc690748af19b2b5dd WHIRLPOOL 07ce40388cd58d1d3abbe5b9b6d12401892d7856475b2a15fdf3dc529783cb96de26135933dc1b94b084f5a0e791961de40ba65c776559fb37f3540fe1a57053
 AUX autoconf_fix-1.3.2.patch 3561 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26 SHA512 7e829d2b60eba4ec74785dfae1bb2086cf5a82b9b7d2fe2c7b4f2ed06c8623cdde51cdc789d13a1dbf81bd2e9732f97975999522dd2935b8e06ab875ca854a7d WHIRLPOOL 409cb583e48b6e1281c8ec3147cf7a7ba79c59a112c2ce0b50be886cc9c3b2ff073a404357471f75963a0811d51cad6fcf033afc85eb49a99c6803e540b1f551
 AUX python-test-fix-1.3.2.patch 281 SHA256 9bed6a09223f6429966b9c49ffa1fa597127190fec79aee99dd514734d3cc53b SHA512 e2e9ce40687ff275c33d5a00f1c1f023ce7f9dfc5069796737e125106c15e2f81c46fb9a4235ef9aa65eefd0567b06caa1cd872049e7fc1bceb3b78207d72da4 WHIRLPOOL a6e4ee6c9f74c563df5dfd6ae7d083a541825ae482919bf6f7308b8f6815ce70999f87b41700ad0f43a923ae88a3f4097350cc40029b351caaaad82fdec9ae88
 AUX ruby_runpath_fix-1.3.2.patch 860 SHA256 97eaf90cb14f3f0997a824dc4d45a48c51e67df98f3c456403fb147c4bd35565 SHA512 d0794ec6199a46908f7aa39b90d464a553ffc7b323bd5abb574bf905632959b90a758f0168972d0134abe6778feca4cd211b9aaa8bad6678f23f54d16d633846 WHIRLPOOL 4c8f91c381759beace4c41a2b3714bed10aeb60aad92591783da019128be1dc7b30bc0ca2fee66ed3d9fa9cb241d9b1070426d0089221f0859ad605aabeb419b
 DIST hivex-1.3.2.tar.gz 1082330 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c SHA512 2ffa3585bd76f4c7daeb780e9bde8b22ec85caa5e8bbd8e1d7192c828e7914331e669f20b1aa6477cf72072699395b1c91877322f83e74067069f09e6a7c7ddc WHIRLPOOL 9373a88ed0a6fb0fb7d9011c8c2800ca9c4c9ff3f5121653d6150cfbb17243f6d94bee80a28a92b34be29f59df7e4f971d9acc3c03dd0049eb4524069a52471a
-DIST hivex-1.3.3.tar.gz 1135870 SHA256 c6342ad9f3cd55fa4eb2f5d3acbeeb9701c94f0ad31eb9809639f8f6fc2c1676 SHA512 3a96310e8da255e625f63c67dbc71322f136cfd61e240695184ab7dfb5981f672998209847987e127f1ba52b425c3c638b0920e52326e93428f42e51fcfcb1e0 WHIRLPOOL 38071acb48fa75431eaaa2dacd7b8443c8ebaa701269d9f82af71acb8a7085f3987dc35b64b83808088b8d35808f0b54b9d0e1fc6a5252b929298711f2d6f874
 DIST hivex-1.3.5.tar.gz 1142710 SHA256 e3614bc5b8fd8ed5268be7183dea015d5ab2007d8b47f1c594e6a947bb834adf SHA512 20bc10506b875aa9992e391679ecfd9281b6e3c170c636123f5c90021d219858f1b75228276f5dfa45df031489505ffdec7a3a532d3720b144987a5994985ebb WHIRLPOOL fb70051fb9f9fdccb376cd79c20433994fad935bddbb4ed596b5c53895d9e3421afd963a61e7f90e98e36f6597b1c2fabb5ba3c10f6c8cd124c181ee73584a9c
 DIST hivex-1.3.6.tar.gz 1163454 SHA256 aecc2ba1735a818391a430661f805434bf409c9068ffa495763b69ea94e47e64 SHA512 ff89e12042207289f5962bc3eef99003db761ef0e95466fb3b6586aae0cd9051ba64db9dbab406d0d24faf9ebcce2f581f4fa345f01fcd76a618a71c31b30d95 WHIRLPOOL 259c7cb65c1d63042be3494b4ae4442b9cb3982e6e4eb69aaf7051396183b96774afee64eb7d9044935ac5230972515c64d22c3fcfa58d7ea6ed6b07f8716ac0
 DIST hivex-1.3.7.tar.gz 1168881 SHA256 9f74432bb7b620d6629265fa5efefa45a978b1ee80e4891d12789dc34896eb83 SHA512 0e3cbd02e457472a53ec06e0aab3d6fc65f67cf97d1f0bd5d62cadb52fd8f70f4281ee7e1fc614a5aa030d86edaab32c2eea3b9d9d9e2d77c12e4c421118a142 WHIRLPOOL 759307f458c1f2f082462aedc7f19cb5175f72a89efc32815d22f02b26353a73e5c5d0967ff2d002de919a17ae9999fec51b648355a8cdfefbc0557bc33bf9a6
-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.2-r2.ebuild 1792 SHA256 a9f3aa2eea0a68345e386da75de240d9864874ab80f83264655555b388e4f9c2 SHA512 f555506893abcf0e39ab42fb81d2d4f864589f0105f21c66c6767c2b3835a9bafc07702a3b5670ba56c89a97fb41836d80dee3cc3154aefd27ec61051a11b1c8 WHIRLPOOL 05320c11c9eed7fc301b3e402b3293d013449fa1aead5733f39b319a6502d01a29dc5d1de48dada59c8be5e3bc52e4b0d39ed1484c3a7a4fc2346dcefe7ea1ff
 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-r2.ebuild 2269 SHA256 639383523e74afd4d1cf860de71840abfccedba3e83bbd36fb2297f313a4145f SHA512 0734efbb2abd6c4f8f0694da83bf7df12fe8ce81654917dc69f705092769f288be0a2cb2d5f166401c40e765367f0afe7cd7b9b66b758b65ffd53c78e5e56b70 WHIRLPOOL 4afcb7067d0f19dde945ad656acba0e5cbbb30126fe5bdf2e14e6c224e212efb17d2a794b1233d0f9d102551fef9ea92d6966940f79d695e24b4d9100c22f2f9
 EBUILD hivex-1.3.6.ebuild 1656 SHA256 78dca7283601cb2bd21cf14c77d1acaa693a77eb0dd163880c8a19bedd783c73 SHA512 7de85c9c5c9815547d43caadb53d60e6af7217790df822b9cf588b2a718ab449d4731a5b34e8f51003428e7e185667dc830e8e58d4058d21773f5633ea72d26c WHIRLPOOL 2e7943897e37f1f4f72df453f303600cb0c7f46a7585b214f8980b9dedc90f1e6e2e656f64140c64d6937f73d4cf0b0fec7a2981dd0cee99c4bf55cf811a990d
+EBUILD hivex-1.3.7-r1.ebuild 2361 SHA256 cb9b4e763faf97a2f67f9e7e7cc104e9cf16fac47a399e19254ef2f700542879 SHA512 78bb61f86f4eafa7c8e0fe1697cfa050303c4ff5cd22e17af65ad7389ff8bf60a2cef5c07807297b3963ef8285b7ef4fd33a9a72c8a16326f1cef1e5d042b857 WHIRLPOOL 60b2f447d5140f95239d61a96909607bc545dabc236bfe5682b7d35dabed5031338e11c0eb270c923bb31cbc4ec508fdbfc709446014e255ebdf8db1e9d2567f
 EBUILD hivex-1.3.7.ebuild 2077 SHA256 3efd8f2b4f9c91aeae85440222be2acbc7f00de4556421225c93bb528f3d6f74 SHA512 d95aa5fda581781b60b4ee81c70804d84fd63fbf574bc965160ac6cccb46e088f2c05ccb16d23e8b0b0b57a188c6d7c4a0a2c3e412bcaece0dc126b447b652d2 WHIRLPOOL 19f21d65e0d74f8ff32d597a0045ec8373e35e19fd9607c6347d6a7774775f250157393c933256038ef1c422a23ca7f9e21013324aec2803258350cd2651164e
-MISC ChangeLog 4742 SHA256 62e94cc741653c19d8147406c2f7fe353ea50b431daf84f0d6fc8fa7248779b2 SHA512 90698aafa379c131fad5483fe97d1064f59b2e047721a2e368f3a181b1498032d56e8ea90f0b59a71d0fe5278fcf7e1aeaba5be4e4154c24260ea6541a47f592 WHIRLPOOL 420e0183e97034c5ec28a86e0ec379265da86ce76a6dbeb6dfe30c892cfd907d37bf5d2feed447e57c399f2e1ba8b9fe5a549de967015ef8165e6517a1e126d2
+MISC ChangeLog 5095 SHA256 d2baed96cf37458097fe9502b4d1aa6271876437c88ad6dd4b6729bcfe0c74fa SHA512 64ab77c024ed2edc99991fbfbc1a7ad7af27f7915067e10fea71b70862fba3331b6b476ebb09f8783c30c38c3facdfc876e7b19a5afde013e248001920227bdb WHIRLPOOL 4f5c142557ef3ebc175d6f758cb1cf747757063e478fbcc9e54b4f86be254d4055c92a2896e5555847c95654ba553d9a841a6e14a161cd0135ccbf36f1cab279
 MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQhBbgAAoJEAmJmMX429re0QYH/2ivq1StIg1eXHADxuA0RuOo
-YayJjEsm8sMdbqAnVbTIEPKIzYIo/iFzwuPKSvckN0jvhv3pMG6FMSioH2WwhQBN
-INUoyuzBd+h6FC/vbdU2wb5kpNk367EIH9O3PFcMboZfYBuHYz2dxuhnP1016vG+
-LQbPkcvQ7Rujn43bJdXbu+WHE6M5UlNZ12XitwDm6GrT/kzjjW5V6aarF3NHTsjn
-IuU8OqVb50TlYuUhTJE15F2VmFE51JbeLIMC4O2M7tYm/jfNVlYkxlmyI/ST4g5c
-I4kteHDPaKAH3pDeOzFne1S3VCldOjAYM7gxURzmkvQUH4YBrIXy49Eim4O76m8=
-=kmuH
+iQEcBAEBCAAGBQJRV/wOAAoJEAmJmMX429renSUH/jYSSw87G3cxhIlDnoceNAOT
+GPrLY0x1rSsHKL0d9HW51kFV4vQpkmGvySyrMofPsrRvTL8MAtARrxuy8uoFQytl
+rasux63V/nDx+qO4xEb+ZV3/xyuFarYldRqOi2SCTLY65HcxR1ZJ4INKPmO1o5Ma
+e1cNKvQ/P/lxOpgXAC/3G4MPpK3LtWxuKW/hIKr9OogwjV/3ewg7ttjl2SSFzzR7
+OwNDo8syKxzso0gnifItdnFjJG/NjdmTZQeK7QGHMx94MHkpX7XKSQ4ggfbhSyiX
+idAU/6hovY5yNVn6EI9K71L8MXm1w3Fa7BXFZT5s3547TnIO5aVZ42nTCUcI0u0=
+=MJ0F
 -----END PGP SIGNATURE-----
diff --git a/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch
new file mode 100644
index 000000000000..25624c7104d1
--- /dev/null
+++ b/app-misc/hivex/files/1.3.7/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/1.3.7/ruby1.9_fix_deprection.patch b/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch
new file mode 100644
index 000000000000..defd14a4f700
--- /dev/null
+++ b/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch
@@ -0,0 +1,43 @@
+diff --git a/ruby/Makefile.am b/ruby/Makefile.am
+--- a/ruby/Makefile.am
++++ b/ruby/Makefile.am
+@@ -44,11 +44,11 @@
+ 	RUBY=$(RUBY) RAKE=$(RAKE)
+ 
+ all:
+-	$(RAKE) build
+-	$(RAKE) rdoc
++	$(RAKE) -v build
++	$(RAKE) -v rdoc
+ 
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
++RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
+ 
+ install:
+ 	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
+--- a/ruby/Rakefile.in
++++ b/ruby/Rakefile.in
+@@ -17,9 +17,9 @@
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ require 'rake/clean'
+-require 'rake/rdoctask'
++require 'rdoc/task'
+ require 'rake/testtask'
+-require 'rake/gempackagetask'
++require 'rubygems/package_task'
+ 
+ PKG_NAME='@PACKAGE_NAME@'
+ PKG_VERSION='@PACKAGE_VERSION@'
+@@ -108,7 +108,7 @@
+ EOF
+ end
+ 
+-Rake::GemPackageTask.new(SPEC) do |pkg|
++Gem::PackageTask.new(SPEC) do |pkg|
+     pkg.need_tar = true
+     pkg.need_zip = true
+ end
diff --git a/app-misc/hivex/hivex-1.3.2-r2.ebuild b/app-misc/hivex/hivex-1.3.2-r2.ebuild
index 4493a608affa..fbc702916f0e 100644
--- a/app-misc/hivex/hivex-1.3.2-r2.ebuild
+++ b/app-misc/hivex/hivex-1.3.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r2.ebuild,v 1.2 2012/05/03 17:00:12 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.3 2013/03/31 09:03:29 maksbotan Exp $
 
-EAPI=4
+EAPI=5
 
 WANT_AUTOMAKE="1.11"
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -51,6 +51,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i -e '/gets is a security/d' gnulib/lib/stdio.in.h || die "sed failed"
 	autotools-utils_src_prepare
 }
 
diff --git a/app-misc/hivex/hivex-1.3.3-r1.ebuild b/app-misc/hivex/hivex-1.3.3-r1.ebuild
deleted file mode 100644
index 3ee596d14e97..000000000000
--- a/app-misc/hivex/hivex-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-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
-
-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
-}
diff --git a/app-misc/hivex/hivex-1.3.7-r1.ebuild b/app-misc/hivex/hivex-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..e566fa83280b
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.7-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7-r1.ebuild,v 1.1 2013/03/31 09:03:29 maksbotan Exp $
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+WANT_AUTOMAKE=1.11
+
+USE_RUBY="ruby19"
+RUBY_OPTIONAL=yes
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS=1
+
+inherit base autotools autotools-utils eutils perl-app ruby-ng 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 )
+	ruby? ( $(ruby_implementations_depend) )
+	"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	perl? (
+	 	test? ( dev-perl/Pod-Coverage
+			dev-perl/Test-Pod-Coverage )
+	      )
+	"
+
+ruby_add_bdepend "ruby? ( dev-ruby/rake )"
+ruby_add_bdepend "ruby? ( virtual/ruby-rdoc )"
+
+DOCS=(README)
+PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+	if use perl; then
+		perl-module_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	base_src_prepare
+	eautomake
+}
+
+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
+	if use python; then
+		compile_and_install() {
+			emake -C python clean
+			emake -C python PYTHON_VERSION="${PYTHON_ABI}" \
+							PYTHON_INCLUDEDIR="$(python_get_includedir)" \
+							PYTHON_INSTALLDIR="$(python_get_sitedir)" \
+							DESTDIR="${ED}" install
+		}
+		python_execute_function compile_and_install
+	fi
+}