Clean up patch. Add IUSE=static-libs. Possibly improve python related code by Ian Delaney (bugs #253267, #326389, #363601).

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

4 files changed, 59 insertions, 11 deletions

diff --git a/dev-libs/libdnet/ChangeLog b/dev-libs/libdnet/ChangeLog
index e379443c6403..0f91ce65563d 100644
--- a/dev-libs/libdnet/ChangeLog
+++ b/dev-libs/libdnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libdnet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.46 2010/07/19 21:35:59 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.47 2012/02/14 22:08:17 jer Exp $
+
+*libdnet-1.11-r2 (14 Feb 2012)
+
+  14 Feb 2012; Jeroen Roovers <jer@gentoo.org> files/libdnet-1.10-gcc4.diff,
+  +libdnet-1.11-r2.ebuild:
+  Clean up patch. Add IUSE=static-libs. Possibly improve python related code by
+  Ian Delaney (bugs #253267, #326389, #363601).
 
   19 Jul 2010; Markus Meier <maekke@gentoo.org> libdnet-1.11-r1.ebuild:
   add ~arm, bug #301080
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 05904e553e1c..e8ce3cc2ddd5 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libdnet-1.10-gcc4.diff 1074 RMD160 d3a23b8cf04a9000d39d8e4ad632af5b0084ae2b SHA1 de66e6d38863f0dd9bf67737513ead83bb951331 SHA256 2341efc77f48f09f8c7fbfa37ded0ff93d366b4cd7d4d81795bdb6e470f04068
+AUX libdnet-1.10-gcc4.diff 866 RMD160 c1071251b2b50a7315e8fcbaeedcb820c2de17b3 SHA1 e249f5030a7fd0bebfff2afe90b4d58cc5f1d6a3 SHA256 42fb181305e4195ae8d5dd720a3553a58fba86a087a91ed355491b59e82698e0
 DIST libdnet-1.11.tar.gz 446233 RMD160 9a940cdd96af4b513a048f3a389e3f7eb0bb7011 SHA1 e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf SHA256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53
 EBUILD libdnet-1.11-r1.ebuild 996 RMD160 a1de3a54ed1bf07e6b03d7fcbdce1ab16ce30460 SHA1 8ab601f09349fa801a430d0c338d00c31ce0ed27 SHA256 7efcfb4685cc294bbcc8a546df8ca69adff748660633aa2a2f5aaf7e37420a3f
-MISC ChangeLog 5470 RMD160 2c8d6d2647c0f84046539c88f48f8e4c1df3b2a0 SHA1 ccc8ba091a557af918c05820824c6edb2a3003bb SHA256 a0d7afe6680716889182b08a2288b3d195b641612065bb91294bd79c8369f16a
+EBUILD libdnet-1.11-r2.ebuild 1009 RMD160 0f167ba38575ec29cf97d940c616a9a0a30bf34c SHA1 3e41400deab6fca6f2aa4e3cf607535770ea94b5 SHA256 bcb30af595719f5e77892ef7a54dadb3e5fa58dac0d84d98081fca9a93702b8d
+MISC ChangeLog 5732 RMD160 71d206c0efd493d0c8302193978f91f96a2f54be SHA1 5e58d8d09f03fdf141e60eace44584f1c3ebecce SHA256 9395beba1a7612343146051e424b742e5e9c6958622c78258ac76d8b3bf5ca1a
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkxExXIACgkQkKaRLQcq0GKv3QCfbDg16qWJO43/JOl9iFOeeABo
-/5MAmwfSnjkRG1uWDt7tAHAhdxj6SPET
-=dDt7
+iEYEARECAAYFAk8621cACgkQVWmRsqeSphNgJgCeL+iaPUzmFTeRyT67vIFs4c4y
+M5wAn2pSn1Zgr8B1ZoQs0YSvrupSoMl0
+=BSE+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff b/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff
index ead571274d92..20826d3ef17b 100644
--- a/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff
+++ b/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff
@@ -1,6 +1,5 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN libdnet-1.10.orig/python/dnet.c libdnet-1.10/python/dnet.c
---- libdnet-1.10.orig/python/dnet.c	2005-05-16 14:47:35.000000000 -0400
-+++ libdnet-1.10/python/dnet.c	2005-05-16 14:52:54.000000000 -0400
+--- a/python/dnet.c
++++ b/python/dnet.c
 @@ -2552,7 +2552,7 @@
    PyObject *__pyx_3 = 0;
    unsigned short __pyx_4;
diff --git a/dev-libs/libdnet/libdnet-1.11-r2.ebuild b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
new file mode 100644
index 000000000000..4667d373df81
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
@@ -0,0 +1,41 @@
+# 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.11-r2.ebuild,v 1.1 2012/02/14 22:08:17 jer Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit autotools eutils python
+
+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 static-libs"
+
+RESTRICT="test"
+DOCS=( README THANKS TODO )
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	sed -i 's/suite_free(s);//' test/check/*.c || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-1.10-gcc4.diff
+	AT_M4DIR="config"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with python) $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/*.la || die
+	fi
+}