Adding a hard depend onto net-wireless/ieee80211-1.1.13-r1 for ipw3945-1.1.0, seems like everything above is broken. This is resolving bug #147546.

Package-Manager: portage-2.1.2_pre1

4 files changed, 111 insertions, 8 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index af3b6120b9bf..297e1c79199e 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ipw3945
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.10 2006/08/11 10:20:39 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.11 2006/09/16 06:21:27 phreak Exp $
+
+*ipw3945-1.1.0-r1 (16 Sep 2006)
+
+  16 Sep 2006; Christian Heim <phreak@gentoo.org> +ipw3945-1.1.0-r1.ebuild:
+  Adding a hard depend onto net-wireless/ieee80211-1.1.13-r1 for
+  ipw3945-1.1.0, seems like everything above is broken. This is resolving bug
+  #147546.
 
 *ipw3945-1.1.0 (11 Aug 2006)
 
diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest
index cf9d30b1add6..964880461d7a 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -7,14 +7,18 @@ EBUILD ipw3945-1.0.5.ebuild 2514 RMD160 f8e66bae2bcf90a6a369aa4e314b544ebc87e8a2
 MD5 747b893f79663a7956eee93c18b396c2 ipw3945-1.0.5.ebuild 2514
 RMD160 f8e66bae2bcf90a6a369aa4e314b544ebc87e8a2 ipw3945-1.0.5.ebuild 2514
 SHA256 6eb3f002e573396af07781eac992434dc7062359691a484005a2c4e3c619543c ipw3945-1.0.5.ebuild 2514
+EBUILD ipw3945-1.1.0-r1.ebuild 2546 RMD160 ea1b5f292c57537866d40ff90bb0853722d16d14 SHA1 c744c72ce622c49f80a83c6f84678fb6857d4b8c SHA256 f04a1b524e5f8407a09d49db2c1c86501d773e760e350f939b2bfd09ce820eb8
+MD5 30e1c0cf5f5093094acbcc1dfd998dbe ipw3945-1.1.0-r1.ebuild 2546
+RMD160 ea1b5f292c57537866d40ff90bb0853722d16d14 ipw3945-1.1.0-r1.ebuild 2546
+SHA256 f04a1b524e5f8407a09d49db2c1c86501d773e760e350f939b2bfd09ce820eb8 ipw3945-1.1.0-r1.ebuild 2546
 EBUILD ipw3945-1.1.0.ebuild 2545 RMD160 317aa9512cf23c3659d4de3d10fd8a2e6c287647 SHA1 0c3d3a593644c32738c4d929872ef2d5d41ab561 SHA256 19f6006cb059d971e09698a0e38853770bf23df2a99885022e2dfe6d2b493652
 MD5 f5737b47289699b527eafca6584f2342 ipw3945-1.1.0.ebuild 2545
 RMD160 317aa9512cf23c3659d4de3d10fd8a2e6c287647 ipw3945-1.1.0.ebuild 2545
 SHA256 19f6006cb059d971e09698a0e38853770bf23df2a99885022e2dfe6d2b493652 ipw3945-1.1.0.ebuild 2545
-MISC ChangeLog 1803 RMD160 706990817c4f16e47b5e9ff7190914e79ed1fb72 SHA1 d722720dbff774bc0b09c11c1cfa6de4d7c4ad72 SHA256 4c2e1e50a860b4d687a15864f742a8f8d90452d0c11838e77c39668d167c312b
-MD5 c598d9b547a3b0946b600cb57b579693 ChangeLog 1803
-RMD160 706990817c4f16e47b5e9ff7190914e79ed1fb72 ChangeLog 1803
-SHA256 4c2e1e50a860b4d687a15864f742a8f8d90452d0c11838e77c39668d167c312b ChangeLog 1803
+MISC ChangeLog 2067 RMD160 bc2cc34c4ec422ed52e6c1bc09cc42e0d9437f6c SHA1 e946a594946ed52c64744526761c2019d1d7acdb SHA256 e1fa10cba59022e89308e4497dbf8cf92dce1bbc45abf1b2e8d288437cca7208
+MD5 76b6726fa4d31cc31d6b6e2eaa542173 ChangeLog 2067
+RMD160 bc2cc34c4ec422ed52e6c1bc09cc42e0d9437f6c ChangeLog 2067
+SHA256 e1fa10cba59022e89308e4497dbf8cf92dce1bbc45abf1b2e8d288437cca7208 ChangeLog 2067
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -25,10 +29,13 @@ SHA256 f77e97526fe819077d5d0d4167b9f46fc34001d3decf81c996bbdbab8eca1e7c files/di
 MD5 06700aa4482b9bad037a273047e1a2cc files/digest-ipw3945-1.1.0 232
 RMD160 a2daf9fb3888a6e8f11a424989d873ffa8e47fd9 files/digest-ipw3945-1.1.0 232
 SHA256 0242b6df0e4f57a1f79a6873d0934249ae57507735c542d21bbcee690e27abf5 files/digest-ipw3945-1.1.0 232
+MD5 06700aa4482b9bad037a273047e1a2cc files/digest-ipw3945-1.1.0-r1 232
+RMD160 a2daf9fb3888a6e8f11a424989d873ffa8e47fd9 files/digest-ipw3945-1.1.0-r1 232
+SHA256 0242b6df0e4f57a1f79a6873d0934249ae57507735c542d21bbcee690e27abf5 files/digest-ipw3945-1.1.0-r1 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE3FoAyuNVb5qfaOYRAj69AJ9EeZw4b6Wfai7ENXLpbWo959bAKgCgpV2k
-b7OewOAXEmrVI1zyzRx1UsU=
-=v09e
+iD8DBQFFC5fxyuNVb5qfaOYRAleYAKDO+K9NloJkJPWSEnfI+i+YANQFHgCg0bpr
+mhY1oOgJ03m/Lfd/96q0q7I=
+=IyYe
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945/files/digest-ipw3945-1.1.0-r1 b/net-wireless/ipw3945/files/digest-ipw3945-1.1.0-r1
new file mode 100644
index 000000000000..53db2e626f52
--- /dev/null
+++ b/net-wireless/ipw3945/files/digest-ipw3945-1.1.0-r1
@@ -0,0 +1,3 @@
+MD5 1f393d7a080879dba1a824dec251d71e ipw3945-1.1.0.tgz 196361
+RMD160 6d4b8c12c253b4d00b376911e73ca48d8ab6da35 ipw3945-1.1.0.tgz 196361
+SHA256 be62bb249527dbe5a4031eec9cdf15e09fe1dc0fdd1b5dc374e85bc5229c1ff1 ipw3945-1.1.0.tgz 196361
diff --git a/net-wireless/ipw3945/ipw3945-1.1.0-r1.ebuild b/net-wireless/ipw3945/ipw3945-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..523bfae472cc
--- /dev/null
+++ b/net-wireless/ipw3945/ipw3945-1.1.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.1.0-r1.ebuild,v 1.1 2006/09/16 06:21:27 phreak Exp $
+
+inherit linux-mod
+
+S=${WORKDIR}/${P/_pre/-pre}
+
+IEEE80211_VERSION="1.1.13-r1"
+UCODE_VERSION="1.13"
+DAEMON_VERSION="1.7.22"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 3945ABG miniPCI express adapter"
+HOMEPAGE="http://ipw3945.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="debug"
+DEPEND="=net-wireless/ieee80211-${IEEE80211_VERSION}"
+RDEPEND="=net-wireless/ieee80211-${IEEE80211_VERSION}
+		>=net-wireless/ipw3945-ucode-${UCODE_VERSION}
+		>=net-wireless/ipw3945d-${DAEMON_VERSION}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw3945(net/wireless:)"
+MODULESD_IPW3945_DOCS="README.ipw3945"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER !IPW3945"
+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_IPW3945="${P} requires the in-kernel version of the IPW3945 driver to be disabled (CONFIG_IPW3945)"
+
+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 ${ROOT}/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 "${ROOT}/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"
+
+	unpack ${A}
+
+	sed -i \
+		-e "s:^#\(CONFIG_IPW3945_QOS\)=.*:\1=y:" \
+		-e "s:^# \(CONFIG_IPW3945_MONITOR\)=.*:\1=y:" \
+		-e "s:^# \(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=y:" \
+		-e "s:^# \(CONFIG_IPW3945_PROMISCUOUS\)=.*:\1=y:" \
+		"${S}"/Makefile || die
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IPW3945_DEBUG\)=.*:\1=${debug}:" "${S}"/Makefile || die
+}
+
+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
+}