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

(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)

3 files changed, 11 insertions, 43 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/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