summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-12 10:09:41 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-12 10:09:41 +0000
commitadf9d4e1f51e17960d1326200c159f49d9111307 (patch)
treee909cf1e9675214a2eefce7ffd4ce4c4683dc2c4 /net-libs/libpcap
parentpunt old (diff)
downloadhistorical-adf9d4e1f51e17960d1326200c159f49d9111307.tar.gz
historical-adf9d4e1f51e17960d1326200c159f49d9111307.tar.bz2
historical-adf9d4e1f51e17960d1326200c159f49d9111307.zip
List net-wireless/bluez first in ||( a b ) dependency w.r.t. bug 269519.
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libpcap')
-rw-r--r--net-libs/libpcap/ChangeLog6
-rw-r--r--net-libs/libpcap/Manifest4
-rw-r--r--net-libs/libpcap/libpcap-1.0.0-r1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index d9bf24218bcd..076bfaee763d 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libpcap
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.117 2009/03/01 10:22:30 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.118 2009/05/12 10:09:41 loki_val Exp $
+
+ 12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+ libpcap-1.0.0-r1.ebuild:
+ List net-wireless/bluez first in ( a b ) dependency w.r.t. bug 269519.
01 Mar 2009; Tiziano Müller <dev-zero@gentoo.org>
libpcap-1.0.0-r1.ebuild:
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 62e575e34b1d..532f1e0ba01c 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -14,7 +14,7 @@ AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579
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
EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
-EBUILD libpcap-1.0.0-r1.ebuild 1713 RMD160 b3aac4ed3a23ddfc66c8ce9b4bb00fa7a00be5c8 SHA1 b4438f0d9285be04504c6dc0efab9bcec2a19b18 SHA256 2cd606831b7abd022afa6b68a6bedbbdb407ab20593d106759789fb60d1e4996
+EBUILD libpcap-1.0.0-r1.ebuild 1713 RMD160 92070239b089b6edf4b2b9b07dd395478ac4eadb SHA1 8aa7bfec1c906bba048c892a97deac395a923faf SHA256 6b877f1d9a760fb1d796d8a9b242e541cae970b2e8d9700f409226702e0de901
EBUILD libpcap-1.0.0.ebuild 1848 RMD160 5157adebf36517e05378d9194039075e541497a4 SHA1 f186df5c489c0fb4c6258f98255ff943da61b2f1 SHA256 afc354237c91f1d67694c24ccaa589734b805c5c193699ed324eb6aa1408becb
-MISC ChangeLog 15177 RMD160 9ad1463869a139eefcc57c43a4bdb61f1ee90f56 SHA1 bc74a1d3c3d4de68ad530d8707b230fa11903a31 SHA256 775e10fef92f533a0de1127da76204e71144456ea60c92b0f924ff97dbd17669
+MISC ChangeLog 15331 RMD160 cf80be42bc06835da9acfa1c290f050a92d58771 SHA1 de765fa46af34b004a2ca30910e46d51bf54fbf1 SHA256 f7fb15d57f411314142dea2f8257314fb6cdeb6d6421ce2be9e658d0d9b369ef
MISC metadata.xml 261 RMD160 5bcf72e234ef387b24ffb9221623eaf927a41f02 SHA1 31a589dbbde4597dc3df248c57b5213889c67423 SHA256 92d6c306fe13ead877997b8ff3007ffa601a1e7c96ca3ec2208f88884a95c791
diff --git a/net-libs/libpcap/libpcap-1.0.0-r1.ebuild b/net-libs/libpcap/libpcap-1.0.0-r1.ebuild
index ee1d5fa62920..0c72d51224ad 100644
--- a/net-libs/libpcap/libpcap-1.0.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# 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.0-r1.ebuild,v 1.4 2009/03/01 10:22:30 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.0-r1.ebuild,v 1.5 2009/05/12 10:09:41 loki_val Exp $
inherit autotools eutils multilib toolchain-funcs
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
IUSE="ipv6 bluetooth"
RDEPEND="!virtual/libpcap
- bluetooth? ( || ( net-wireless/bluez-libs net-wireless/bluez ) )"
+ bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )"
DEPEND="${RDEPEND}
sys-devel/flex"
PROVIDE="virtual/libpcap"