With RESTRICT=test it is useful to know about the dependency, but it need not be set. Remove useless trunk/ subdir.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 16 insertions, 49 deletions

diff --git a/dev-libs/libdnet/ChangeLog b/dev-libs/libdnet/ChangeLog
index 927039513f7d..d1d6e97b79ae 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.58 2012/10/10 16:50:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.59 2012/10/10 18:17:08 jer Exp $
+
+  10 Oct 2012; Jeroen Roovers <jer@gentoo.org> -libdnet-1.11-r1.ebuild,
+  libdnet-1.12.ebuild:
+  With RESTRICT=test it is useful to know about the dependency, but it need not
+  be set. Remove useless trunk/ subdir.
 
   10 Oct 2012; Jeroen Roovers <jer@gentoo.org> libdnet-1.12.ebuild:
   Readd keywords (bug #437800).
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 1438b552ab63..147f9370a671 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -5,15 +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-r1.ebuild 996 SHA256 7efcfb4685cc294bbcc8a546df8ca69adff748660633aa2a2f5aaf7e37420a3f SHA512 963f2173fed2ff2ad89d712f4a5fe783eeb9844d3ae8c500cfa2002c75726936b40a6fa20beae13ce2656285bb24b4d22ca994ec80f64a6e39485de6b831ef70 WHIRLPOOL 0a0a6eb104269fe4d29cc77f34a9bbcbb3fafb30d9a23650e684a185e41ce5d827ebab3a5e06d3a78479fe2734c3d074b473272551fe279b9541724174c3b03f
 EBUILD libdnet-1.11-r2.ebuild 1061 SHA256 4b2a6df0827f9d56072309ff70f7c9563d179b7085ce6f9fa2497680ae3d5134 SHA512 36b077d07a1ea8e793652873e68e7b2d7f6c515ca709f2abd526398a61e17910a60fb259ba71b00892d1e153045fcc1ecbc55b01431ee33f445c050ff02fc749 WHIRLPOOL 8f32e6ad8a1f45b4a1d8c8c9a8d43a92d8b4889b93c0a51b23eae1c597f86bd7909aea6103db986f4eead06c319364307d50d1851b01b6d842de2f9dcbf8646a
-EBUILD libdnet-1.12.ebuild 1202 SHA256 154748773e6f1fd87052cb3412953113effa1e418ee4d40868cc317dd5b8c331 SHA512 3b7c400ef9aac13fc93f75735c8bae775f7a6d97566f6c288cc49e48973f823b7c6b34624b3077c29c557a8020b0426ed655b2ce65c98e000eba4b46a8f18a2c WHIRLPOOL 9727b1770a6af7dbf3d5a458b4778ab11e67414a03f92c391a1b4f0fe50d255014f8b9c74833b0375af8d99230786a5ed1635e592f1876b4576d40f6f066e772
-MISC ChangeLog 7012 SHA256 f0cef829c1b5d49f69333fa35f9345c97a991da836a9db2b208b03ca24cc037a SHA512 3b63d82ec9bd950cd5f953702f9941a73c9d8249d0dbe0d3a5dbceca3a183d083cd517f12199155484551b5fcd190b61b2e61318e481e00ccd3aa9324426f0bc WHIRLPOOL 583563f70c9063004a32af37212405e41dec9a6c08ec3c517dd210e1f807d3fe9ad35da05cb9eba176806c08ce4dad6440e61ebb27c3f5be7d6abaef9a94b446
+EBUILD libdnet-1.12.ebuild 1229 SHA256 f3feaefaf0934687168bb7fb6bd8ff0125129654fea7bc6ea9824f4799e8e652 SHA512 864940e1f79e16d3a1fdae014ce097d4c20ab5c88b4f53b8a127ee47698e3cf038edf3160332e7ee70ce69319e59ef08d216acbba560559ac19df82a3a14d9a2 WHIRLPOOL 2bfd295c5e678a8f230ba257d2f56a7ec498a8f692121f0143ee792d48abdea9d0e3ec368f31153858f01315e8153a54830a6d36c696e16212e466720dad756b
+MISC ChangeLog 7228 SHA256 4ea65c703b70ea13c8fa6ffd046059513aa7962354b85e594d8b0eddc54ccdce SHA512 e614094189d3219ba0635a8b5da2c6fd5f5483f47847df7f58de0cd92a5663899945f8d4a7dcbd3e9e3c44f2f9059fcd0d676e247809c2c9cbaa8fc082b682b6 WHIRLPOOL 24652c0430bf6e2f85d624b0e4843e3fde2841d5b0e9d0e1957725aef3e92b28eee1ad35bdad2466a86775d5c53a70b1399f2768d94552e2a9f5e8cf2d1d854d
 MISC metadata.xml 237 SHA256 05e77ed344cc3ff71619b1dc09df8abb07213392924b6ab640f6d20a84961a17 SHA512 8e9bdc99baef7851f946ac9e32b2dce194405cb153cefe844ddeb2bf67b42186614a8feae9f430b6abff82c3827f89a8fd7e38859550b6844439ad8cc97b57ab WHIRLPOOL 0cc42ae3a1cf54489a57a3e83eea78b4faf26d3ba7027425485e68a330bbe07eac541ff5e2eca9511b47287b1c9a5767a58713bca52c81c7972430e7425e4857
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB1pz4ACgkQVWmRsqeSphNRzgCfdoMxIqY9ngGCmu+fuXsouO2p
-qpMAn27S8BJ/iFiJUaeXJ+xOLXK5dcKl
-=RxK+
+iEYEAREIAAYFAlB1u6UACgkQVWmRsqeSphM8sQCffg44ZYjYVDZxCsJNN9O1+Qox
+KEcAn0JXnyceperswp9lRoyms1WINAba
+=QkYE
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdnet/libdnet-1.11-r1.ebuild b/dev-libs/libdnet/libdnet-1.11-r1.ebuild
deleted file mode 100644
index 662a55d94f2d..000000000000
--- a/dev-libs/libdnet/libdnet-1.11-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r1.ebuild,v 1.11 2010/07/19 21:35:59 maekke Exp $
-
-#WANT_AUTOMAKE=1.6
-inherit eutils autotools
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="http://libdnet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libdnet/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's/suite_free(s);//' test/check/*.c || die "sed failed"
-	epatch "${FILESDIR}"/${PN}-1.10-gcc4.diff
-	AT_M4DIR="config"
-	eautoreconf
-}
-
-src_compile () {
-	econf $(use_with python) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	einfo "self test fails with permission problems"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README THANKS TODO
-}
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index 98d7ccd6c118..d24dac81f3cc 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2 2012/10/10 16:50:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.3 2012/10/10 18:17:08 jer Exp $
 
 EAPI=4
 
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 python static-libs test"
 
-DEPEND="test? ( dev-libs/check )"
-RDEPEND=""
-
+#DEPEND="test? ( dev-libs/check )"
 RESTRICT="test"
 
 DOCS=( README THANKS TODO )
@@ -36,6 +34,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Useless copy
+	rm -r trunk/ || die
+
 	sed -i -e 's/libcheck.a/libcheck.so/g' configure.in || die "sed failed"
 	use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
 	autotools-utils_src_prepare