Add support for multiple python ABIs

Package-Manager: portage-2.1.11.16/cvs/Linux i686

4 files changed, 149 insertions, 3 deletions

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index 09719d239ca9..22a1132a7e89 100644
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2012/09/16 09:03:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.20 2012/09/17 12:54:42 maksbotan Exp $
+
+*hivex-1.3.6-r2 (17 Sep 2012)
+
+  17 Sep 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.3.6-r1/fix_python_linking.patch, +hivex-1.3.6-r2.ebuild:
+  Add support for multiple python ABIs
 
   16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Add name field to first maintainer in metadata
@@ -107,4 +113,3 @@
   +files/autoconf_fix-1.3.0.patch, +hivex-1.3.1.ebuild,
   +files/incorrect_format.patch, +metadata.xml:
   Copy app-misc/hivex from rion-overlay, thanks to slepnoga. Bug #342217
-
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 6f8a383d63d0..1c672fec1c94 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch 1948 SHA256 e2f72baf94dee3439179250108e2ae05cf7e7b3d1c94f7e2481ae0d9bd6c2328 SHA512 907a4258c150acaf51ca282df66262b43dff8214bab758e8dc19e532ef1a688655ba3e1138916f7cac792245ef16c8c3bdf776d28da9188a5ed6b68434c180a0 WHIRLPOOL dccab341db4c14b6fb05799e93e33105a1624051609fec024beaf596e9071a19fb6671e191e50ce016a7b526224309319543424716d62ae54cdc5e4cf82fc5b2
 AUX 1.3.3/0002-automake.patch 2095 SHA256 89d52f2c0a5ade1e00b6bea33e38004bf3a24fc721ff90c5d930aa24b2f81c82 SHA512 e0c7a08be9fb398f5573969ef04d5c3332f581c0dc65513ede9b7ef65d903fbc4d498d05b372edb844f4292dd50d267504e9363a8649f137cd12c61aa24f293c WHIRLPOOL 6f947b6810f3975c58aed114a7419bda1e9e460d9f2c89e17c8d49225a461be09cbe1b0f18bdbfa737aa880f27d19d15bb65ae266bac8e716433a135dc73da0f
 AUX 1.3.3/0003_autoconf_fix_automagic-1.3.3.patch 3274 SHA256 1562f50ee11b75756ae3c6854b7746085b46904a29581c04ea73a318b10129e4 SHA512 5b298e9aef8c3b7595fb36a8d7eb16dde7f464ffb9669ad448efa8fbbccffd852eda5e9b7286f9259f6d3bdcbf5849e09eff0306dd544825defa5fb372d1e951 WHIRLPOOL aff0305a4d24b2445aedbc8c76fe604cb61bef3e9d28ed9dbabaee3b777967cd92fe11e76f58dcaf32199af8413adb31d5126e6c0736df2b4688fccf8a04797a
@@ -7,6 +10,7 @@ AUX 1.3.5/0002-add_per_triplet_in_configure.ac.patch 1134 SHA256 6ac6aef58d8c622
 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-r1/fix_python_linking.patch 496 SHA256 8bed6ba6f701b680659473c23fc9cc0567b57442badfbc9d3944e0b23f2e1b1a SHA512 d83b1ecedcdcbb2fe948cd2186cf017053ab715ae7eab28ffce15eef274203259246a0aab3621ea494910aced79aa296e42fced16151c4d7b755f45a61c1297e WHIRLPOOL 1b0a180df74c35ee1788d094ce2ddf2ad6bdd2e7345e506d25f75e5864e94a45cef3e9fb8163446f1a6c065d9380df34a4bec84e376773c6432f2683331f42de
 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
@@ -22,6 +26,18 @@ EBUILD hivex-1.3.2-r2.ebuild 1715 SHA256 987bfc1720cdabb7517d4101d5bb0f5ee44e226
 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-r2.ebuild 2269 SHA256 639383523e74afd4d1cf860de71840abfccedba3e83bbd36fb2297f313a4145f SHA512 0734efbb2abd6c4f8f0694da83bf7df12fe8ce81654917dc69f705092769f288be0a2cb2d5f166401c40e765367f0afe7cd7b9b66b758b65ffd53c78e5e56b70 WHIRLPOOL 4afcb7067d0f19dde945ad656acba0e5cbbb30126fe5bdf2e14e6c224e212efb17d2a794b1233d0f9d102551fef9ea92d6966940f79d695e24b4d9100c22f2f9
 EBUILD hivex-1.3.6.ebuild 1656 SHA256 78dca7283601cb2bd21cf14c77d1acaa693a77eb0dd163880c8a19bedd783c73 SHA512 7de85c9c5c9815547d43caadb53d60e6af7217790df822b9cf588b2a718ab449d4731a5b34e8f51003428e7e185667dc830e8e58d4058d21773f5633ea72d26c WHIRLPOOL 2e7943897e37f1f4f72df453f303600cb0c7f46a7585b214f8980b9dedc90f1e6e2e656f64140c64d6937f73d4cf0b0fec7a2981dd0cee99c4bf55cf811a990d
-MISC ChangeLog 4413 SHA256 391456191a0d88ca7d3e71af9f8c1d21a61f8c8f66f6bffde6f30ffaf048ca93 SHA512 9f823ae93b2cc10652e03641f2d8e09c55e3972a584802769f86c8e1d03e3658f7ec15dbb255271a58a92cf6f27adef9be89fbd625e87707ae9208fc218d07a9 WHIRLPOOL 19249898925a38c8edb2e73a17d6734fc6d58cca15dedda9fca8597bfe9cfe7d78f713e582c92a3b1522fe4c9c9538ee5cd9f082c623e4f37095ac279c66e24d
+MISC ChangeLog 4604 SHA256 4346eb1a74e8022d214684ff48598d80468e98572e51ba2b4aba0c2fe8157bd4 SHA512 d2c245fe8e3e75dca6797dabae7ded19a82e5de12a7857db8da77d117524b4aa353d59359ab3de916c4d87bb0b614be4fddc646a6643a792d73db7d738fb0831 WHIRLPOOL ea9b85be430ec1b1762920aa16e504b35aaf8c4dfc87e01d2c46db91624bab61d3f117c8bb6cec71e3cf4ed06f90adf085cbf58795fa0fd9f18e40742c051703
 MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQVx2yAAoJEAmJmMX429reXHAH/02Z2BKfL+N3kRbToN/dAMNu
+2tp5maKrP6aD4aYoDqQF6UR5d4D00PmdEZ/+oosNUGsgxu8kmXdhSVzV0efq5mUS
+09zkb/Z4cewjzufOoVV8gR5yqkKk5pf5h+c2HM+Zk6vZSwEBz8urrEUDJ243nUQc
+io19lG6YJXt3Fpfzz5gIbMnRwSnq3t5jg+7ydDfNgQl2Z/xBUidr/AccJ6KuRfYN
+R60cgL88MR+RY4FNSSU0UBQkjXSS/tEfSW+2KnNBRVA8IlB0EibJGiz/X732uXyv
+ulWIShNhreEv3usSyRnGD0g4AP9OuywLnIwaEvVas+2mY/LPkg8bpHum5Y1tKMI=
+=21kQ
+-----END PGP SIGNATURE-----
diff --git a/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch b/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch
new file mode 100644
index 000000000000..283d68897de5
--- /dev/null
+++ b/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch
@@ -0,0 +1,11 @@
+--- python/Makefile.am	2012-06-12 14:12:50.000000000 +0400
++++ python/Makefile.am	2012-09-17 16:21:55.230278577 +0400
+@@ -35,7 +35,7 @@
+ libhivexmod_la_SOURCES = hivex-py.c
+ libhivexmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
+ 		        -I$(top_srcdir)/lib -I$(top_builddir)/lib
+-libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la
++libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la -lpython$(PYTHON_VERSION)
+ libhivexmod_la_LDFLAGS = -avoid-version -shared
+ 
+ TESTS_ENVIRONMENT = \
diff --git a/app-misc/hivex/hivex-1.3.6-r2.ebuild b/app-misc/hivex/hivex-1.3.6-r2.ebuild
new file mode 100644
index 000000000000..85bccd73db8c
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.6-r2.ebuild
@@ -0,0 +1,114 @@
+# 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-r2.ebuild,v 1.1 2012/09/17 12:54:42 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"
+SUPPORT_PYTHON_ABIS=1
+
+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}"/${PV}-r1/disable_automagic_cumulative_patch.patch
+		  "${FILESDIR}"/${PV}-r1/fix_python_linking.patch )
+
+DOCS=(README)
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	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
+	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
+}