Add multilib support (bug #524604 by Arfrever Frehtes Taifersar Arahesis).

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

3 files changed, 80 insertions, 5 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 2b1590803860..fe571e1312aa 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.209 2014/09/17 10:14:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.210 2014/10/07 09:18:26 jer Exp $
+
+*libpcap-1.6.2-r1 (07 Oct 2014)
+
+  07 Oct 2014; Jeroen Roovers <jer@gentoo.org> +libpcap-1.6.2-r1.ebuild:
+  Add multilib support (bug #524604 by Arfrever Frehtes Taifersar Arahesis).
 
   17 Sep 2014; Jeroen Roovers <jer@gentoo.org>
   files/libpcap-1.2.0-cross-linux.patch:
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 009f924138b8..f67f3eab8f80 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -8,13 +8,14 @@ AUX mgmt.h 1066 SHA256 fda9bf6721c986db93a084049c796b8de4f6a9ac7a21406bf22c68ebb
 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
 EBUILD libpcap-1.5.3.ebuild 1911 SHA256 9390a217529863e1066a9d861bf03b1f69a9e0b6cfbcace9d04c481087247a2a SHA512 5128112a46f6dcd284ba44c0a22686e0bab3d73603cc1edaa3b3073bed6045ef0cc602c7f95336d5c558741c18235f776d4cf7c7ffc033cceede719c0ac0ded1 WHIRLPOOL ff7a767a24d85e7e97af522e3ba651739b1c75cba7090cba07d968f76d3ffc499a236f38c2195a02f88e4a875574da555dae0fb7f7943efdbb34348445161e2b
+EBUILD libpcap-1.6.2-r1.ebuild 1983 SHA256 ef9dca9fbaa14dbc28b1f5ec4d3d2aed856e2a97882cf40610f795e29dd40853 SHA512 4dfe685b41bde4ef2c6c9464dfec04035ef0a6a7ac15e2ac51b8d84c01ed40710a93b5d78d19df605505982e810cf160b4fcad3d2e8264ce84696a77d1afba49 WHIRLPOOL 177a9dad1849e818e5c06fd61d8240abc57cfe2f6a027d494ddc838ac448d3fb2dd1f1302eb5b2e2c92636e7eb84d967d7e4b46c74ba3479e9ab6e1b8be946e6
 EBUILD libpcap-1.6.2.ebuild 1807 SHA256 093324633859936f02928a691bb6b71eb7ca975b38cfc32364ed33bb3d986dd3 SHA512 67fee3e9e5077dcd3dc29770b70299956d5a9b71d7f4b2565b511b88ab138e1504a8bbad88843dd14a51dd43d1817bf0a67d9c909cf00ca97b194344bef8eebc WHIRLPOOL c6b1a0521b9a4dcfe5bc944490fdcedddd3200bb7bf3a6af821dfac10b5cee1b8c08a9c8cff58fa88da07b178e0b387cfdf5332bcf550610e75603b6032fbce7
-MISC ChangeLog 28870 SHA256 40df2613a302a6b9d0838bffaa853154a18a3f773ea368c79f1eea48870f1c34 SHA512 0f64246922c88de897656a87dc77d07ca5a1f028047e341e57331f2127ce759dd5d85b2c49b18fdde17f3bbca294a4c1c91b05c8c50a9a9a4ed7c37c8cb3db36 WHIRLPOOL d3bb1399cc4b0bdc988133c8be368162a8ec443bccbc3233f63f7d83ac3175b7ddaa73548c5107fef8034d5ae908069906df71b8519e7927b16b7ae670eb5cff
+MISC ChangeLog 29054 SHA256 4f499c59d9c755ad7c3c90e03af0a3a487b2d50d501b095f422b80eaa1a4fae8 SHA512 506c78327e66d7087911adde27f93f0fce59f2671d02ffa0810340ca9c01535555222e60752a5e307da48b0fbabcafc81ecb26c8f7fa3ea1b1ea0c1cca6e1255 WHIRLPOOL 49bd3d695f2b970c9e36c3a39e3df4629b8fa840a731d4c39fa34fb6fb2b57e01ddf028b7aac4b372e07512023c5054d1425c88b577222cb961c473500f13356
 MISC metadata.xml 423 SHA256 d12419de9bd641cf78030dc7bdb2789c2c932f91ba9687a6073961eb8ff09e4f SHA512 61b591b21bd46a8ae6a20fde2d5cbe6f68250ce7616b11b55b3a270474fe1ac3b4aefcd3c98e9e6470a036ef3c685b3575464de81349137fdf7cd8082ea2d695 WHIRLPOOL a08d3ed4833b2725f68ad8fcca878047a6b7a36188462204dec1fe7f528b6ad4c8698bed8a87a03e52fe5ea7e30fd8464a881408c179e2d7ef085f511aad4475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQZXyIACgkQVWmRsqeSphPa+wCbB1UFvq8xowdvsSrE9ZRR2OKr
-E/AAn3iqbvQi7BR66hodLGxG/p3LLbi2
-=TIeY
+iEYEAREIAAYFAlQzr+MACgkQVWmRsqeSphO2yQCfXl+IN6254+8JjzKoK3q5B0DO
+7AcAmwUIIWOnpvAqN664pZYNh2daJ/Wp
+=0uow
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/libpcap-1.6.2-r1.ebuild b/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..b46321b68da3
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.6.2-r1.ebuild,v 1.1 2014/10/07 09:18:26 jer 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}] )
+"
+
+DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
+
+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
+
+	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() {
+	# 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
+}