summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-05-27 11:50:12 +0000
committerJeroen Roovers <jer@gentoo.org>2013-05-27 11:50:12 +0000
commitbbe1ae56670a2cd3bfeeba7a0c68e52cb8de3259 (patch)
tree92e36ef5675443f2ae4c6f3fe587d56bda613c03 /dev-libs/libdnet
parentVersion bump (bug #471354). (diff)
downloadhistorical-bbe1ae56670a2cd3bfeeba7a0c68e52cb8de3259.tar.gz
historical-bbe1ae56670a2cd3bfeeba7a0c68e52cb8de3259.tar.bz2
historical-bbe1ae56670a2cd3bfeeba7a0c68e52cb8de3259.zip
Fix building with automake-1.13 (bug #471372 by Jason Mours). Migrate to python-r1.eclass.
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'dev-libs/libdnet')
-rw-r--r--dev-libs/libdnet/ChangeLog10
-rw-r--r--dev-libs/libdnet/Manifest12
-rw-r--r--dev-libs/libdnet/libdnet-1.11-r2.ebuild7
-rw-r--r--dev-libs/libdnet/libdnet-1.12.ebuild14
4 files changed, 26 insertions, 17 deletions
diff --git a/dev-libs/libdnet/ChangeLog b/dev-libs/libdnet/ChangeLog
index d1d6e97b79ae..2384d1baa9d3 100644
--- a/dev-libs/libdnet/ChangeLog
+++ b/dev-libs/libdnet/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/libdnet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.59 2012/10/10 18:17:08 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.60 2013/05/27 11:50:10 jer Exp $
+
+ 27 May 2013; Jeroen Roovers <jer@gentoo.org> libdnet-1.11-r2.ebuild,
+ libdnet-1.12.ebuild:
+ Fix building with automake-1.13 (bug #471372 by Jason Mours). Migrate to
+ python-r1.eclass.
10 Oct 2012; Jeroen Roovers <jer@gentoo.org> -libdnet-1.11-r1.ebuild,
libdnet-1.12.ebuild:
@@ -207,4 +212,3 @@
comments should well explained and written in clean English. The details about
writing correct changelogs are explained in the skel.ChangeLog file which you
can find in the root directory of the portage repository.
-
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 147f9370a671..ab54147e6890 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -5,14 +5,14 @@ AUX libdnet-1.10-gcc4.diff 866 SHA256 42fb181305e4195ae8d5dd720a3553a58fba86a087
DIST libdnet-1.11.tar.gz 446233 SHA256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 SHA512 62d6aee6836f8e56fa7d941866416baae71916318a94e4adc3305a4d9634596845b112a500368763c813f7da32557ca85a4942fe7d245d34069137e6516b10af WHIRLPOOL 8578631d320e5157df351d2d14f76a4d005cbd0dbd4160efd3ec4912e39a1e5efed4920bec2b8afc4edb6e2faa58274be9fd2adde1884a201a4f030342fbc93c
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 1061 SHA256 4b2a6df0827f9d56072309ff70f7c9563d179b7085ce6f9fa2497680ae3d5134 SHA512 36b077d07a1ea8e793652873e68e7b2d7f6c515ca709f2abd526398a61e17910a60fb259ba71b00892d1e153045fcc1ecbc55b01431ee33f445c050ff02fc749 WHIRLPOOL 8f32e6ad8a1f45b4a1d8c8c9a8d43a92d8b4889b93c0a51b23eae1c597f86bd7909aea6103db986f4eead06c319364307d50d1851b01b6d842de2f9dcbf8646a
-EBUILD libdnet-1.12.ebuild 1229 SHA256 f3feaefaf0934687168bb7fb6bd8ff0125129654fea7bc6ea9824f4799e8e652 SHA512 864940e1f79e16d3a1fdae014ce097d4c20ab5c88b4f53b8a127ee47698e3cf038edf3160332e7ee70ce69319e59ef08d216acbba560559ac19df82a3a14d9a2 WHIRLPOOL 2bfd295c5e678a8f230ba257d2f56a7ec498a8f692121f0143ee792d48abdea9d0e3ec368f31153858f01315e8153a54830a6d36c696e16212e466720dad756b
-MISC ChangeLog 7228 SHA256 4ea65c703b70ea13c8fa6ffd046059513aa7962354b85e594d8b0eddc54ccdce SHA512 e614094189d3219ba0635a8b5da2c6fd5f5483f47847df7f58de0cd92a5663899945f8d4a7dcbd3e9e3c44f2f9059fcd0d676e247809c2c9cbaa8fc082b682b6 WHIRLPOOL 24652c0430bf6e2f85d624b0e4843e3fde2841d5b0e9d0e1957725aef3e92b28eee1ad35bdad2466a86775d5c53a70b1399f2768d94552e2a9f5e8cf2d1d854d
+EBUILD libdnet-1.11-r2.ebuild 1119 SHA256 745cac605358ab4d9b4d05296faa760ff5fafef7c66c8617d7989c4928cd20af SHA512 831801988ab9f600a7da971b8b81917a609ca06e9b4aae2da17fa13a90c49c1b6a80651808f569eeeeefdd4b8cd2d8d07486eb88bea087f108100bd0db96ace7 WHIRLPOOL 734039d98f7344e561f78cec697ecdc82b9a2b57520ae7fce33e2a9f958b4f69e360245265ccfdd80bdc3096730cbfe2ebc68e73fb8b97917bde5c0c7a0e2d89
+EBUILD libdnet-1.12.ebuild 1323 SHA256 ed6e96d3500cfdf565a58d54acb7a36ea4de1196f62da196738e5eca6164d3b7 SHA512 4605f1fbbb267c5a7f489c8afb5116c920a69cee8a173dfdb58f320d1b2d0b88ab3ca4e63a815c44a79bd60d9f34abd88873c5e9eac631f57f93247d6c294475 WHIRLPOOL 3f3aa122775f9e96387b392714de321e428dcbd39c29905309fefdeedcd9fa59800ab8b0632649eb5f1e610525205394a7c0bf6be14df722f29c6efc2191068b
+MISC ChangeLog 7417 SHA256 5a4f5d735d02029f297e4e517a6d736d66617f03d68df2a5e82d8da300ed5ea1 SHA512 af627dea056ccf3b91479bf090cf24bb41f72c2298e42f6b5fa2ec66df1de328dbf52a75758b2688a1fc2ff8c638a66f55511ad0e4cf79233ab5b8017778c85e WHIRLPOOL d479e64228c799f982bd746fceb152c288ef4efcca1906fe06d5cc963f8191e6dd4e02c49a856263e960afbfdbe89e9f2a45b8b70fe556e387c7275c968bd128
MISC metadata.xml 237 SHA256 05e77ed344cc3ff71619b1dc09df8abb07213392924b6ab640f6d20a84961a17 SHA512 8e9bdc99baef7851f946ac9e32b2dce194405cb153cefe844ddeb2bf67b42186614a8feae9f430b6abff82c3827f89a8fd7e38859550b6844439ad8cc97b57ab WHIRLPOOL 0cc42ae3a1cf54489a57a3e83eea78b4faf26d3ba7027425485e68a330bbe07eac541ff5e2eca9511b47287b1c9a5767a58713bca52c81c7972430e7425e4857
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlB1u6UACgkQVWmRsqeSphM8sQCffg44ZYjYVDZxCsJNN9O1+Qox
-KEcAn0JXnyceperswp9lRoyms1WINAba
-=QkYE
+iEYEAREIAAYFAlGjSHQACgkQVWmRsqeSphPYMgCfRiNJWjlvSGsIN1X1EtNyKHPb
+FkkAn3lC6eN64JUBgS2FaiDOKtELB65A
+=UgBi
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libdnet/libdnet-1.11-r2.ebuild b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
index ffee0b37055c..3ff9a8e4fded 100644
--- a/dev-libs/libdnet/libdnet-1.11-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.10 2012/07/08 17:29:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.11 2013/05/27 11:50:10 jer Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
@@ -26,7 +26,8 @@ pkg_setup() {
}
src_prepare() {
- sed -i 's/suite_free(s);//' test/check/*.c || die "sed failed"
+ sed -i -e 's/suite_free(s);//' test/check/*.c || die
+ sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in || die
epatch "${FILESDIR}"/${PN}-1.10-gcc4.diff
AT_M4DIR="config"
eautoreconf
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index d24dac81f3cc..fc4ddf4d1730 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -1,15 +1,16 @@
-# 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/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.3 2012/10/10 18:17:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.4 2013/05/27 11:50:10 jer Exp $
-EAPI=4
+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 )
-inherit autotools-utils eutils python
+inherit autotools-utils eutils python-r1
DESCRIPTION="simplified, portable interface to several low-level networking routines"
HOMEPAGE="http://code.google.com/p/libdnet/"
@@ -37,7 +38,10 @@ src_prepare() {
# Useless copy
rm -r trunk/ || die
- sed -i -e 's/libcheck.a/libcheck.so/g' configure.in || die "sed failed"
+ sed -i \
+ -e 's/libcheck.a/libcheck.so/g' \
+ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+ configure.in || die
use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
autotools-utils_src_prepare
}