summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-06-22 13:27:19 +0000
committerJeroen Roovers <jer@gentoo.org>2013-06-22 13:27:19 +0000
commitb97dd1c9ae21819f435e06a2761f1d6e1ab2d962 (patch)
treee8f1adf1b6221c6764b5af17f2acd0e0792e663d /dev-libs/libdnet
parentMask lotus-notes on multilib (diff)
downloadhistorical-b97dd1c9ae21819f435e06a2761f1d6e1ab2d962.tar.gz
historical-b97dd1c9ae21819f435e06a2761f1d6e1ab2d962.tar.bz2
historical-b97dd1c9ae21819f435e06a2761f1d6e1ab2d962.zip
Fix building with system python3 (bug #473924 again). Remove unneeded variables.
Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'dev-libs/libdnet')
-rw-r--r--dev-libs/libdnet/ChangeLog6
-rw-r--r--dev-libs/libdnet/Manifest10
-rw-r--r--dev-libs/libdnet/libdnet-1.12.ebuild15
3 files changed, 19 insertions, 12 deletions
diff --git a/dev-libs/libdnet/ChangeLog b/dev-libs/libdnet/ChangeLog
index 51edce883741..ea38714bdd18 100644
--- a/dev-libs/libdnet/ChangeLog
+++ b/dev-libs/libdnet/ChangeLog
@@ -1,6 +1,10 @@
# 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.64 2013/06/20 15:46:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.65 2013/06/22 13:27:18 jer Exp $
+
+ 22 Jun 2013; Jeroen Roovers <jer@gentoo.org> libdnet-1.12.ebuild:
+ Fix building with system python3 (bug #473924 again). Remove unneeded
+ variables.
20 Jun 2013; Jeroen Roovers <jer@gentoo.org> libdnet-1.12.ebuild:
Fix building with python3 (bug #473924 by Willard Dawson).
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 9264594ae4b1..8e955a4b4e3b 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -6,13 +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 1535 SHA256 a4183c36d8d9e8b59677bd5c8c7fcb508c5676a15bb876dd1f0aabfb1930ab18 SHA512 9afd05000f83f834b85470d924f9e233ddfae0bb6cd20f22104acf8a83dde27f07812f69045c37b4a0b6ba2879fd8c782120fccff7b91c681ebbdd385a846e0b WHIRLPOOL 1cfa5cf5125379494f373c0801bcc19e904b363e978582350ab1d235201e52bd6be361093e4541c758f116e1f31fd6f34dbb7ad2edf1318168522ccb20cd68b5
-MISC ChangeLog 7898 SHA256 9d100783af556b42dd33af51acd5b9ee7a4949ba8845b50bb5240e6b6433e1be SHA512 eb181a352e038e8919eab7e1f967268ad8b6a867d851a51f551ed2b92ac373cf918d2b50ad6acad5fc38b144260eda0956ed4e7680c1de7113f2ebdc0fa70a44 WHIRLPOOL b25f84a8d206cb56aef27cc2c8c3c3047f7ec3e69d9b5dbf48636446f9ffee7d675c74d53df09e654271cdd6b48a13895544148994c1ad83def12d526c1746ed
+EBUILD libdnet-1.12.ebuild 1572 SHA256 4bcc9f90597bbfab9b14157f61fefb6da63da005c5330aeb3646eea87482d986 SHA512 cfb61ab02d27c4344bc87eaf0980e939e83c6afc36cf694f3740c5779e6d04d0416e05a6fa79a76a96ec82126c84e0d0f132941eb1cbad11e8110c2b168a8371 WHIRLPOOL 2c0ac1711c9fef9aed2e2b0573f14992517e7c1214679db2c8b78f720c79ea30afe049866108eac62ce920616558d16cb93ace48268322e712162d649340e5bf
+MISC ChangeLog 8052 SHA256 515f0078b18d9198e78477126715eea140009c742eba0e40af86b7752aaccf1c SHA512 c854a181d39055ecf37ee4dbd830e4e9e7627cd7a2c70030c01d85e49fc8afcfffe193442af2cb53819d0ae715345ff71bcf4f6b114b3e2f82cf0c8c1e665def WHIRLPOOL d466d7b9e1135ab883f01db8ead6fade19c9efd675b0a8a49d1875f2558b5a98cad4b150ceaaa1f447c39af1f2665e0a861df89fd511f45386b7c7769cb4591e
MISC metadata.xml 237 SHA256 05e77ed344cc3ff71619b1dc09df8abb07213392924b6ab640f6d20a84961a17 SHA512 8e9bdc99baef7851f946ac9e32b2dce194405cb153cefe844ddeb2bf67b42186614a8feae9f430b6abff82c3827f89a8fd7e38859550b6844439ad8cc97b57ab WHIRLPOOL 0cc42ae3a1cf54489a57a3e83eea78b4faf26d3ba7027425485e68a330bbe07eac541ff5e2eca9511b47287b1c9a5767a58713bca52c81c7972430e7425e4857
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHDI+EACgkQVWmRsqeSphOAFQCdGO8tt4NiOTlQQTfybDM0envW
-F/MAmQFxjASyKfEF3nlIq6WdKAa8bo9D
-=gXjL
+iEYEAREIAAYFAlHFpjcACgkQVWmRsqeSphODngCdHRQ/y8WZmSsqtzqy0gbhizmw
+TwMAnjb8mT/aUuKGkAfFIiFDADSEwYoo
+=rjkC
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index d3b36480ff54..7e248ae04bec 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -1,15 +1,12 @@
# 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.8 2013/06/20 15:46:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.9 2013/06/22 13:27:18 jer Exp $
EAPI=5
AT_M4DIR="config"
-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 distutils-r1 eutils
@@ -24,6 +21,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="ipv6 python static-libs test"
#DEPEND="test? ( dev-libs/check )"
+DEPEND="${PYTHON_DEPS}"
RESTRICT="test"
DOCS=( README THANKS TODO )
@@ -38,8 +36,12 @@ src_prepare() {
configure.in || die
sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
+ sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
eautoreconf
- use python && distutils-r1_src_prepare
+ if use python; then
+ cd python
+ distutils-r1_src_prepare
+ fi
}
src_configure() {
@@ -60,7 +62,8 @@ src_install() {
default
if use python; then
cd python
- distutils-r1_src_compile
+ unset DOCS
+ distutils-r1_src_install
fi
prune_libtool_files
}