summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-11-22 19:02:26 +0000
committerJeroen Roovers <jer@gentoo.org>2011-11-22 19:02:26 +0000
commit4d1d6606b9dc2ec8d6358fac9aca3f88e7ba463e (patch)
treefae5cae6cd92692c8865e94e317844c2659ca1d5 /net-libs/libpcap
parentMove remind to app-misc/ (diff)
downloadhistorical-4d1d6606b9dc2ec8d6358fac9aca3f88e7ba463e.tar.gz
historical-4d1d6606b9dc2ec8d6358fac9aca3f88e7ba463e.tar.bz2
historical-4d1d6606b9dc2ec8d6358fac9aca3f88e7ba463e.zip
Add IUSE=static-libs thanks to Piotr Karbowski (bug #391375).
Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libpcap')
-rw-r--r--net-libs/libpcap/ChangeLog5
-rw-r--r--net-libs/libpcap/Manifest10
-rw-r--r--net-libs/libpcap/libpcap-1.1.1-r1.ebuild8
3 files changed, 14 insertions, 9 deletions
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index cb05d0875bf0..3ec4775f598d 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/libpcap
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.151 2011/10/28 17:00:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.152 2011/11/22 19:02:26 jer Exp $
+
+ 22 Nov 2011; Jeroen Roovers <jer@gentoo.org> libpcap-1.1.1-r1.ebuild:
+ Add IUSE=static-libs thanks to Piotr Karbowski (bug #391375).
28 Oct 2011; Jeroen Roovers <jer@gentoo.org> libpcap-1.1.1.ebuild:
Fix libnl dependency (bug #342461).
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 49100d963377..7458c83a9086 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -5,14 +5,14 @@ AUX libpcap-1.1-cross-linux.patch 1050 RMD160 ca856c3f295752de47f3d813c324720960
AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 RMD160 ddbd33d8aa610d9f3653bfaa9bad5c29ae3097ca SHA1 40532cee84b5838c57468e02056b42e2a1721e5a SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c
AUX libpcap-1.1.1-libidn2.patch 8526 RMD160 03e1a6f455d61556a5d4c1b2ea0afe8744548dee SHA1 b74a071d6c032ebabd801c90225daaf03cbea37d SHA256 3ab0c44a84d11353a0d4445a459fbdb8700c2fdb86f6cef8468f619256a63432
DIST libpcap-1.1.1.tar.gz 581984 RMD160 760159c594cc995c9e05c0cd8637a02a3b2725e2 SHA1 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85
-EBUILD libpcap-1.1.1-r1.ebuild 1504 RMD160 5c535470ff0d85cf264414f6a58d7e538761565a SHA1 722004f4ea7e698e2978921b47d9162028e13e02 SHA256 9d7fe7e36764a0ecb6d76d07b4028b3458159b31bc424e915ff3192c1951463d
+EBUILD libpcap-1.1.1-r1.ebuild 1547 RMD160 a4374d1e30810b5db5d61591708d34a142e4582b SHA1 7e60c5a996a5873a63bf1c8a9ec1a5451626c485 SHA256 8b6f2f26003b36f383bd30e667a7ad30ede2fa7c3377032612bbb44abfda1075
EBUILD libpcap-1.1.1.ebuild 1599 RMD160 08504e5a914345e82329af0fece2a406347360fa SHA1 989100de9cbe05bff48f1f0e46343f7f6491a314 SHA256 a416ceb0e4429e7ef2363618bc1e383cff88503e7afc9636641688b023871fb7
-MISC ChangeLog 20739 RMD160 bfad8a5f950153cf820a6480e60a62e9144ee9c7 SHA1 f34315aff4c0ba51f2e6e7410a3dc21fa4090f39 SHA256 a14e0fe9273a5396e700c3491f0841c53c799e79e694ad18fc1f15650551d80c
+MISC ChangeLog 20876 RMD160 cc2742112d07b6114d8a1622d923d550ac928be2 SHA1 12228e86c9de305e70033c6f74cf138bcaceae03 SHA256 ccc88569d9048fcdff84424d40903a75a042845afdf472a19d08c0a944a921df
MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk6q37IACgkQVWmRsqeSphOrbgCggIKD1io+CiKvjECTY1kHxLlK
-pFkAniO7ai5jqD5O8HLv1zpqIM7vLJ77
-=hy91
+iEYEARECAAYFAk7L8c0ACgkQVWmRsqeSphPRJACfWBQb4WGsdVrg6zLLuxk+zDgT
+/6QAnRqfLeBNguvApoobhUExKUERD7qZ
+=SlLX
-----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
index 35146a25a351..5c90f2cf484e 100644
--- a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.5 2011/09/10 08:26:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.6 2011/11/22 19:02:26 jer Exp $
EAPI=4
inherit autotools eutils multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 libnl"
+IUSE="bluetooth ipv6 libnl static-libs"
RDEPEND="bluetooth? ( net-wireless/bluez )
libnl? ( dev-libs/libnl )"
@@ -47,7 +47,9 @@ src_install() {
default
# remove static libraries (--disable-static does not work)
- find "${ED}" -name '*.a' -exec rm -f {} +
+ 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