New debian version, gcc4 fix thanks to Maxim <maximsch2@gmail.com> in bug 125474

Package-Manager: portage-2.1_pre5-r4

10 files changed, 149 insertions, 123 deletions

diff --git a/net-wireless/at76c503a/ChangeLog b/net-wireless/at76c503a/ChangeLog
index ade6eb44cf5d..8680789ffd2d 100644
--- a/net-wireless/at76c503a/ChangeLog
+++ b/net-wireless/at76c503a/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/at76c503a
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/ChangeLog,v 1.8 2005/11/20 00:01:20 betelgeuse Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/ChangeLog,v 1.9 2006/03/09 19:53:00 genstef Exp $
+
+*at76c503a-0.12_beta23-r3 (09 Mar 2006)
+
+  09 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/at76-7-gcc4.diff, -at76c503a-0.12_beta19.ebuild,
+  -at76c503a-0.12_beta23.ebuild, -at76c503a-0.12_beta23-r1.ebuild,
+  +at76c503a-0.12_beta23-r3.ebuild:
+  New debian version, gcc4 fix thanks to Maxim <maximsch2@gmail.com> in bug
+  125474
 
   19 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
   at76c503a-0.12_beta19.ebuild, at76c503a-0.12_beta23.ebuild,
diff --git a/net-wireless/at76c503a/Manifest b/net-wireless/at76c503a/Manifest
index 2c5774e5a27a..e2a3cbb1bc6f 100644
--- a/net-wireless/at76c503a/Manifest
+++ b/net-wireless/at76c503a/Manifest
@@ -1,22 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 acc0a6a0bbd609865c8b7ae6ff46cfbc ChangeLog 1739
-MD5 1558781da657276105d167b3dbadf63e at76c503a-0.12_beta19.ebuild 1637
-MD5 ecfb5632d54153fea15ac11f1729f7a3 at76c503a-0.12_beta23-r1.ebuild 1697
+MD5 3416c2b965b66a8844975f799a0c2950 ChangeLog 2077
+RMD160 35896dda09260e7ded1c4e5019703e789a555b1c ChangeLog 2077
+SHA256 479634f39bc4183416f3d66cef4246c07b9c8037685b119995487baf84335af3 ChangeLog 2077
 MD5 aec9a80745a69258bfea65996938aa89 at76c503a-0.12_beta23-r2.ebuild 1742
-MD5 bd681cdbcae69b53f377d72f2ae3a738 at76c503a-0.12_beta23.ebuild 1642
+RMD160 49aac505ba1430fea01e5c25c45544176858cceb at76c503a-0.12_beta23-r2.ebuild 1742
+SHA256 64c7b0eb360d708359564b2a55dc359151aac9f2f8b9850f884a02c9d759e6fe at76c503a-0.12_beta23-r2.ebuild 1742
+MD5 b7a05c872973b858547e10547000348a at76c503a-0.12_beta23-r3.ebuild 1679
+RMD160 4357a04297cb436aa1e41f51d8913189e8cbbde9 at76c503a-0.12_beta23-r3.ebuild 1679
+SHA256 65e46f6dad7c8e2f6f2c0340453eeda20d5700dfbc69535e8e142ef5cae2b65a at76c503a-0.12_beta23-r3.ebuild 1679
+MD5 9811be69a9284c390301c910a7f6ff18 files/at76-7-gcc4.diff 4254
+RMD160 6ee945da6c840f5f6f4cb0be9bdae5be8ba0d684 files/at76-7-gcc4.diff 4254
+SHA256 7ad54bbbf185db303fcfb0dc7b8afbd572f58e07eab73341b9f8f8a82d6c12a9 files/at76-7-gcc4.diff 4254
 MD5 d79e76ecaf2c400a06e505bbe869bf1f files/at76c503a-adhoc-fix.diff 544
+RMD160 6dfa97771a25645ee20c6d216d1ebe903d98b9a5 files/at76c503a-adhoc-fix.diff 544
+SHA256 c128490e69826ae1f254c78cf102eb7f9858c954593bcb7a40071592dd8996bf files/at76c503a-adhoc-fix.diff 544
 MD5 5668b1fe560b9b17a8086158cba310d5 files/at76c503a-kernel-2.6-fixes.diff 3502
-MD5 8574af651332b83543d4359e833e9987 files/digest-at76c503a-0.12_beta19 151
-MD5 35f5c84feb2694bb071d04073ba6d6e5 files/digest-at76c503a-0.12_beta23 151
-MD5 35f5c84feb2694bb071d04073ba6d6e5 files/digest-at76c503a-0.12_beta23-r1 151
+RMD160 48c58cff06d40b4d31688dd55f68c9028a7e0ead files/at76c503a-kernel-2.6-fixes.diff 3502
+SHA256 9b85c6eab3adeaef58ab077a3bf3c24ebf5bf0332a84511d86b6ece7c145bdfa files/at76c503a-kernel-2.6-fixes.diff 3502
 MD5 35f5c84feb2694bb071d04073ba6d6e5 files/digest-at76c503a-0.12_beta23-r2 151
+RMD160 f1edb3bc6086ff38d6681d49b1fad52677043e6f files/digest-at76c503a-0.12_beta23-r2 151
+SHA256 40e78d6f4f61750c1f092d5d2812ca38255d9f1814adfc5a76c35fbfd391bf8c files/digest-at76c503a-0.12_beta23-r2 151
+MD5 e461a23ace69e6ef341b45bd3a855188 files/digest-at76c503a-0.12_beta23-r3 545
+RMD160 2c1b347e219aa1a2836173bed8919f016f6258fa files/digest-at76c503a-0.12_beta23-r3 545
+SHA256 37c0071c3427d524999691a089c660371424f1863c014ca5650be237d92bc5af files/digest-at76c503a-0.12_beta23-r3 545
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf7zfQiJ/wx066S4RAq25AJ9qxLVHW8FKjGh77PaPS8AToogfaQCeMUsU
-htLA7UVlQNmuy214y5z2EWo=
-=OTMn
------END PGP SIGNATURE-----
+RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
+SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
diff --git a/net-wireless/at76c503a/at76c503a-0.12_beta19.ebuild b/net-wireless/at76c503a/at76c503a-0.12_beta19.ebuild
deleted file mode 100644
index f87190f4f12b..000000000000
--- a/net-wireless/at76c503a/at76c503a-0.12_beta19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.12_beta19.ebuild,v 1.4 2005/11/20 00:01:20 betelgeuse Exp $
-
-inherit linux-mod eutils
-
-MY_P=${PN}_${PV/_beta/.beta}
-SRC_PATCH="${MY_P}-4.diff"
-DESCRIPTION="at76c503 is a Linux driver for the wlan USB adapter based on the Atmel at76c503 chip. It currently supports ad-hoc mode, infrastructure mode, and WEP. It supports adapters from Atmel, the Belkin F5D6050, Netgear MA101, and others."
-HOMEPAGE="http://developer.berlios.de/projects/at76c503a/"
-SRC_URI="mirror://debian/pool/contrib/a/at76c503a/${MY_P}.orig.tar.gz
-		mirror://debian/pool/contrib/a/at76c503a/${SRC_PATCH}.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND="net-wireless/atmel-firmware
-		>=sys-apps/hotplug-20040923
-		>=net-wireless/wireless-tools-26-r1"
-S=${WORKDIR}/${MY_P/_/-}.orig
-
-MODULE_NAMES="at76_usbdfu(net:) at76c503-i3861(net:) at76c503-i3863(net:)
-	at76c503-rfmd-acc(net:) at76c503-rfmd(net:) at76c503(net:) at76c505-rfmd(net:)
-	at76c505-rfmd2958(net:) at76c505a-rfmd2958(net:)"
-BUILD_TARGETS="all"
-
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${SRC_PATCH}
-	convert_to_m Makefile
-	sed -si "s:-cp \$(KERNEL_SRC)/.tmp_versions/\*.mod \$(MODVERDIR)::" Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README COPYING CHANGELOG
-}
diff --git a/net-wireless/at76c503a/at76c503a-0.12_beta23-r1.ebuild b/net-wireless/at76c503a/at76c503a-0.12_beta23-r1.ebuild
deleted file mode 100644
index 96b6cba5548b..000000000000
--- a/net-wireless/at76c503a/at76c503a-0.12_beta23-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.12_beta23-r1.ebuild,v 1.2 2005/11/20 00:01:20 betelgeuse Exp $
-
-inherit linux-mod eutils
-
-MY_P=${PN}_${PV/_beta/.beta}
-SRC_PATCH="${MY_P}-1.diff"
-DESCRIPTION="at76c503 is a Linux driver for the wlan USB adapter based on the Atmel at76c503 chip. It currently supports ad-hoc mode, infrastructure mode, and WEP. It supports adapters from Atmel, the Belkin F5D6050, Netgear MA101, and others."
-HOMEPAGE="http://developer.berlios.de/projects/at76c503a/"
-SRC_URI="mirror://debian/pool/contrib/a/at76c503a/${MY_P}.orig.tar.gz
-		mirror://debian/pool/contrib/a/at76c503a/${SRC_PATCH}.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RDEPEND="net-wireless/atmel-firmware
-		>=sys-apps/hotplug-20040923
-		>=net-wireless/wireless-tools-26-r1"
-S=${WORKDIR}/${MY_P/_/-}.orig
-
-MODULE_NAMES="at76_usbdfu(net:) at76c503-i3861(net:) at76c503-i3863(net:)
-	at76c503-rfmd-acc(net:) at76c503-rfmd(net:) at76c503(net:) at76c505-rfmd(net:)
-	at76c505-rfmd2958(net:) at76c505a-rfmd2958(net:)"
-BUILD_TARGETS="all"
-
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${SRC_PATCH}
-	epatch ${FILESDIR}/at76c503a-kernel-2.6-fixes.diff
-	convert_to_m Makefile
-	sed -si "s:-cp \$(KERNEL_SRC)/.tmp_versions/\*.mod \$(MODVERDIR)::" Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README COPYING CHANGELOG
-}
diff --git a/net-wireless/at76c503a/at76c503a-0.12_beta23.ebuild b/net-wireless/at76c503a/at76c503a-0.12_beta23-r3.ebuild
index 6a7538f64ff0..a854ef68fb1e 100644
--- a/net-wireless/at76c503a/at76c503a-0.12_beta23.ebuild
+++ b/net-wireless/at76c503a/at76c503a-0.12_beta23-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.12_beta23.ebuild,v 1.3 2005/11/20 00:01:20 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.12_beta23-r3.ebuild,v 1.1 2006/03/09 19:53:00 genstef Exp $
 
 inherit linux-mod eutils
 
 MY_P=${PN}_${PV/_beta/.beta}
-SRC_PATCH="${MY_P}-1.diff"
+SRC_PATCH="${MY_P}-7.diff"
 DESCRIPTION="at76c503 is a Linux driver for the wlan USB adapter based on the Atmel at76c503 chip. It currently supports ad-hoc mode, infrastructure mode, and WEP. It supports adapters from Atmel, the Belkin F5D6050, Netgear MA101, and others."
 HOMEPAGE="http://developer.berlios.de/projects/at76c503a/"
 SRC_URI="mirror://debian/pool/contrib/a/at76c503a/${MY_P}.orig.tar.gz
@@ -36,6 +36,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/${SRC_PATCH}
+	epatch ${FILESDIR}/at76-7-gcc4.diff
 	convert_to_m Makefile
 	sed -si "s:-cp \$(KERNEL_SRC)/.tmp_versions/\*.mod \$(MODVERDIR)::" Makefile
 }
diff --git a/net-wireless/at76c503a/files/at76-7-gcc4.diff b/net-wireless/at76c503a/files/at76-7-gcc4.diff
new file mode 100644
index 000000000000..851c30fad91a
--- /dev/null
+++ b/net-wireless/at76c503a/files/at76-7-gcc4.diff
@@ -0,0 +1,106 @@
+diff -Naur at76c503a-0.12.beta23.orig/at76c503.c at76c503a-0.12.beta23.mod/at76c503.c
+--- at76c503a-0.12.beta23.orig/at76c503.c	2006-03-09 21:07:26.000000000 +0300
++++ at76c503a-0.12.beta23.mod/at76c503.c	2006-03-09 21:27:29.000000000 +0300
+@@ -279,60 +279,60 @@
+ #define DRIVER_DESC "Generic Atmel at76c503/at76c505 routines"
+ 
+ /* Module paramaters */
+-MODULE_PARM(debug, "i");
++module_param(debug, int, 0);
+ #define DRIVER_AUTHOR \
+ "Oliver Kurth, Joerg Albert <joerg.albert@gmx.de>, Alex, Nick Jones, "\
+ "Balint Seeber <n0_5p4m_p13453@hotmail.com>"
+ MODULE_PARM_DESC(debug, "Debugging level");
+ 
+ static int rx_copybreak = 200;
+-MODULE_PARM(rx_copybreak, "i");
++module_param(rx_copybreak, int, 0);
+ MODULE_PARM_DESC(rx_copybreak, "rx packet copy threshold");
+ 
+ static int scan_min_time = 10;
+-MODULE_PARM(scan_min_time, "i");
++module_param(scan_min_time, int, 0);
+ MODULE_PARM_DESC(scan_min_time, "scan min channel time (default: 10)");
+ 
+ static int scan_max_time = 120;
+-MODULE_PARM(scan_max_time, "i");
++module_param(scan_max_time, int, 0);
+ MODULE_PARM_DESC(scan_max_time, "scan max channel time (default: 120)");
+ 
+ static int scan_mode = SCAN_TYPE_ACTIVE;
+-MODULE_PARM(scan_mode, "i");
++module_param(scan_mode, int, 0);
+ MODULE_PARM_DESC(scan_mode, "scan mode: 0 active (with ProbeReq, default), 1 passive");
+ 
+ static int preamble_type = PREAMBLE_TYPE_LONG;
+-MODULE_PARM(preamble_type, "i");
++module_param(preamble_type, int, 0);
+ MODULE_PARM_DESC(preamble_type, "preamble type: 0 long (default), 1 short");
+ 
+ static int auth_mode = 0;
+-MODULE_PARM(auth_mode, "i");
++module_param(auth_mode, int, 0);
+ MODULE_PARM_DESC(auth_mode, "authentication mode: 0 open system (default), "
+ 		 "1 shared secret");
+ 
+ static int pm_mode = PM_ACTIVE;
+-MODULE_PARM(pm_mode, "i");
++module_param(pm_mode, int, 0);
+ MODULE_PARM_DESC(pm_mode, "power management mode: 1 active (def.), 2 powersave, 3 smart save");
+ 
+ static int pm_period = 0;
+-MODULE_PARM(pm_period, "i");
++module_param(pm_period, int, 0);
+ MODULE_PARM_DESC(pm_period, "period of waking up the device in usec");
+ 
+ static int international_roaming = IR_OFF;
+-MODULE_PARM(international_roaming, "i");
++module_param(international_roaming, int, 0);
+ MODULE_PARM_DESC(international_roaming, "enable international roaming: 0 (no, default), 1 (yes)");
+ 
+ static int default_iw_mode = IW_MODE_INFRA;
+-MODULE_PARM(default_iw_mode, "i");
++module_param(default_iw_mode, int, 0);
+ MODULE_PARM_DESC(default_iw_mode, "default IW mode for a new device: "
+ 		 "1 (ad-hoc), 2 (infrastructure, def.), 6 (monitor mode)");
+ 
+ static int monitor_scan_min_time = 50;
+-MODULE_PARM(monitor_scan_min_time, "i");
++module_param(monitor_scan_min_time, int, 0);
+ MODULE_PARM_DESC(monitor_scan_min_time, "scan min channel time in MONITOR MODE (default: 50)");
+ 
+ static int monitor_scan_max_time = 600;
+-MODULE_PARM(monitor_scan_max_time, "i");
++module_param(monitor_scan_max_time, int, 0);
+ MODULE_PARM_DESC(monitor_scan_max_time, "scan max channel time in MONITOR MODE (default: 600)");
+ 
+ #define DEF_RTS_THRESHOLD 1536
+diff -Naur at76c503a-0.12.beta23.orig/at76c503-fw_skel.c at76c503a-0.12.beta23.mod/at76c503-fw_skel.c
+--- at76c503a-0.12.beta23.orig/at76c503-fw_skel.c	2006-03-09 21:07:26.000000000 +0300
++++ at76c503a-0.12.beta23.mod/at76c503-fw_skel.c	2006-03-09 21:30:02.000000000 +0300
+@@ -40,11 +40,11 @@
+ /* Module paramaters */
+ 
+ static char netdev_name[IFNAMSIZ+1] = "wlan%d";
+-MODULE_PARM(netdev_name, "c" __MODULE_STRING(IFNAMSIZ));
++module_param(netdev_name, charp, 0);
+ MODULE_PARM_DESC(netdev_name,
+                  "network device name (default is wlan%d)");
+ static int debug = 1;
+-MODULE_PARM(debug, "i");
++module_param(debug, int, 0);
+ MODULE_PARM_DESC(debug,
+                  "debug output (default: 1)");
+ 
+diff -Naur at76c503a-0.12.beta23.orig/at76_usbdfu.c at76c503a-0.12.beta23.mod/at76_usbdfu.c
+--- at76c503a-0.12.beta23.orig/at76_usbdfu.c	2004-09-05 18:06:47.000000000 +0400
++++ at76c503a-0.12.beta23.mod/at76_usbdfu.c	2006-03-09 21:27:56.000000000 +0300
+@@ -57,7 +57,7 @@
+ #define DRIVER_DESC "USB Device Firmware Upgrade (DFU) handler"
+ 
+ /* Module paramaters */
+-MODULE_PARM(debug, "i");
++module_param(debug, int, 0);
+ MODULE_PARM_DESC(debug, "debug enabled (=1)");
+ 
+ /* DFU states */
diff --git a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta19 b/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta19
deleted file mode 100644
index 970bfa6b066c..000000000000
--- a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta19
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d871822ad69cf270d3cb1fa038990067 at76c503a_0.12.beta19-4.diff.gz 7562
-MD5 9ffd3400b79df0c72651572455e6c857 at76c503a_0.12.beta19.orig.tar.gz 88641
diff --git a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23 b/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23
deleted file mode 100644
index 6bab29bf5dc6..000000000000
--- a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 181db93685faef6fb66f223464529d64 at76c503a_0.12.beta23-1.diff.gz 4705
-MD5 e229684679a1d3926bbbf55100026d10 at76c503a_0.12.beta23.orig.tar.gz 89639
diff --git a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r1 b/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r1
deleted file mode 100644
index 6bab29bf5dc6..000000000000
--- a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 181db93685faef6fb66f223464529d64 at76c503a_0.12.beta23-1.diff.gz 4705
-MD5 e229684679a1d3926bbbf55100026d10 at76c503a_0.12.beta23.orig.tar.gz 89639
diff --git a/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r3 b/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r3
new file mode 100644
index 000000000000..fb7d55399936
--- /dev/null
+++ b/net-wireless/at76c503a/files/digest-at76c503a-0.12_beta23-r3
@@ -0,0 +1,6 @@
+MD5 d9b7cb2dd412a6fbf892c87d9c073bf0 at76c503a_0.12.beta23-7.diff.gz 8878
+RMD160 fd81592a83566c683b834ecef7d22167bbc2c685 at76c503a_0.12.beta23-7.diff.gz 8878
+SHA256 43130bdc4d8a2959d36b6eced3300c51cdce15d7c9f6972a77c7bf662d24ef20 at76c503a_0.12.beta23-7.diff.gz 8878
+MD5 e229684679a1d3926bbbf55100026d10 at76c503a_0.12.beta23.orig.tar.gz 89639
+RMD160 76680b9754d2d5dbbc962e23036576a4f3b02f84 at76c503a_0.12.beta23.orig.tar.gz 89639
+SHA256 c59433a49b7dd4dcdd7371d49890d1af55e3b113f5395ceac684ab6be6681ec2 at76c503a_0.12.beta23.orig.tar.gz 89639