Version bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 10 insertions, 64 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 485f85ed8ad1..18f16e0639df 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.136 2010/04/04 07:30:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.137 2010/04/08 05:53:18 pva Exp $
+
+*libpcap-1.1.1 (08 Apr 2010)
+
+  08 Apr 2010; Peter Volkov <pva@gentoo.org>
+  -libpcap-1.0.1_pre20090708.ebuild, -libpcap-1.1.0-r1.ebuild,
+  +libpcap-1.1.1.ebuild:
+  Version bump.
 
 *libpcap-1.1.0-r1 (04 Apr 2010)
 
diff --git a/net-libs/libpcap/libpcap-1.0.1_pre20090708.ebuild b/net-libs/libpcap/libpcap-1.0.1_pre20090708.ebuild
deleted file mode 100644
index 2c49d4e03ec5..000000000000
--- a/net-libs/libpcap/libpcap-1.0.1_pre20090708.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090708.ebuild,v 1.2 2009/07/22 19:22:52 klausman Exp $
-
-EAPI=2
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="http://www.tcpdump.org/"
-MY_P=${PN}-${PV/_pre/-}
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-#	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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bluetooth ipv6 libnl"
-
-RDEPEND="!virtual/libpcap
-	bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
-	libnl? ( dev-libs/libnl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-PROVIDE="virtual/libpcap"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.0-cross-linux.patch"
-	epatch "${FILESDIR}/libpcap-1.0.1_pre20090708-libnl-automagic.patch"
-	echo ${PV} > VERSION # Avoid CVS in version
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable ipv6) \
-		$(use_with libnl) \
-		$(use_enable bluetooth)
-}
-
-src_compile() {
-	emake all shared || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-shared || die "emake install failed"
-
-	dosym libpcap.so.${PV} /usr/$(get_libdir)/libpcap.so.1
-	dosym libpcap.so.${PV} /usr/$(get_libdir)/libpcap.so
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h || die "failed to install pcap-int.h"
-	fi
-
-	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die
-}
diff --git a/net-libs/libpcap/libpcap-1.1.0-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1.ebuild
index 446c7afcdcff..8f9d91113b56 100644
--- a/net-libs/libpcap/libpcap-1.1.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.0-r1.ebuild,v 1.1 2010/04/04 07:30:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1.ebuild,v 1.1 2010/04/08 05:53:18 pva Exp $
 
 EAPI=2
-inherit autotools versionator eutils multilib toolchain-funcs
+inherit autotools eutils multilib toolchain-funcs
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -23,8 +23,6 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/libpcap"
 
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.1-cross-linux.patch"
 	eautoreconf