Version bump thanks Mark Kowarsky <mark_alec@gentoo.org> in bug 187497

Package-Manager: portage-2.1.3.7

6 files changed, 101 insertions, 22 deletions

diff --git a/net-wireless/ralink-rt61/ChangeLog b/net-wireless/ralink-rt61/ChangeLog
index 36a4fdb02a9c..1a319717baa2 100644
--- a/net-wireless/ralink-rt61/ChangeLog
+++ b/net-wireless/ralink-rt61/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ralink-rt61
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ralink-rt61/ChangeLog,v 1.4 2007/06/07 14:03:32 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ralink-rt61/ChangeLog,v 1.5 2007/08/29 19:32:07 genstef Exp $
+
+*ralink-rt61-1.1.1.0 (29 Aug 2007)
+*ralink-rt61-1.1.0.0.ebuild (29 Aug 2007)
+
+  29 Aug 2007; Stefan Schweizer <genstef@gentoo.org> +files/rtmp_main.diff,
+  ralink-rt61-1.1.0.0.ebuild, +ralink-rt61-1.1.1.0.ebuild:
+  Version bump thanks Mark Kowarsky <mark_alec@gentoo.org> in bug 187497
 
   07 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   ralink-rt61-1.1.0.0.ebuild:
diff --git a/net-wireless/ralink-rt61/Manifest b/net-wireless/ralink-rt61/Manifest
index 9f915831b2c4..08076a6ab5f9 100644
--- a/net-wireless/ralink-rt61/Manifest
+++ b/net-wireless/ralink-rt61/Manifest
@@ -1,19 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rt61-wireless-ext-v21.diff 564 RMD160 7d517675f9a0c0bef65353d12ccdb18a036a3984 SHA1 6e6fe754884dd6086ee28031f0451d2d65c92852 SHA256 84310cf0a10fe3aa40934f23a988a3189b37af75dd4c1ce4afd702001143008d
 MD5 490cec9ff19f09f41e43a47c8a05b6f0 files/rt61-wireless-ext-v21.diff 564
 RMD160 7d517675f9a0c0bef65353d12ccdb18a036a3984 files/rt61-wireless-ext-v21.diff 564
 SHA256 84310cf0a10fe3aa40934f23a988a3189b37af75dd4c1ce4afd702001143008d files/rt61-wireless-ext-v21.diff 564
+AUX rtmp_main.diff 438 RMD160 02b54600c0e94a3fde0ea1c0caac8c339336de42 SHA1 5d2300ccf492313c679f84b87a4ec5e8a40a64e9 SHA256 4fcaec8a348e44392ccf7c5174591b115d11abce664b60eaccf4545e97034262
+MD5 42919ab5060cb4987b499bedae99c3d9 files/rtmp_main.diff 438
+RMD160 02b54600c0e94a3fde0ea1c0caac8c339336de42 files/rtmp_main.diff 438
+SHA256 4fcaec8a348e44392ccf7c5174591b115d11abce664b60eaccf4545e97034262 files/rtmp_main.diff 438
+DIST IS_Linux_STA_6x_D_1.1.1.0.tar.gz 397766 RMD160 581c1ec77df0e280f0eabda10d6433ae8f12207a SHA1 bbb7efa87fe645eacd8c1f8cac097757c01fc557 SHA256 8f06681d77aedb9f0f5141628e5fe68a865366cbe50a1434329f92e2ff9aaeb5
 DIST RT61_Linux_STA_Drv1.1.0.0.tar.gz 374892 RMD160 49419a851adefe0821be62549b91218126b02055 SHA1 b8ecd10245a4c8161422951e336b3eaaf16a52c0 SHA256 f427c2c6de4b294dc930c9eefeb743b93b90c8d89eed026ba2aacd7cce6e8c98
-EBUILD ralink-rt61-1.1.0.0.ebuild 1376 RMD160 923a4ee95788a1b77d59d4b34627c1d29df4b781 SHA1 0367526db0b39c6ee538953105dfb891b85b16dd SHA256 89874a2269ef3c1d7a4ec8b6706e08e3560f13f0dd5caab58c00a8aaf48f0784
-MD5 cc94088b6fe2322f8be3e3ef4d7cd922 ralink-rt61-1.1.0.0.ebuild 1376
-RMD160 923a4ee95788a1b77d59d4b34627c1d29df4b781 ralink-rt61-1.1.0.0.ebuild 1376
-SHA256 89874a2269ef3c1d7a4ec8b6706e08e3560f13f0dd5caab58c00a8aaf48f0784 ralink-rt61-1.1.0.0.ebuild 1376
-MISC ChangeLog 808 RMD160 e1cf62e5b13efaddf9bc9e328c4150481016a151 SHA1 4197d36d832d59078f37d2aba295e36c93b85188 SHA256 908fe7b33851c29fdcdb5bf5275458df1c82b7aa53f817ae5c81ec067ad023df
-MD5 b195f89ef7c59ee7442d5951dbfa933f ChangeLog 808
-RMD160 e1cf62e5b13efaddf9bc9e328c4150481016a151 ChangeLog 808
-SHA256 908fe7b33851c29fdcdb5bf5275458df1c82b7aa53f817ae5c81ec067ad023df ChangeLog 808
+EBUILD ralink-rt61-1.1.0.0.ebuild 1387 RMD160 0613fb5eeed225014a72242fdadc45db0a3b0926 SHA1 ed9777f5489d56290518b761774666d9ee037262 SHA256 991b2e51481d93ec1e8dbda9d7bf3034fdd56007b704e662a854eddec957d6d8
+MD5 69474ceb258bae2ab84538c7872bd59c ralink-rt61-1.1.0.0.ebuild 1387
+RMD160 0613fb5eeed225014a72242fdadc45db0a3b0926 ralink-rt61-1.1.0.0.ebuild 1387
+SHA256 991b2e51481d93ec1e8dbda9d7bf3034fdd56007b704e662a854eddec957d6d8 ralink-rt61-1.1.0.0.ebuild 1387
+EBUILD ralink-rt61-1.1.1.0.ebuild 1369 RMD160 e347e722f49f8020ffc03d16281329ed8738aa7f SHA1 e456df931a461c5c6a22c8e7dfac32337eaa835c SHA256 6a112ee5133c9dc7abdfcdf8047473b6b1f737adf4c4d9e4e38c507462e4b6ce
+MD5 28ecc6e73497635e8066fc30c61b8d48 ralink-rt61-1.1.1.0.ebuild 1369
+RMD160 e347e722f49f8020ffc03d16281329ed8738aa7f ralink-rt61-1.1.1.0.ebuild 1369
+SHA256 6a112ee5133c9dc7abdfcdf8047473b6b1f737adf4c4d9e4e38c507462e4b6ce ralink-rt61-1.1.1.0.ebuild 1369
+MISC ChangeLog 1097 RMD160 3aa6386ba80c83af0a628985a8284283b8fb9294 SHA1 6a44c03f0d9ff6ce32922b3ba9ee387fb0032f81 SHA256 583fdc1e93cde27d1dee3190012fdba803e0d5b944ffb83fd0ccc10188594ea8
+MD5 b2aa3535dc221e46a8a65523044bc9d0 ChangeLog 1097
+RMD160 3aa6386ba80c83af0a628985a8284283b8fb9294 ChangeLog 1097
+SHA256 583fdc1e93cde27d1dee3190012fdba803e0d5b944ffb83fd0ccc10188594ea8 ChangeLog 1097
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -21,10 +27,6 @@ SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata
 MD5 d573d3f6987e7ea21a3225366ba14df9 files/digest-ralink-rt61-1.1.0.0 277
 RMD160 69da93b18eb30ec3720717ddd51b533d57ebf616 files/digest-ralink-rt61-1.1.0.0 277
 SHA256 74ca8186d6a39f9db9d40d0d88a263b2e392ae067de9973c8e4e49f6b3db7c04 files/digest-ralink-rt61-1.1.0.0 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGaBA7NQqtfCuFneMRAl/dAJ9b1nY4l7bWtSXg7IbcRdRzYJlAPgCdHr4b
-rb4K8ad1CvDX/W0qhs+Ddjs=
-=dmDN
------END PGP SIGNATURE-----
+MD5 6826ae9a6ba68f9951233dfffdc18bfa files/digest-ralink-rt61-1.1.1.0 277
+RMD160 3518589f357fe09b63addf479625cd8e1775eaf6 files/digest-ralink-rt61-1.1.1.0 277
+SHA256 6e08fa429b0e3d1a3d4b934a78b391ccdeb1a2487db8a7aece16d4b3b0cad2a0 files/digest-ralink-rt61-1.1.1.0 277
diff --git a/net-wireless/ralink-rt61/files/digest-ralink-rt61-1.1.1.0 b/net-wireless/ralink-rt61/files/digest-ralink-rt61-1.1.1.0
new file mode 100644
index 000000000000..a09aafa303d9
--- /dev/null
+++ b/net-wireless/ralink-rt61/files/digest-ralink-rt61-1.1.1.0
@@ -0,0 +1,3 @@
+MD5 a268974e2202a0520bd7ace46161179a IS_Linux_STA_6x_D_1.1.1.0.tar.gz 397766
+RMD160 581c1ec77df0e280f0eabda10d6433ae8f12207a IS_Linux_STA_6x_D_1.1.1.0.tar.gz 397766
+SHA256 8f06681d77aedb9f0f5141628e5fe68a865366cbe50a1434329f92e2ff9aaeb5 IS_Linux_STA_6x_D_1.1.1.0.tar.gz 397766
diff --git a/net-wireless/ralink-rt61/files/rtmp_main.diff b/net-wireless/ralink-rt61/files/rtmp_main.diff
new file mode 100644
index 000000000000..e0445d401f19
--- /dev/null
+++ b/net-wireless/ralink-rt61/files/rtmp_main.diff
@@ -0,0 +1,12 @@
+diff -Nur IS_Linux_STA_6x_D_1.1.1.0/Module/rtmp_main.c IS_Linux_STA_6x_D_1.1.1.0/Module/rtmp_main.c
+--- IS_Linux_STA_6x_D_1.1.1.0/Module/rtmp_main.c	2007-08-16 21:29:20.000000000 +1000
++++ IS_Linux_STA_6x_D_1.1.1.0/Module/rtmp_main.c	2007-07-27 12:34:54.000000000 +1000
+@@ -888,7 +888,7 @@
+ //
+ static INT __init rt61_init_module(VOID)
+ {
+-    return pci_module_init(&rt61_driver);
++    return pci_register_driver(&rt61_driver);
+ }
+ 
+ //
diff --git a/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild b/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild
index 012a7ae1b510..512a4f8dbbb3 100644
--- a/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild
+++ b/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild,v 1.4 2007/06/07 14:03:32 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ralink-rt61/ralink-rt61-1.1.0.0.ebuild,v 1.5 2007/08/29 19:32:07 genstef Exp $
 
 inherit eutils linux-mod
 
@@ -26,8 +26,8 @@ MODULE_NAMES="rt61(net:${S}/Module)"
 BUILD_TARGETS=" "
 MODULESD_RT61_ALIASES=('ra? rt61')
 
-CONFIG_CHECK="NET_RADIO"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+CONFIG_CHECK="WIRELESS_EXT"
+ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_WIRELESS_EXT)."
 
 src_compile() {
 	epatch ${FILESDIR}/rt61-wireless-ext-v21.diff
diff --git a/net-wireless/ralink-rt61/ralink-rt61-1.1.1.0.ebuild b/net-wireless/ralink-rt61/ralink-rt61-1.1.1.0.ebuild
new file mode 100644
index 000000000000..00ce16d6fdee
--- /dev/null
+++ b/net-wireless/ralink-rt61/ralink-rt61-1.1.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ralink-rt61/ralink-rt61-1.1.1.0.ebuild,v 1.1 2007/08/29 19:32:07 genstef Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Driver for the RaLink RT61 wireless chipset"
+HOMEPAGE="http://www.ralinktech.com/"
+LICENSE="GPL-2"
+
+MY_P=${P/${PN}-/IS_Linux_STA_6x_D_}
+
+SRC_URI="http://www.ralinktech.com.tw/data/${MY_P}.tar.gz"
+
+KEYWORDS="-* amd64 x86"
+IUSE=""
+SLOT="0"
+
+DEPEND=""
+RDEPEND="net-wireless/wireless-tools
+	!net-wireless/rt61"
+
+S="${WORKDIR}/${MY_P}"
+
+MODULE_NAMES="rt61(net:${S}/Module)"
+BUILD_TARGETS=" "
+MODULESD_RT61_ALIASES=('ra? rt61')
+
+CONFIG_CHECK="WIRELESS_EXT"
+ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_WIRELESS_EXT)."
+
+src_compile() {
+	epatch ${FILESDIR}/rtmp_main.diff
+	if kernel_is 2 6; then
+		cp Module/Makefile.6 Module/Makefile
+	elif kernel_is 2 4; then
+		cp Module/Makefile.4 Module/Makefile
+	else
+		die "Your kernel version is not supported!"
+	fi
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc Module/{ReleaseNote,STA_iwpriv_ATE_usage.txt,README,iwpriv_usage.txt}
+
+	insinto /etc/Wireless/RT61STA
+	insopts -m 0600
+	doins Module/rt61sta.dat
+	insopts -m 0644
+	doins Module/{rt2561,rt2561s,rt2661}.bin
+}