summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-10-28 17:00:28 +0000
committerJeroen Roovers <jer@gentoo.org>2011-10-28 17:00:28 +0000
commitfe9546b4ac94c2cf0c746cac4ec4cccc7ff526de (patch)
tree092048d98a1244b39dd3f22bdec6691dc8b4d513
parentmask misc packages (diff)
downloadhistorical-fe9546b4ac94c2cf0c746cac4ec4cccc7ff526de.tar.gz
historical-fe9546b4ac94c2cf0c746cac4ec4cccc7ff526de.tar.bz2
historical-fe9546b4ac94c2cf0c746cac4ec4cccc7ff526de.zip
Fix libnl dependency (bug #342461). Fix ChangeLog entry.
Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64
-rw-r--r--net-libs/libpcap/ChangeLog8
-rw-r--r--net-libs/libpcap/Manifest12
-rw-r--r--net-libs/libpcap/libpcap-1.1.1.ebuild4
3 files changed, 13 insertions, 11 deletions
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 9ba5b62e7f24..cb05d0875bf0 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,9 +1,11 @@
# 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.150 2011/09/12 08:12:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.151 2011/10/28 17:00:28 jer Exp $
- 12 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libpcap-1.1.1-r1.ebuild,
- libpcap-1.1.1-r1.ebuild:
+ 28 Oct 2011; Jeroen Roovers <jer@gentoo.org> libpcap-1.1.1.ebuild:
+ Fix libnl dependency (bug #342461).
+
+ 12 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libpcap-1.1.1-r1.ebuild:
Move to eapi4, remove static libs, fix building with >libnl-2. Closes bug
#343621. Remove older overshadowed versions.
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index af3501efbf97..49100d963377 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -6,13 +6,13 @@ AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 RMD160 ddbd33d8aa610d9f3653bfaa9bad5c
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.ebuild 1598 RMD160 f327dbf79b132e967b4e1e14c8c25c77d9752af0 SHA1 ff1b944437d9626e2b63f59e299b7b7d38e3a83e SHA256 6b1f7a4d1b35e12d952a0e5e996bfb37ea1a7b71e81a4c2f3f92e297103e43a0
-MISC ChangeLog 20664 RMD160 1ea09234f65664376714bff87e7c83a08889c885 SHA1 0a92d8d6b8346679cda6151dc3a709885c159d2f SHA256 f4c3e99ded418716193ceacddf6a8bdcb4b392087f061862e44ce82be6577044
+EBUILD libpcap-1.1.1.ebuild 1599 RMD160 08504e5a914345e82329af0fece2a406347360fa SHA1 989100de9cbe05bff48f1f0e46343f7f6491a314 SHA256 a416ceb0e4429e7ef2363618bc1e383cff88503e7afc9636641688b023871fb7
+MISC ChangeLog 20739 RMD160 bfad8a5f950153cf820a6480e60a62e9144ee9c7 SHA1 f34315aff4c0ba51f2e6e7410a3dc21fa4090f39 SHA256 a14e0fe9273a5396e700c3491f0841c53c799e79e694ad18fc1f15650551d80c
MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5tvwIACgkQHB6c3gNBRYfewACdE6A/+b/G7l9H10pulFtSLCb4
-Zp8AoJSjudspx+c2wozY8Xm/IOSw+85Q
-=g4Yc
+iEYEARECAAYFAk6q37IACgkQVWmRsqeSphOrbgCggIKD1io+CiKvjECTY1kHxLlK
+pFkAniO7ai5jqD5O8HLv1zpqIM7vLJ77
+=hy91
-----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/libpcap-1.1.1.ebuild b/net-libs/libpcap/libpcap-1.1.1.ebuild
index 80b6f05b0bc7..ceb5f28d28d4 100644
--- a/net-libs/libpcap/libpcap-1.1.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1.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.ebuild,v 1.12 2011/08/11 02:35:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1.ebuild,v 1.13 2011/10/28 17:00:28 jer Exp $
EAPI=2
inherit autotools eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-
IUSE="bluetooth ipv6 libnl"
RDEPEND="bluetooth? ( net-wireless/bluez )
- libnl? ( dev-libs/libnl )"
+ libnl? ( dev-libs/libnl:1.1 )"
DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc"