Cleanup due #22900

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 9 insertions, 233 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index c5a12825cb55..a9592962a0f8 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/broadcom-sta
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.45 2012/05/22 02:55:18 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.46 2013/02/03 12:39:56 pacho Exp $
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -broadcom-sta-5.100.82.111.ebuild,
+  -broadcom-sta-5.100.82.112-r1.ebuild, -broadcom-sta-5.100.82.112.ebuild,
+  -broadcom-sta-5.100.82.38-r1.ebuild,
+  -files/broadcom-sta-5.100.82.38-linux-2.6.37.patch, metadata.xml:
+  Cleanup due #22900
 
   22 May 2012; Zac Medico <zmedico@gentoo.org>
   broadcom-sta-5.100.82.112-r2.ebuild:
@@ -292,4 +298,3 @@
   +files/broadcom-sta-5.10.79.10-linux-2.6.29.patch, +metadata.xml,
   +broadcom-sta-5.10.79.10.ebuild:
   Initial import, bug #248450.
-
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild
deleted file mode 100644
index 41c99e73c958..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild,v 1.3 2011/10/26 23:32:27 matsuu Exp $
-
-EAPI="2"
-inherit eutils linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_"
-SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="fetch"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!MAC80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \
-		"${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r1.ebuild
deleted file mode 100644
index 76f83a88a9b4..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r1.ebuild,v 1.1 2011/11/11 16:51:58 matsuu Exp $
-
-EAPI="2"
-inherit eutils linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_"
-SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!MAC80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \
-		"${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch" \
-		"${FILESDIR}/${PN}-5.100.82.112-linux-2.6.39.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild
deleted file mode 100644
index 8ead820d3a72..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild,v 1.1 2011/10/26 23:32:27 matsuu Exp $
-
-EAPI="2"
-inherit eutils linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_"
-SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!MAC80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \
-		"${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
deleted file mode 100644
index aff9488fb81f..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild,v 1.6 2011/10/26 23:32:27 matsuu Exp $
-
-EAPI="2"
-inherit eutils linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_"
-SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT="fetch"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 33; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211"
-		ERROR_WEXT_PRIV="Starting with 2.6.33, it is not possible to set WEXT_PRIV directly. We recommend to set another symbol selecting WEXT_PRIV, for example, PRISM54, IPW2200 and so on. See Bug #248450 comment#98."
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \
-		"${FILESDIR}/${PN}-5.100.82.38-linux-2.6.37.patch"
-}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch
deleted file mode 100644
index ae57a20874e8..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-linux-2.6.37.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur broadcom-sta.orig/src/wl/sys/wl_linux.c broadcom-sta/src/wl/sys/wl_linux.c
---- broadcom-sta.orig/src/wl/sys/wl_linux.c	2010-12-15 11:01:09.000000000 +0900
-+++ broadcom-sta/src/wl/sys/wl_linux.c	2011-01-02 00:18:32.438095116 +0900
-@@ -482,7 +482,11 @@
- #ifdef WL_ALL_PASSIVE
- 		spin_lock_init(&wl->txq_lock);
- #endif 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+		sema_init(&wl->sem, 1);
-+#else
- 		init_MUTEX(&wl->sem);
-+#endif
- 	}
- 
- 	if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,
diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml
index 0a0d344a640e..2e90b802bc7c 100644
--- a/net-wireless/broadcom-sta/metadata.xml
+++ b/net-wireless/broadcom-sta/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>matsuu@gentoo.org</email>
+<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>