Fix python handling #514124

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

diff --git a/dev-db/hyperdex/ChangeLog b/dev-db/hyperdex/ChangeLog
index ab4707c1fd8ec986d9ad64be44610546f032547e..efa0ea950a37300679043035958b67e6e93248d2 100644 (file)
--- a/dev-db/hyperdex/ChangeLog
+++ b/dev-db/hyperdex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/hyperdex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.29 2015/01/13 02:48:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.30 2015/01/15 06:41:51 patrick Exp $
+
+*hyperdex-1.6.0-r1 (15 Jan 2015)
+
+  15 Jan 2015; Patrick Lauer <patrick@gentoo.org> +hyperdex-1.6.0-r1.ebuild,
+  -hyperdex-1.6.0.ebuild:
+  Fix python handling #514124
 
 *hyperdex-1.6.0 (13 Jan 2015)
 

diff --git a/dev-db/hyperdex/Manifest b/dev-db/hyperdex/Manifest
index 15d0868ba8c1f446032ca86dd83a687e326ed41a..793f26aa2cefcd0a7c8fda3f34d01b54cfd96281 100644 (file)
--- a/dev-db/hyperdex/Manifest
+++ b/dev-db/hyperdex/Manifest
@@ -8,7 +8,7 @@ DIST hyperdex-1.6.0.tar.gz 1490273 SHA256 1a29ef60b2416b078cf82f120386e4fda53fc4
 EBUILD hyperdex-1.4.4.ebuild 1352 SHA256 d9569ccd0bfa58d2c0f1c9058881d8226f5258a077e52c0b0f4d8405e92e039b SHA512 ac116fa3439d37c8fa1b04162c361eb1951fa1ee6790e65cdc19f590f446af1501ba3ee555c308625bf489b88165458ed541264e20d9c0e910e901d566719768 WHIRLPOOL 98309f0fbca3e6283777acb60700d4b882736f64bdf84fefb9791c5ec58a8a7b779f34a8824b317d93a5fe5fd090ee040382940a23a219551577e4403c24963c
 EBUILD hyperdex-1.4.5.ebuild 1352 SHA256 b259a87e62748029dc137c4cc6a8acac31e1b1a91029b56fe1ed17d3242e1497 SHA512 346a4a9853c430cb9db84eca9e8c6e275ffde878c20ae5093258978b088e48c625ced08dd2e30a0dc4ccb4d9658a0ea6641db4363467f83d5b64b1f6ca7422bd WHIRLPOOL 80ab11309225a246db70ce00903dcc4285ce664f26afc397bd66bd80e0398aa291cca6591ba4263b60aa74f0c3d852a972aa05f7bc61bcfdc681392c16ee5371
 EBUILD hyperdex-1.5.0.ebuild 1450 SHA256 dded80ed8d08d70914be2236649390f870d37dd9df37df2f539bbdff0621d872 SHA512 5fba3deb1439d00263d54efe71d7112c1fdd63647d75973f70e6a80a8cfee7da9111c291590c2243cfa7126f94bf5f1c3e6b88a5ca4463ad7fa7673e1f7a6b9d WHIRLPOOL 020644f96dd6d042f3bc4c0384102b4566e8726c6340caf350d35594c930d579a2cef3f24092d31f8c219c4d9b1db59027ccf5a4b01ed196932bd4e7d1cd29bf
-EBUILD hyperdex-1.6.0.ebuild 1474 SHA256 71843d7fa1eab710f41350385f21b5119d98cdcd34bedcd1aee5e03ce60641ca SHA512 77db40a692fbdcfec67b2f13f2d209f1eb2bfabfdbc0e78e4135660e0d4fdc832f885e7792161e90184537050d508c56ca77d6746caabb6c0f7dcc30fb73d622 WHIRLPOOL 4079320072dd19c1e1cea3f25a5413d9c5241b726f6956831de4785b9a86ead04bcd7b487728ea2064cf0d40340601abba0b4c05f9909d9b290e19fdfd573729
+EBUILD hyperdex-1.6.0-r1.ebuild 1526 SHA256 3be6aa2061126225732e9668c9a684c83ff3bb2a4f216945a01f2e287afbf19d SHA512 989a7923389505cfab8bfa04e8b1448902468a27b2dec2f9e16a6a62a355ac1533e51c255de48dd41e610cf4218a1be60d0d2640baaa5059e763a2f950876594 WHIRLPOOL 63933d38a3b383fa0f5977a8c7bcbb6bd9b5ab8a6bc016e89ca2d9f9455566c730a2bd30ed6c8ba15e9c0596f205172f8fcdddaa7f773e0dd8637f7eab3b6d99
 EBUILD hyperdex-9999.ebuild 1400 SHA256 8d76edad580d2b09328843a42cee999ddab4fe7945f609da81611977f6718836 SHA512 a63a3ad046432a7d91813d1f879e1817a70896738097200814d70978dcd02b69802c07b131961c926f6d6906c11549e76e49ea0a47aba409fc0a00a39c02a7f9 WHIRLPOOL b14210a4fc448a1e1cb319ef22f093f2794f0e4d14b217ab0c03686e336371760d6aed5428f852a15535db29dce829eb5aa3009bc2078e88f1df64bfb4e92249
-MISC ChangeLog 4110 SHA256 af28ede4d2f0e8cdc7c2a460cadfffa2be5ead6b863718140b383ead88befe27 SHA512 f2e202770cbe0aa1e343230d905a1e19ce88057163569900554fbc8aaa1ac82ec092f97da3e22869e39d4560f7b4f2cbe1a73648a327303990d1c1952fae41ca WHIRLPOOL 8cc5ec59778b2a5a7b029b10c91e8ac795ba7bf458a5c8469c90fd5d7161348c5f182b91259eb116b8b89ba1111bd36670dca53660fdedb852aa7aafe18e5af7
+MISC ChangeLog 4278 SHA256 cdfd17f88ef24800e8f81c81ecdb7008756b02a8c93eabb35f0382b0fd4c4999 SHA512 eea7a49744b007c3308e707032a9d22cc1a021c43d76bcc923b2c9691570eaacc3b696246f46e62c8de33fe630bd10555e6126b6a3fea4add5ec52bd4bd80e1b WHIRLPOOL 0f4795dd7d872abb69e549865fb7c6eb7469a9aed43307b6d03809f387267369ac19d277f219bec97da761ba308cc8a443490a9d6619ea53780821f6dc23a34f
 MISC metadata.xml 234 SHA256 18b8701557e457986cd3ce541fc05fb724a82e245bba5ae63959ec6916ea48a8 SHA512 23d74b4992965abe1c0d6bb9d511112de64e5a8ee25ef5bd9a7b7c0119a8d30e6c04439314f35cf9f93d9d6aeb1986868056e9d5912409188a030ff6eb2bfca3 WHIRLPOOL 387f1e5516b42cb431a743b804f89a52b02f2d2105465a9cc39073badce1960f1f518ce4c53d5193a899a421fe574b47186d39ecfd2205fd66d9c57daf66288d

diff --git a/dev-db/hyperdex/hyperdex-1.6.0.ebuild b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
similarity index 91%
rename from dev-db/hyperdex/hyperdex-1.6.0.ebuild
rename to dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
index 34d96c8b28e43cf4c8740d2b0ff7c6ac1a207cdd..518a52bbd7382b9f33437201afdb594d5ecfbf14 100644 (file)
--- a/dev-db/hyperdex/hyperdex-1.6.0.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.6.0.ebuild,v 1.1 2015/01/13 02:48:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild,v 1.1 2015/01/15 06:41:51 patrick Exp $
 EAPI=5
 
 # Tests fail, again
 RESTRICT="test"
 
 PYTHON_COMPAT=( python2_7)
-inherit eutils python-r1 autotools
+inherit eutils python-single-r1 autotools
 
 DESCRIPTION="A searchable distributed Key-Value Store"
 
@@ -40,6 +40,7 @@ src_prepare() {
        cp "${WORKDIR}/"*.m4 m4/
        sed -i -e 's~json/json.h~json-c/json.h~' configure.ac common/datatype_document.cc daemon/index_document.cc || die "Blergh!"
        eautoreconf
+       use python && python-single-r1_pkg_setup
 }
 src_configure() {
        econf --disable-static \