after further testing, that was a terrible idea

(Portage version: 2.1.11.31/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key DD11F94A)

3 files changed, 5 insertions, 85 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index b726815d7fda..46bc81a5eee6 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.179 2013/02/08 05:18:14 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.180 2013/02/08 06:11:56 zerochaos Exp $
+
+  08 Feb 2013; Rick Farina <zerochaos@gentoo.org>
+  -files/libpcap-1.3.0-libnl3.patch, -libpcap-1.3.0-r2.ebuild:
+  after further testing, that was a terrible idea
 
 *libpcap-1.3.0-r2 (08 Feb 2013)
 
diff --git a/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch b/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch
deleted file mode 100644
index 63b73d60c908..000000000000
--- a/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libpcap-1.3.0-orig/configure.in libpcap-1.3.0/configure.in
---- libpcap-1.3.0-orig/configure.in	2013-02-08 00:11:41.888270763 -0500
-+++ libpcap-1.3.0/configure.in	2013-02-08 00:13:04.664272980 -0500
-@@ -449,14 +449,14 @@
- 		],
- 		[
- 			#
--			# No, we don't; do we have libnl 1.x?
-+			# No, we don't; do we have libnl 1.x? (hijacked, linking 3.x no matter what)
- 			#
- 			AC_CHECK_LIB(nl, nl_handle_alloc,
- 			[
- 				#
- 				# Yes.
- 				#
--				LIBS="-lnl $LIBS"
-+				LIBS="-lnl-genl-3 -lnl-3 $LIBS"
- 				AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			],
- 			[
diff --git a/net-libs/libpcap/libpcap-1.3.0-r2.ebuild b/net-libs/libpcap/libpcap-1.3.0-r2.ebuild
deleted file mode 100644
index 4af6bc6c4f3f..000000000000
--- a/net-libs/libpcap/libpcap-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.3.0-r2.ebuild,v 1.1 2013/02/08 05:18:14 zerochaos Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 netlink static-libs canusb"
-
-RDEPEND="bluetooth? ( net-wireless/bluez )
-	netlink? ( dev-libs/libnl:3 )
-	canusb? ( virtual/libusb )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.2.0-cross-linux.patch \
-		"${FILESDIR}"/${PN}-1.3.0-canusb.patch \
-		"${FILESDIR}"/${P}-fix-systems-without-ipv6-support.patch \
-		"${FILESDIR}"/${P}-libnl3.patch
-	# Prefix' Solaris uses GNU ld
-	sed -i -e 's/freebsd\*/freebsd*|solaris*/' \
-		-e 's/sparc64\*/sparc64*|sparcv9*/'  aclocal.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable ipv6) \
-		$(use_enable canusb) \
-		$(use_with netlink libnl)
-}
-
-src_compile() {
-	emake all shared
-}
-
-src_install() {
-	default
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}