Version bump. Fixes building with KBUILD_OUTPUT or O= set, thanks to Miika Linnapuomi in bug #126306.

(Portage version: 2.0.54)

4 files changed, 119 insertions, 0 deletions

diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 7881b17dfec5..5c7f54fb31a7 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -9,6 +9,7 @@ MD5 a6b695cd887ebc8ee6d37d99971ff62e files/digest-ipw2200-1.0.9 62
 MD5 25bb7a22f5d3b003a58fc7a82d6b85d2 files/digest-ipw2200-1.1.0 62
 MD5 d65480e8077954294f049d6c4d023b3c files/digest-ipw2200-1.1.1 62
 MD5 80ae465d8bee456dcdd765d089b758eb files/digest-ipw2200-1.1.1-r1 138
+MD5 8170b85d9159eeade505c50929b21934 files/digest-ipw2200-1.1.2 62
 MD5 91e9ccbbcf86cc2b81eff3fc853cb760 files/ipw2200-1.0.11-debug.patch 3496
 MD5 a3a2dd68cce2a4d05217369daab108f1 files/ipw2200-1.0.8-broadcast.patch 594
 MD5 a2de4d35e783a2aae5708846d8a7637c files/ipw2200-1.0.8-slabcorrupt.patch 522
@@ -16,6 +17,7 @@ MD5 dd96f1bc93f2c8f03a81b87f641a5329 files/ipw2200-1.0.8-txbusy.patch 811
 MD5 e994df0999ba085974a28e98e317f702 files/ipw2200-1.0.9-qos.patch 918
 MD5 89bdf40b614036a932f84192e4092e9c files/ipw2200-1.1.1-diversity.patch 1165
 MD5 646b7e5aba19613998313aeb286f3e40 files/ipw2200-1.1.1-fw_endian.patch 2543
+MD5 55f822701e815b9b5fa308e59b2f4730 files/ipw2200-1.1.2-modverdir.patch 980
 MD5 fa29197797ebbf5db95a303892a231f1 ipw2200-1.0.10.ebuild 2883
 MD5 ed815b8c793ab509c84913c0c16e06e4 ipw2200-1.0.11-r1.ebuild 2946
 MD5 b9e8e1f57e42dc0faca0530fb8d34c37 ipw2200-1.0.11.ebuild 2885
@@ -26,4 +28,5 @@ MD5 d1428344ca6c3b3ece77f85fde18d2f0 ipw2200-1.0.9.ebuild 2935
 MD5 aa565eefee8fc1398afd4037497b7eac ipw2200-1.1.0.ebuild 2887
 MD5 2fad5a5720e57d795a3d12a641289a34 ipw2200-1.1.1-r1.ebuild 3145
 MD5 a51b1ea769eb184cdae3610ef0be015b ipw2200-1.1.1.ebuild 2890
+MD5 fe94394171df998fac28af0645e594fe ipw2200-1.1.2.ebuild 2302
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.1.2 b/net-wireless/ipw2200/files/digest-ipw2200-1.1.2
new file mode 100644
index 000000000000..962d7cd99a28
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-1.1.2
@@ -0,0 +1 @@
+MD5 145a6556b89a27d8fd5d7d97c3793c26 ipw2200-1.1.2.tgz 132368
diff --git a/net-wireless/ipw2200/files/ipw2200-1.1.2-modverdir.patch b/net-wireless/ipw2200/files/ipw2200-1.1.2-modverdir.patch
new file mode 100644
index 000000000000..d10617bf1501
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.1.2-modverdir.patch
@@ -0,0 +1,31 @@
+diff -urp ipw2200-1.1.2/Makefile ipw2200-1.1.2-modverdir/Makefile
+--- ipw2200-1.1.2/Makefile	2006-03-31 13:24:49.000000000 +0200
++++ ipw2200-1.1.2-modverdir/Makefile	2006-03-31 16:50:49.000000000 +0200
+@@ -153,26 +153,8 @@ clean:
+ distclean: clean
+ 	rm -f tags TAGS
+ 
+-TMP=$(PWD)/tmp
+-MODVERDIR=$(TMP)/.tmp_versions
+-
+ modules:
+-	mkdir -p $(MODVERDIR)
+-	-cp $(IEEE80211_MODVERDIR)/*.mod $(MODVERDIR)
+-ifdef ($(KSRC_OUTPUT)/.tmp_versions)
+-	-cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
+-endif
+-ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
+-ifdef ($(KSRC)/.tmp_versions)
+-	-cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
+-endif
+-	$(MAKE) -C $(KSRC) M=$(PWD) MODVERDIR=$(MODVERDIR) modules
+-else # We've got a kernel with seperate output, copy the config, and use O=
+-	mkdir -p $(TMP)
+-	cp $(KSRC_OUTPUT)/.config $(TMP)
+-	$(MAKE) -C $(KSRC) M=$(PWD) MODVERDIR=$(MODVERDIR)) O=$(PWD)/tmp modules
+-endif
+-
++	$(MAKE) -C $(KSRC) M=$(PWD) modules
+ 
+ 
+ patch_kernel:
diff --git a/net-wireless/ipw2200/ipw2200-1.1.2.ebuild b/net-wireless/ipw2200/ipw2200-1.1.2.ebuild
new file mode 100644
index 000000000000..63b56f57988a
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-1.1.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.1.2.ebuild,v 1.1 2006/03/31 15:13:03 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+IEEE80211_VERSION="1.1.13"
+FW_VERSION="3.0"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
+HOMEPAGE="http://ipw2200.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
+		sys-apps/sed"
+RDEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
+		>=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw2200(net/wireless:)"
+MODULESD_IPW2200_DOCS="README.ipw2200"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER !IPW2200"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_IPW2200="${P} requires the in-kernel version of the IPW2200 driver to be disabled (CONFIG_IPW2200)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if [[ ! -f /lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
+		eerror
+		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
+		eerror "upgrading your kernel."
+		eerror
+		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
+		eerror "modules needs to be remerged after a kernel upgrade."
+		eerror
+		die "/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
+	fi
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
+}
+
+src_unpack() {
+	local debug="n" radiotap="n"
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-modverdir.patch
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IPW2200_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
+}
+
+src_compile() {
+	linux-mod_src_compile
+
+	einfo
+	einfo "You may safely ignore any warnings from above compilation about"
+	einfo "undefined references to the ieee80211 subsystem."
+	einfo
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}