Old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 9 insertions, 175 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index ca0454ca554d..230faa56a341 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.234 2015/07/24 10:22:16 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.235 2015/07/25 04:46:49 jer Exp $
+
+  25 Jul 2015; Jeroen Roovers <jer@gentoo.org> -libpcap-1.5.3.ebuild,
+  -libpcap-1.6.2-r1.ebuild, -files/libpcap-1.6.2-dbus.patch:
+  Old.
 
   24 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> libpcap-1.7.4.ebuild:
   ia64 stable wrt bug #553758
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 31ef7ae26716..520bf39f965d 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,24 +4,17 @@ Hash: SHA256
 AUX libpcap-1.2.0-cross-linux.patch 555 SHA256 6e405b3ba8a5eb079b12bb529a16f645ceb6ae9421217798b5e61b6f05d40df5 SHA512 5ecdac2c7e872281ee402b89f5d4f2e70110bdf8208bc5b4546bcf754fe481895c7f3675682c7f4cff56c21ed4410a5f9ed9cb6bdb0e95c1f2385fe4e47d1cfe WHIRLPOOL 5003a8fbf954c4dce2297d47513ff5c0e1153e51be3b28d3e843317a9bfe51dfdcb03decad76a0b3a837a1d98e037bf3d27ed7e5dadc6341b3e13342e8013261
 AUX libpcap-1.6.1-configure.patch 395 SHA256 dd61d36cfc89bd5c5f67f4b91cde2063f874de8e1456f5e8f426d3faa4109916 SHA512 e9a4ddf9d4102b1b6e450a7a5c9c1e00ea08edfa2d04772d877a209e2292dae14531b51b2c25a80b6bd2a00a76bcfa4d7e4672b399a2c9b7f1f5ff931da70ee6 WHIRLPOOL f6370b1e55411ad906c152fc03201dcccc57b1568efb25d58439956980ccba4fb4f4b8a4fcbe6188782970a81ea790bd71b8855ae3c95b3333a63848271529e8
 AUX libpcap-1.6.1-prefix-solaris.patch 807 SHA256 c5bd1a5e0945e6ad06c4455045cf50f251ba6d2ba0386c6bdb20f809c5afffcd SHA512 af76d741784d123d7c2534c85018a102736889f0456420c5ae4b53b6568ec3054de30c4ce755ff6f9ae83abefd2275b379794e5a7cac65ef483ca676bf8883b3 WHIRLPOOL 1049da0979b52c71d783e5979e4b3ea0776f609725c1c288a6c75e8afe102db85f58af1d3f31249c7938d818e68bb569ef18f2c54dcb121b87fbe3c00a089cc3
-AUX libpcap-1.6.2-dbus.patch 418 SHA256 115b2ebdfa9b58cda56a8f88c0736258eaa1a8367e57aa5b63173076227fa8b2 SHA512 59626b7ffbb1914feec8950fb6a5694cf8fc9833e07319f95e6608312aa04fca6a519a5b88d1ae365c14aeef188794271995d2e5b4d5bbaea733e81f3b8b8950 WHIRLPOOL 08c496bda4b01b5f3c7fcdd354d0cab0658940f9631a4af4b54a3630270cdc114c4a0eeb3dcda9c6ffcdcac758362ee6a0b93af0888d26ed8f20d6f9edd7bd61
 AUX libpcap-1.7.2-libnl.patch 688 SHA256 62d6202ed5c9f4ce1ff1ffb693b847999e216ffb1ea3317c1945106d420da1a1 SHA512 7860a2c02faf79b71b2804f9c14b5f9d4eb341e6c94d86835ea40eaaa83beebee643c362644aacd3b414d7cbd0bd3bdfab96cc721135e9c0a02acfaa2d138114 WHIRLPOOL 0911a148f7a76c0539499d1d626cca656f957d1cd3fa484b1c353e26d4697be56f97e50932245daad28142f4b4aa1ce0568f4448267b8efed82a789a6a50a034
 AUX mgmt.h 1066 SHA256 fda9bf6721c986db93a084049c796b8de4f6a9ac7a21406bf22c68ebb9427729 SHA512 071ed2d22ed122e060be4c7dfcfbc6d8b019f47900560a40128c0af18bd7d45c16b7043681c000ccbfd681295a0811d68b18b675deb7f63fe4a2035bee4309eb WHIRLPOOL eb70d761b195326c29f6475f8312f16d019f69f2a213d4f9ab9fde306a18d77f88834fbd57d958fc3460a047487f67c79b71632f0a123b8e24a16b0a75d106b4
-DIST libpcap-1.5.3.tar.gz 642352 SHA256 9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93 SHA512 ee487b81ef3c8cd9e0173a252f620bdf2ebfde87bd7a95b38ea4658b47982d09ca86502d4a3473ffeb4388fb19e33d1f614236e22b420077b7ab40d3481f18a3 WHIRLPOOL 3d71f4c5134b2a0eba4d5e47952ddfad784bcde37332a926b68a799226f7fadd45e0e7fc2c12ede3724e89c2470f18ed35768dc12445950116e3b745b867020b
-DIST libpcap-1.6.2.tar.gz 651237 SHA256 5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690 SHA512 e84fc2192b3ca34df679db6405205aff110d46bc7499b50f6da0c6f4c00381b403a03b632edc33d9314e3b2a17ba7fb876a6e391a2f06b3bd759372d62de485d WHIRLPOOL 4395bd80b02f53d80c4069df0eaa8abbb821b0454f522b468991093269c074a95d2dff360c77db6c9639d5c6558c575b5f7fa571af04e4b0f4f77cf65271e9c2
 DIST libpcap-1.7.4.tar.gz 663021 SHA256 7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0 SHA512 83c55aa4173a90e8080a63dc6f0faeb4339d5def998abb9a578f08210c1784a1787ac6975f8bd27b02f8854dd18f03a23c1cd5fa611f46247090b2cc13943cf9 WHIRLPOOL b74cb9f55fd58f4521b0c074ae71448af8bc9e3d66577b6631b5ee59e27cca40f38519b9f2ab097755bd5a86a298bb3edb6d37aad9d0530060eb7ec9dc6221a8
-EBUILD libpcap-1.5.3.ebuild 1911 SHA256 9390a217529863e1066a9d861bf03b1f69a9e0b6cfbcace9d04c481087247a2a SHA512 5128112a46f6dcd284ba44c0a22686e0bab3d73603cc1edaa3b3073bed6045ef0cc602c7f95336d5c558741c18235f776d4cf7c7ffc033cceede719c0ac0ded1 WHIRLPOOL ff7a767a24d85e7e97af522e3ba651739b1c75cba7090cba07d968f76d3ffc499a236f38c2195a02f88e4a875574da555dae0fb7f7943efdbb34348445161e2b
-EBUILD libpcap-1.6.2-r1.ebuild 2022 SHA256 48af26dd572f4b802dd6799b96e76ad10fbac73aa25f48a11b63bbc206d2e576 SHA512 1fafd216e3947f394aeb4881c2291f3155d9f63c7cb9b795433d401e75ee7d18d349e011d36b22c86c44bac874c99057ed1b37bd639595b202d6f484733bd4c4 WHIRLPOOL 00d6c197f4a3de27678f01800403cad59f31bef4073e5cc2cd7eeb464d4eb1e7d1a1504633d3f850b49eb5f12d70aec73cf4c76b355caf0ea73894920c71c269
 EBUILD libpcap-1.7.4.ebuild 2011 SHA256 45e9b5d24a63d07cd0d6226dfcecad564b095ca7b37c62e9ca94024dfc283d87 SHA512 5e8354ddd4728216cc085d186fa4d566e67768887dd944d63953fe2ceab45c36f46adc55ed1b2023dab3cb27a231bd26090d10493c6fb5c5c1a94247a9b6195e WHIRLPOOL e9fd70e573d9be6296f95e66d1f2df0edf5422ac43ecae3c62ff9760071f0478aedee8015dafa062ff20d6033275d301ac5e2776f71e39b44b387cf5f5ec25c1
 EBUILD libpcap-9999.ebuild 1788 SHA256 4b41389e43f204341e6a272fa743346732be025c2ba1ec928bd27f1b08979d6a SHA512 cef4f243443f1e9f378a46e3bf3562cd08de40952be4b302a575c3ae3ef7b4bf1bbeeb7dd8c0671d7df1734de760b548a559e5871c86aae2b263a28346900ad8 WHIRLPOOL 2e5550420f6879ee0001e11818c98c44a9eb2ad23b85dfe797c6f574515e7bb47d8d1ea4000e0817cc9648a8e2c65040e4db6a163fbec78899ad9ff1ac71c228
-MISC ChangeLog 31887 SHA256 1886d47186473c9c1031e3598699245c9be0de7825fc456297b8c7cccde3437b SHA512 3f7e97d7f990b332ee9c25cfb6091ad578a2aec6e92c9b83c8ef3c60e23686174f179910426f5726da821c63dfcd1e9031ab2f5c85b629720e887c886e6ecd09 WHIRLPOOL 337b7f0cce8535d2c819c58cd8bc67044407f6d339ec2b3d5833f679c8a0b11f88763a8deb0be380650dbbb0e1eac5c4d962630d3546400771cf61ed6e48f7d1
+MISC ChangeLog 32022 SHA256 b7affb0f789fbe92006ca22c34ac9fed5f67fc1d40ec0f745d089324bd1f7eb4 SHA512 3686e8efdf726af0ec9e73a2c4ee97bc0438e13e00e442f05c8e713a15529998098e6267aa746355a098dd7b7b31991765e759656e809e053adec02f0c44b711 WHIRLPOOL e6f26f68d0919d144784ad125022df6b14e3c5d22db52a7a168b66aba6739976a1ff023b7cce09b1d3a23f548bafc44ffe53b77941699126440ae87c6e9ce307
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWyEU4ACgkQG9wOWsQutdbgXgP+JlC9DkEkvyGFOE6SpQJQsi7X
-68H5EpKkOkoEx3yXFEAPqDB7VW0BIzzbgogvetBOfkCpArr3oW68iAbiL/rhEAR0
-Pk8/ZHgrzd4QxZb8pTVcgQAhscGIIFzxXP9V/2X1S1ZXgNx9wXuxabPI+lwwVZtS
-ZsMOCeI2kzXsBWNVbSs=
-=1WKL
+iEYEAREIAAYFAlWzFLoACgkQVWmRsqeSphNvkwCdEYJpidguGWX/HwZ6UXNyqM/h
+YZUAn2VqXoNCRayOfZIfQ7fLrRyRN5C0
+=QJ35
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch b/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch
deleted file mode 100644
index 4855e6e78ffd..000000000000
--- a/net-libs/libpcap/files/libpcap-1.6.2-dbus.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1633,16 +1633,6 @@
- 			#
- 			AC_MSG_ERROR([Due to freedesktop.org bug 74029, D-Bus capture support is not available on OS X])
- 			;;
--		esac
--	else		
--		case "$host_os" in
--
--		darwin*)
--			#
--			# https://bugs.freedesktop.org/show_bug.cgi?id=74029
--			#
--			;;
--
- 		*)
- 			AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config], [no])
- 			if test "x$PKGCONFIG" != "xno"; then
diff --git a/net-libs/libpcap/libpcap-1.5.3.ebuild b/net-libs/libpcap/libpcap-1.5.3.ebuild
deleted file mode 100644
index 7c5f339c432e..000000000000
--- a/net-libs/libpcap/libpcap-1.5.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.5.3.ebuild,v 1.11 2014/09/17 08:48:58 ago 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez )
-	dbus? ( sys-apps/dbus )
-	netlink? ( dev-libs/libnl:3 )
-	canusb? ( virtual/libusb )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
-
-	# Prefix' Solaris uses GNU ld
-	sed -e 's/freebsd\*/freebsd*|solaris*/' \
-		-e 's/sparc64\*/sparc64*|sparcv9*/'  \
-		-i aclocal.m4 || die
-	# Prefix' Darwin systems are single arch, hijack Darwin7 case which
-	# assumes this setup
-	sed -e 's/darwin\[0-7\]\./darwin*/' \
-		-i configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable ipv6) \
-		$(use_enable canusb) \
-		$(use_enable dbus) \
-		$(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
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.6.2-r1.ebuild b/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
deleted file mode 100644
index 4f237407a526..000000000000
--- a/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.6.2-r1.ebuild,v 1.11 2015/06/28 13:12:59 zlogene Exp $
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	canusb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
-	epatch "${FILESDIR}"/${PN}-1.6.1-configure.patch
-	epatch "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	epatch "${FILESDIR}"/${PN}-1.6.2-dbus.patch
-
-	mkdir bluetooth || die
-	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable ipv6) \
-		$(use_enable canusb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl)
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}