Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 485f85ed8ad1ae644b93bfbb179e3ba0112bbc57..18f16e0639dfb7bf9e81053319057aa20a269fc2 100644 (file)
--- 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/Manifest b/net-libs/libpcap/Manifest
index 1a3b2ef2cd102ca64b586682e97aae07f14ef551..25f61ac89ba2ab1d26406612bf7fb99da3e1c07b 100644 (file)
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -18,13 +18,11 @@ AUX libpcap-1.1-cross-linux.patch 1050 RMD160 ca856c3f295752de47f3d813c324720960
 AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
 DIST libpcap-0.9.8.tar.gz 520526 RMD160 2f5ecbc9840d8bd646798c977b7a02abe191311e SHA1 11dfe67cfc1c279c7346d626a99ad4ba90621028 SHA256 c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
 DIST libpcap-1.0.0.tar.gz 524273 RMD160 20857fe6af5dc70fffb19da46e0fee908f55b3ea SHA1 9893654027ae11033d785045ff35583da43fe8fa SHA256 a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
-DIST libpcap-1.0.1-20090708.tar.gz 593985 RMD160 6c0deac196c6ec160ecbd8fa6a1f093242b79a55 SHA1 7e10c470ed6df3dce10c7ec5509378782bbf9f28 SHA256 babdd17040cf0cfc79b58121b758088639a37f84172c7a198f826dc0388ef3f7
 DIST libpcap-1.0.1-20090812.tar.gz 574616 RMD160 60cab9e2a00ec5124823958c65fc00ff760f9eb2 SHA1 f7c319e94a6504c60f2774ffae6afe6a31bbfdd4 SHA256 149d256b66f5cea5362858cdcac678f578e5d2e251b686ed8da09eb56dfaee6b
-DIST libpcap-1.1.0.tar.gz 581675 RMD160 46ded6e9ab2bc8fcdca7c2533fc928a127e53616 SHA1 386a83d34fbbcd25a4b41115603480ae3902470f SHA256 eb00b67e8c76cdf3d500cab044dc6374e93356b8f3fef1011b40d47d4ff0701c
+DIST libpcap-1.1.1.tar.gz 581984 RMD160 760159c594cc995c9e05c0cd8637a02a3b2725e2 SHA1 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
 EBUILD libpcap-1.0.0-r2.ebuild 1742 RMD160 c8cfe56d24f6ec5f36db1e5d7a78db07601067fc SHA1 8b5f1ff186e1c70d5c7fa3156bbadf71a6e5df1d SHA256 54d954551f24a905f5a1c7be53e9da380fe98f0757af51e1a7d1fd37d5e55de6
-EBUILD libpcap-1.0.1_pre20090708.ebuild 1803 RMD160 094bab78977034a4ed4b0d6e7c3fdb240fe64a59 SHA1 03aff6a3ddb8d1e95bcc88052a36eb14fe3ca970 SHA256 cf80f44afc13d3f19dacfbcd32ad45e4598c4b8a8f2f7359e650171c29c88969
 EBUILD libpcap-1.0.1_pre20090812.ebuild 1985 RMD160 674a3e2bc35b129633b9b9a926af6d0af174c48e SHA1 1912b6bfcba993ebf75ba329880539e3ede4021f SHA256 d05afaa7104e00abc5789e386ec1bf4c8c52ffaddb86c55391cbeb55633c6536
-EBUILD libpcap-1.1.0-r1.ebuild 1609 RMD160 5b9ba9a5cea5d18e9b97e6edb44d27a345ba7c74 SHA1 058070d12058bee17b853a46b5b02c6bd222d949 SHA256 6983e08ffc79b23153c0252b1269171091aae1bdaa5e9acdc8afd4ba667f2c7f
-MISC ChangeLog 18507 RMD160 54eab657d400aa10d916d147c9f9bab0ed09b491 SHA1 129057172d2b3b3d64c81f36dddbac0c6f62bc1d SHA256 f3dc15249317fe5ad12e3bf40086c27b29f230003810acb2d92f60e3d179c563
+EBUILD libpcap-1.1.1.ebuild 1539 RMD160 251ee8c4ad9fd5fc0ef0af0c9492707590177fec SHA1 6edf276a956d0067e2697d159748ae9244d54cb6 SHA256 cea4c563e2d50d180dbb7a4bca29926e950a61e3298d4f4190ac087e71da382d
+MISC ChangeLog 18687 RMD160 448c75743097ab2fb0547844db8a387e99c93177 SHA1 82600e4a3f516b8479f466256870400a95ac6c12 SHA256 78a6e8708e082871131e9d4061b5e2bdaa6228332ba649656d05cc5773b38043
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0

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 (file)
index 2c49d4e..0000000
--- 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
similarity index 89%
rename from net-libs/libpcap/libpcap-1.1.0-r1.ebuild
rename to net-libs/libpcap/libpcap-1.1.1.ebuild
index 446c7afcdcff4fdd4139b2d6a096e25276971502..8f9d91113b566e9de992cea871c4c42d03890715 100644 (file)
--- 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