Adding support for >=libnl-2.0

Package-Manager: portage-2.2.0_alpha54/cvs/Linux i686

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 270a8a999aa253188dc0b580bf34c502d5e4c174..f6278d86dc6ff3f5ab0fc297dbc5169e14c8456a 100644 (file)
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.112 2011/07/13 12:19:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.113 2011/09/09 22:56:50 gurligebis Exp $
+
+  09 Sep 2011; <gurligebis@gentoo.org> hostapd-0.7.3.ebuild,
+  files/hostapd-init.d:
+  Adding support for >=libnl-2.0 and adding support for newer openrc
+  versions without making noise.
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> hostapd-0.7.3.ebuild:
   ppc stable wrt #360997

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 841da907d0995f74ac92a09d5200b839511c11f0..c2a18a1de2f6ea6bf1180cd29408ec6e019ad13d 100644 (file)
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hostapd-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
-AUX hostapd-init.d 1015 RMD160 9c5908b38de714f6c79aad61ee2c248bf9d06c0a SHA1 6238deb6c618169ab5a8147850a1a0e594d69ba3 SHA256 d2c0f0d97a8c7d25e723c55c4377c1f7344762375998cc8498788f3a340fdf95
+AUX hostapd-init.d 1014 RMD160 6e9bcd83fdedc122363852d7f448e4e4e0428903 SHA1 4bd04d2ef0d9efbb0c133e6db924194c3593337d SHA256 f08064d313756b3f6f9fff790b3b52cfbef0006609bc96dab225065f6d65da08
 DIST hostapd-0.6.9.tar.gz 1089548 RMD160 1faf1728984756b54ee353af4ed6d173259a953d SHA1 80d1d3922fc0daf2aab2d41a2e37172d5371cf4f SHA256 4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
 DIST hostapd-0.7.3.tar.gz 1138869 RMD160 3d901166172cf634ecab4bd8426a33695b1e1070 SHA1 7a8853fe41ee5a2b9f03f608cf7a61c7ccea4f4c SHA256 31eb2781f37e1a4c27969d1594f8019c0ca87779349c099ab812833289961567
 EBUILD hostapd-0.6.9.ebuild 4953 RMD160 dcd2a03675d34ce9a1854c3ef788eb6218ee9193 SHA1 fc713e42361c63c7a5c3b222dd643b54aa5b4f30 SHA256 bd870808e074117ee66b41c62ff3358fea8fe17d54bb72d1c9dae67e5e907a04
-EBUILD hostapd-0.7.3.ebuild 5119 RMD160 7b9154c359271ba1b488027e7c00660f41488e14 SHA1 7351419c0f6dd7287e4bf6784f73f598cbe852ac SHA256 f01c9ad13d3d39c238422a0127acae6145c6e993a57081178587da5b67b19cbf
-MISC ChangeLog 20524 RMD160 033291d4ca0d4a13ed2d99909302bf2e08440c48 SHA1 601c5fe5decc5a52b886d77e73939e6d749f1627 SHA256 39cd3af47940f11587e82a94ba26d645f20817f246be7ae174cfe78eed45726d
+EBUILD hostapd-0.7.3.ebuild 5214 RMD160 76d174abe6291a575b9b404c1129e85d7f769d56 SHA1 994b473c21848b8f6cbebd662652d7a102e2938b SHA256 7bf3587705cf2dc994ada70a47c85026d3108b61f1304c61ef2b747ea639a3ad
+MISC ChangeLog 20712 RMD160 3d6f02907e6685fd73c9f9c6afd647207e0738bc SHA1 cf1475657a39a32e211a3f5ca6b836d5577ebc9f SHA256 c7303ca8591211304eae2da8f68a3cd19b08b7b5a7bff9f611c1630b9b3b67e5
 MISC metadata.xml 752 RMD160 f895add3fe282efb5fd3fba223d16b28fabe2e9e SHA1 1c4e58ae3628f9c433d939e5d973e1c795aa58f6 SHA256 78c8bab11c00f4988d677b1f4bf5a66c3221c0f9a3c46cfaf333a8857f250662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5qmb4ACgkQsR7PQhRXYEklMwCcC7Wc4B1hOEXysjn3qiBHaXko
+goMAnRpI3cLfbM1JAnc6/DNmNXBhMUus
+=wnU6
+-----END PGP SIGNATURE-----

diff --git a/net-wireless/hostapd/files/hostapd-init.d b/net-wireless/hostapd/files/hostapd-init.d
index c6372cc52401d9a034381099083e3c45b8731047..631cb48504b275cb41bea67e97640facb9881dd1 100644 (file)
--- a/net-wireless/hostapd/files/hostapd-init.d
+++ b/net-wireless/hostapd/files/hostapd-init.d
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.1 2010/01/14 14:36:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.2 2011/09/09 22:56:50 gurligebis Exp $
 
-opts="start stop reload"
+extra_commands="reload"
 
 depend() {
        local myneeds=

diff --git a/net-wireless/hostapd/hostapd-0.7.3.ebuild b/net-wireless/hostapd/hostapd-0.7.3.ebuild
index 535baf29fe5465406cab0916738dc8a5e85ff6b6..73b095223e04007b54b5d26fa44f68300ccb8921 100644 (file)
--- a/net-wireless/hostapd/hostapd-0.7.3.ebuild
+++ b/net-wireless/hostapd/hostapd-0.7.3.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-wireless/hostapd/hostapd-0.7.3.ebuild,v 1.5 2011/07/13 12:19:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.3.ebuild,v 1.6 2011/09/09 22:56:50 gurligebis Exp $
 
 EAPI="2"
 
@@ -86,7 +86,6 @@ src_configure() {
 
        einfo "  nl80211 driver enabled"
        echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-       echo "CFLAGS += -I/usr/include/netlink" >> ${CONFIG}
        echo "LIBS += -L/usr/lib" >> ${CONFIG}
 
        # misc
@@ -108,6 +107,11 @@ src_configure() {
                echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
        fi
 
+       # If we are using libnl 2.0 and above, enable support for it
+       if has_version ">=dev-libs/libnl-2.0"; then
+               echo "CONFIG_LIBNL20=y" >> .config
+       fi
+
        # TODO: Add support for BSD drivers
 
        default_src_configure