Fix building with python3 (bug #473924 by Willard Dawson).

Package-Manager: portage-2.2.0_alpha182/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 31 insertions, 13 deletions

diff --git a/dev-libs/libdnet/ChangeLog b/dev-libs/libdnet/ChangeLog
index e0681fc1d34d..51edce883741 100644
--- a/dev-libs/libdnet/ChangeLog
+++ b/dev-libs/libdnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libdnet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.63 2013/06/19 08:02:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.64 2013/06/20 15:46:40 jer Exp $
+
+  20 Jun 2013; Jeroen Roovers <jer@gentoo.org> libdnet-1.12.ebuild:
+  Fix building with python3 (bug #473924 by Willard Dawson).
 
   19 Jun 2013; Chema Alonso <nimiux@gentoo.org> libdnet-1.12.ebuild:
   Stable for amd64 wrt bug #471420
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 7e06ec696db8..9264594ae4b1 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -6,17 +6,13 @@ DIST libdnet-1.11.tar.gz 446233 SHA256 0eb78415c8f2564c2f1e8ad36e98473348d9c9485
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 SHA256 5e646901ae13d8aa47f0c5c063b86ecccb90780f9e3734cdbabf7a2d472c39ac SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a WHIRLPOOL 27f356053749e1abdab24bd420f22e380e0970f7a2926474482a2e2532d1d8561f4b48d0eb243b5a62777543b3644adafd3cead4cc09f21d6cb5391a0b7e00f2
 DIST libdnet-1.12.tgz 970125 SHA256 83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3 WHIRLPOOL 9e5b3a217bfef840ca0ed936dbc3573e51a9283a5a7d3ffd43606b98e8760586196261f34a2508cdcf9f868ccd08c9fd1d499252c9a43bb2f71a5b7b2c00c13e
 EBUILD libdnet-1.11-r2.ebuild 1119 SHA256 745cac605358ab4d9b4d05296faa760ff5fafef7c66c8617d7989c4928cd20af SHA512 831801988ab9f600a7da971b8b81917a609ca06e9b4aae2da17fa13a90c49c1b6a80651808f569eeeeefdd4b8cd2d8d07486eb88bea087f108100bd0db96ace7 WHIRLPOOL 734039d98f7344e561f78cec697ecdc82b9a2b57520ae7fce33e2a9f958b4f69e360245265ccfdd80bdc3096730cbfe2ebc68e73fb8b97917bde5c0c7a0e2d89
-EBUILD libdnet-1.12.ebuild 1285 SHA256 0f4b3b1a72b7417d082a42c0febe625c72b695c13b1d3d90ba8f82a1ee6c024a SHA512 7ab8a9fbde112971fb5792adabdc2122d20f0926399f1fb91c6dfdc6b2faa215dac05b0297e2cc7f9bc18470d9297c450307724ad8758674e63370bc78b84441 WHIRLPOOL 9ff19ec8712cb62e1087dd6b51a964b3c463d9de44417a63a2f2cab2e3443fd1d5d96e1c1e190f564df338ae903920247cd601a0cfb21566139ab873855e8043
-MISC ChangeLog 7771 SHA256 4b53c775ac138f6f0090544a95b9cadb90b1e0bfa29c75a9bfe67938f60b51d9 SHA512 58d675837441e3a0aec357d3449979b75c23729675667e8d60d30f1d55830bbebcef6d41eb9c91ff041f7226f24f9bdc39e859ab7cba49586b5b9f1b1691b25d WHIRLPOOL 02405126703b30369c317b58f4c9625e8dfdd92c06b938d36415791a2cdcae03193782800d47364bb427c37008c2b1bbadadb765d8a9a4ba9db4e1f5a4b80d67
+EBUILD libdnet-1.12.ebuild 1535 SHA256 a4183c36d8d9e8b59677bd5c8c7fcb508c5676a15bb876dd1f0aabfb1930ab18 SHA512 9afd05000f83f834b85470d924f9e233ddfae0bb6cd20f22104acf8a83dde27f07812f69045c37b4a0b6ba2879fd8c782120fccff7b91c681ebbdd385a846e0b WHIRLPOOL 1cfa5cf5125379494f373c0801bcc19e904b363e978582350ab1d235201e52bd6be361093e4541c758f116e1f31fd6f34dbb7ad2edf1318168522ccb20cd68b5
+MISC ChangeLog 7898 SHA256 9d100783af556b42dd33af51acd5b9ee7a4949ba8845b50bb5240e6b6433e1be SHA512 eb181a352e038e8919eab7e1f967268ad8b6a867d851a51f551ed2b92ac373cf918d2b50ad6acad5fc38b144260eda0956ed4e7680c1de7113f2ebdc0fa70a44 WHIRLPOOL b25f84a8d206cb56aef27cc2c8c3c3047f7ec3e69d9b5dbf48636446f9ffee7d675c74d53df09e654271cdd6b48a13895544148994c1ad83def12d526c1746ed
 MISC metadata.xml 237 SHA256 05e77ed344cc3ff71619b1dc09df8abb07213392924b6ab640f6d20a84961a17 SHA512 8e9bdc99baef7851f946ac9e32b2dce194405cb153cefe844ddeb2bf67b42186614a8feae9f430b6abff82c3827f89a8fd7e38859550b6844439ad8cc97b57ab WHIRLPOOL 0cc42ae3a1cf54489a57a3e83eea78b4faf26d3ba7027425485e68a330bbe07eac541ff5e2eca9511b47287b1c9a5767a58713bca52c81c7972430e7425e4857
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRwWWpAAoJEA2sAkrWKOU2mYsH/0nXCQX/IWC4fnnb9r+rvsFZ
-AyQq8nnWbzhh+51E4m5EtlI+7XuH2/aFt/9E1Io1bxpYGmYUqVAJF99Y+doAhBE3
-AX2aU4gIagOkHawLZ+7JToll9UOT+sDzsnmG+JQO3Er3AEv9r6MLsbNsZaWAJWlL
-7h/sr11yhyfm42ndjrHWamq0wqEiJT2DKBnpfId/0hxQB/x9GJ0QdntBlsBiLL6R
-bAtB1vWZBtrOsZAv1U8l2MBnH7Z79wk6Y1CvTeC9wEgoFgQdW/O9LE5uMuaBpEPV
-8J8XXSNebhgC5oCEBih2+0iTveKP0WwCWJB2ImeX7IpTULVjpkX+bwog7oKtOIQ=
-=DMTp
+iEYEAREIAAYFAlHDI+EACgkQVWmRsqeSphOAFQCdGO8tt4NiOTlQQTfybDM0envW
+F/MAmQFxjASyKfEF3nlIq6WdKAa8bo9D
+=gXjL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index 100b0ad1247d..d3b36480ff54 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.7 2013/06/19 08:02:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.8 2013/06/20 15:46:40 jer Exp $
 
 EAPI=5
 
@@ -9,8 +9,9 @@ AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 PYTHON_DEPEND="python? 2"
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+DISTUTILS_SINGLE_IMPL=true
 
-inherit autotools-utils eutils python-r1
+inherit autotools distutils-r1 eutils
 
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="http://code.google.com/p/libdnet/"
@@ -37,7 +38,8 @@ src_prepare() {
 		configure.in || die
 	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
 	use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
-	autotools-utils_src_prepare
+	eautoreconf
+	use python && distutils-r1_src_prepare
 }
 
 src_configure() {
@@ -45,3 +47,20 @@ src_configure() {
 		$(use_with python) \
 		$(use_enable static-libs static)
 }
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+	prune_libtool_files
+}