diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2006-06-25 11:06:25 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-06-25 11:06:25 +0000 |
commit | dc14254771eadf5f72c91fc3d732215054016558 (patch) | |
tree | ef407d060e3d518e3ca6dbd7e62687d75b74ff73 /net-wireless | |
parent | Pruned old versions. (diff) | |
download | historical-dc14254771eadf5f72c91fc3d732215054016558.tar.gz historical-dc14254771eadf5f72c91fc3d732215054016558.tar.bz2 historical-dc14254771eadf5f72c91fc3d732215054016558.zip |
Pruned old versions.
Package-Manager: portage-2.1-r1
Diffstat (limited to 'net-wireless')
29 files changed, 42 insertions, 1182 deletions
diff --git a/net-wireless/madwifi-ng-tools/Manifest b/net-wireless/madwifi-ng-tools/Manifest index 4564fb1b88b3..27998666e8fc 100644 --- a/net-wireless/madwifi-ng-tools/Manifest +++ b/net-wireless/madwifi-ng-tools/Manifest @@ -1,21 +1,24 @@ -MD5 5a4b837b9ad7c53d47b4a73f82bb4752 ChangeLog 5406 -MD5 6225a58b69ebeb67ff97ab4026b21e58 files/digest-madwifi-ng-tools-0.1401.20060117 78 -MD5 04ecb172d5d25d2995578d1772e2c239 files/digest-madwifi-ng-tools-0.1420.20060201 78 -MD5 94fa700e7f5c8ec3598c00b31c724525 files/digest-madwifi-ng-tools-0.1440.20060206 78 -MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-ng-tools-0.1443.20060207 78 -MD5 a505c0375ea7fdfc85976a0fc0866c6c files/digest-madwifi-ng-tools-0.1473.20060312 78 -MD5 cb9bb227fc8875077d219e7bcae57ba5 files/digest-madwifi-ng-tools-0.1485.20060325 78 -MD5 f97361e3508b06548cb54b3992459d7b files/digest-madwifi-ng-tools-0.1502.20060414 78 -MD5 1e8c2150ad4b3de67d9d61313a9f8a5f files/digest-madwifi-ng-tools-0.1531.20060427 78 -MD5 3b977ab622651738d159d4559e670e25 files/madwifi-ng-tools-0.1401.20060117-udev.rules 355 -MD5 3b977ab622651738d159d4559e670e25 files/madwifi-ng-tools-0.1420.20060201-udev.rules 355 -MD5 3b977ab622651738d159d4559e670e25 files/madwifi-ng-tools-0.1440.20060206-udev.rules 355 -MD5 e6b33e1a892af1c4c924f6a02997411e madwifi-ng-tools-0.1401.20060117.ebuild 1761 -MD5 7b37eac8b8527a05cfac52828cf10a72 madwifi-ng-tools-0.1420.20060201.ebuild 1787 -MD5 2422aa68e227f1c6e24fdbf141ec3d48 madwifi-ng-tools-0.1440.20060206.ebuild 1787 +DIST madwifi-ng-r1443-20060207.tar.gz 3249472 +DIST madwifi-ng-r1531-20060427.tar.gz 3117258 RMD160 823936efefeda2556c96184bc35daedd80922675 SHA1 eda264ff86772dd6b4f089efaa842a2bd51ecdc9 SHA256 5989216539f4c7188737c7e23e4c78e0765347d37e12df6d7e0e9cd2e22a087a +EBUILD madwifi-ng-tools-0.1443.20060207.ebuild 1583 RMD160 bb34c8c7087990b6c4a0a3e9ca2f8f3a2c55638b SHA1 3dc8dab51db28262d6b86cda90f8110840f2b014 SHA256 f4078ca20d87aa0a232eeef76c678a324e974c1b9e2628ccb797445a4d7f7d65 MD5 694e6f8d85bd9b04e9887b1b0e7c6da8 madwifi-ng-tools-0.1443.20060207.ebuild 1583 -MD5 234c498f8d3502cf4e0e30ed1d45c4a2 madwifi-ng-tools-0.1473.20060312.ebuild 1584 -MD5 61d227d7e1c4c33a5d31c97e13b2f963 madwifi-ng-tools-0.1485.20060325.ebuild 1584 -MD5 296a0813d6392c2578ec7068d5826912 madwifi-ng-tools-0.1502.20060414.ebuild 1603 +RMD160 bb34c8c7087990b6c4a0a3e9ca2f8f3a2c55638b madwifi-ng-tools-0.1443.20060207.ebuild 1583 +SHA256 f4078ca20d87aa0a232eeef76c678a324e974c1b9e2628ccb797445a4d7f7d65 madwifi-ng-tools-0.1443.20060207.ebuild 1583 +EBUILD madwifi-ng-tools-0.1531.20060427.ebuild 1602 RMD160 bdaf1ddf8f47fd6cc08f501730d5580ebd95198e SHA1 bd83df7924a3a7f3128ef8c4a1e474160125659a SHA256 21873fd53381da087481e42080ab8798f58bfc9134494244789ec8fe16171dd5 MD5 042e87543b81c0f91e3c57fcdfd41ee0 madwifi-ng-tools-0.1531.20060427.ebuild 1602 +RMD160 bdaf1ddf8f47fd6cc08f501730d5580ebd95198e madwifi-ng-tools-0.1531.20060427.ebuild 1602 +SHA256 21873fd53381da087481e42080ab8798f58bfc9134494244789ec8fe16171dd5 madwifi-ng-tools-0.1531.20060427.ebuild 1602 +MISC ChangeLog 5910 RMD160 3821c32010fb11b7227cc606c5a5664eae5a0db4 SHA1 7116e41b4a1930c27d25619e77a38d2f80e47972 SHA256 0b8842fa9a91ab5cfd9bb1a6c29bd391d6a28c3de1b530532973a47db8351616 +MD5 7f7e4946836abcd7d4f755b8ac108c55 ChangeLog 5910 +RMD160 3821c32010fb11b7227cc606c5a5664eae5a0db4 ChangeLog 5910 +SHA256 0b8842fa9a91ab5cfd9bb1a6c29bd391d6a28c3de1b530532973a47db8351616 ChangeLog 5910 +MISC metadata.xml 255 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 SHA1 1258e0419f1fe7839c4db37602b5999d0e196bca SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 +RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 metadata.xml 255 +SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 metadata.xml 255 +MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-ng-tools-0.1443.20060207 78 +RMD160 b0c6bbc4f72097ad117169aa94acf30c0ead5f4c files/digest-madwifi-ng-tools-0.1443.20060207 78 +SHA256 2a1682a57b784414f50e75faa3e7533a7e5538bda4f6bc0bda69ceea281c46e0 files/digest-madwifi-ng-tools-0.1443.20060207 78 +MD5 28c9a95778241e4c3a73c1e9b15e8d8f files/digest-madwifi-ng-tools-0.1531.20060427 280 +RMD160 db9eab5e04a53c5fbeb76f00d59de0dd7d28320f files/digest-madwifi-ng-tools-0.1531.20060427 280 +SHA256 bd8b772f3517f64508d610243e70fba53120ce64058b2c652d21d93b8194a787 files/digest-madwifi-ng-tools-0.1531.20060427 280 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1401.20060117 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1401.20060117 deleted file mode 100644 index ac1f6c432a45..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1401.20060117 +++ /dev/null @@ -1 +0,0 @@ -MD5 1a99b4b3c32e41911bc20ca0870f64b0 madwifi-ng-r1401-20060117.tar.gz 3196291 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1420.20060201 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1420.20060201 deleted file mode 100644 index f2065bf75b64..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1420.20060201 +++ /dev/null @@ -1 +0,0 @@ -MD5 7aec9b28cc27519d5d58addc81bda290 madwifi-ng-r1420-20060201.tar.gz 3249497 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1440.20060206 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1440.20060206 deleted file mode 100644 index 4d249e405f84..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1440.20060206 +++ /dev/null @@ -1 +0,0 @@ -MD5 12ee6032818ee5ee5371da5c65f2d5ed madwifi-ng-r1440-20060206.tar.gz 3249614 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1473.20060312 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1473.20060312 deleted file mode 100644 index 110a69d918b6..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1473.20060312 +++ /dev/null @@ -1 +0,0 @@ -MD5 f4f057f4b416adc4f517c9bfc209a986 madwifi-ng-r1473-20060312.tar.gz 3107599 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1485.20060325 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1485.20060325 deleted file mode 100644 index 7bf0a487c531..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1485.20060325 +++ /dev/null @@ -1 +0,0 @@ -MD5 39e321eacb93e84f8a7a72a41dc611fc madwifi-ng-r1485-20060325.tar.gz 3108740 diff --git a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1502.20060414 b/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1502.20060414 deleted file mode 100644 index b340de8b9556..000000000000 --- a/net-wireless/madwifi-ng-tools/files/digest-madwifi-ng-tools-0.1502.20060414 +++ /dev/null @@ -1 +0,0 @@ -MD5 a65dfb227d80dfe23813e481407e115d madwifi-ng-r1502-20060414.tar.gz 3114204 diff --git a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1401.20060117-udev.rules b/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1401.20060117-udev.rules deleted file mode 100644 index e6d72b1874a9..000000000000 --- a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1401.20060117-udev.rules +++ /dev/null @@ -1,9 +0,0 @@ -# Madwifi devices -# -# See wlanconfig(8) for more information -# -# Access Point configuration -#KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode ap" -# -# Normal station configuration -KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode sta" diff --git a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1420.20060201-udev.rules b/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1420.20060201-udev.rules deleted file mode 100644 index e6d72b1874a9..000000000000 --- a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1420.20060201-udev.rules +++ /dev/null @@ -1,9 +0,0 @@ -# Madwifi devices -# -# See wlanconfig(8) for more information -# -# Access Point configuration -#KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode ap" -# -# Normal station configuration -KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode sta" diff --git a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1440.20060206-udev.rules b/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1440.20060206-udev.rules deleted file mode 100644 index e6d72b1874a9..000000000000 --- a/net-wireless/madwifi-ng-tools/files/madwifi-ng-tools-0.1440.20060206-udev.rules +++ /dev/null @@ -1,9 +0,0 @@ -# Madwifi devices -# -# See wlanconfig(8) for more information -# -# Access Point configuration -#KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode ap" -# -# Normal station configuration -KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode sta" diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1401.20060117.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1401.20060117.ebuild deleted file mode 100644 index 31e78d2528be..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1401.20060117.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1401.20060117.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P}/tools - -DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="udev" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' ${S}/athstats.c - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/Makefile || die -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man install || die "make install failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin - - if use udev; then - insinto /etc/udev/rules.d/ - newins ${FILESDIR}/${P}-udev.rules 65-madwifi.rules || die - fi -} - -pkg_postinst() { - einfo - einfo "Interfaces (athX) needs to be added using wlanconfig(8) after" - einfo "loading madwifi-driver." - einfo - if use udev; then - einfo "Example udev rules for automatically taking care of this has been" - einfo "installed to:" - einfo - einfo " /etc/udev/rules.d/65-madwifi.rules" - einfo - einfo "Modify these rules to match your configuration and either run 'udevstart'" - einfo "or reboot for the rules to take effect." - einfo - fi -} diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1420.20060201.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1420.20060201.ebuild deleted file mode 100644 index b716a5669481..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1420.20060201.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1420.20060201.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P}/tools - -DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="udev" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i \ - -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \ - ${S}/athstats.c || die - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/Makefile || die -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man install || die "make install failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin - - if use udev; then - insinto /etc/udev/rules.d/ - newins ${FILESDIR}/${P}-udev.rules 65-madwifi.rules || die - fi -} - -pkg_postinst() { - einfo - einfo "Interfaces (athX) needs to be added using wlanconfig(8) after" - einfo "loading the madwifi kernel module." - einfo - if use udev; then - einfo "Example udev rules for automatically taking care of this has been" - einfo "installed to:" - einfo - einfo " /etc/udev/rules.d/65-madwifi.rules" - einfo - einfo "Modify these rules to match your configuration and either run 'udevstart'" - einfo "or reboot for the rules to take effect." - einfo - fi -} diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1440.20060206.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1440.20060206.ebuild deleted file mode 100644 index 4989f4a917fc..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1440.20060206.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1440.20060206.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P}/tools - -DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="udev" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i \ - -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \ - ${S}/athstats.c || die - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/Makefile || die -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man install || die "make install failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin - - if use udev; then - insinto /etc/udev/rules.d/ - newins ${FILESDIR}/${P}-udev.rules 65-madwifi.rules || die - fi -} - -pkg_postinst() { - einfo - einfo "Interfaces (athX) needs to be added using wlanconfig(8) after" - einfo "loading the madwifi kernel module." - einfo - if use udev; then - einfo "Example udev rules for automatically taking care of this has been" - einfo "installed to:" - einfo - einfo " /etc/udev/rules.d/65-madwifi.rules" - einfo - einfo "Modify these rules to match your configuration and either run 'udevstart'" - einfo "or reboot for the rules to take effect." - einfo - fi -} diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1473.20060312.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1473.20060312.ebuild deleted file mode 100644 index 452e4a3c2b3c..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1473.20060312.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1473.20060312.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i \ - -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \ - ${S}/tools/athstats.c || die - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/tools/Makefile || die -} - -src_compile() { - emake tools || die "emake tools failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \ - install-tools || die "make install-tools failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin -} - -pkg_postinst() { - if [ -e "${ROOT}"/etc/udev/rules.d/65-madwifi.rules ]; then - ewarn - ewarn "The udev rules for creating interfaces (athX) are no longer needed." - ewarn - ewarn "You should manually remove the /etc/udev/rules.d/65-madwifi.rules file" - ewarn "and either run 'udevstart' or reboot for the changes to take effect." - ewarn - fi -} diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1485.20060325.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1485.20060325.ebuild deleted file mode 100644 index d4f0bc82d775..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1485.20060325.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1485.20060325.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i \ - -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \ - ${S}/tools/athstats.c || die - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/tools/Makefile || die -} - -src_compile() { - emake tools || die "emake tools failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \ - install-tools || die "make install-tools failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin -} - -pkg_postinst() { - if [ -e "${ROOT}"/etc/udev/rules.d/65-madwifi.rules ]; then - ewarn - ewarn "The udev rules for creating interfaces (athX) are no longer needed." - ewarn - ewarn "You should manually remove the /etc/udev/rules.d/65-madwifi.rules file" - ewarn "and either run 'udevstart' or reboot for the changes to take effect." - ewarn - fi -} diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1502.20060414.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1502.20060414.ebuild deleted file mode 100644 index 98d5d1922a11..000000000000 --- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1502.20060414.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.1502.20060414.ebuild,v 1.1 2006/04/14 13:41:51 brix Exp $ - -inherit toolchain-funcs - -MY_P=${PN/-tools/}-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Next Generation tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" -DEPEND="virtual/libc" -RDEPEND="!net-wireless/madwifi-old-tools - ${DEPEND}" - -src_unpack() { - unpack ${A} - - # format string fix from solar - sed -i \ - -e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \ - ${S}/tools/athstats.c || die - - sed -i \ - -e "s:CC =.*:CC = $(tc-getCC):" \ - -e "s:CFLAGS=:CFLAGS+=:" \ - -e "s:LDFLAGS=:LDFLAGS+=:" \ - ${S}/tools/Makefile || die -} - -src_compile() { - emake tools || die "emake tools failed" -} - -src_install() { - make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \ - install-tools || die "make install-tools failed" - - dodir /sbin - mv "${D}"/usr/bin/wlanconfig "${D}"/sbin -} - -pkg_postinst() { - if [ -e "${ROOT}"/etc/udev/rules.d/65-madwifi.rules ]; then - ewarn - ewarn "The udev rules for creating interfaces (athX) are no longer needed." - ewarn - ewarn "You should manually remove the /etc/udev/rules.d/65-madwifi.rules file" - ewarn "and either run 'udevstart' or reboot for the changes to take effect." - ewarn - fi -} diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest index 642c3c37162b..4188acf39c6d 100644 --- a/net-wireless/madwifi-ng/Manifest +++ b/net-wireless/madwifi-ng/Manifest @@ -1,18 +1,24 @@ -MD5 32f97c79c4b976a2b53a744be9e1c5f8 ChangeLog 9841 -MD5 6225a58b69ebeb67ff97ab4026b21e58 files/digest-madwifi-ng-0.1401.20060117 78 -MD5 04ecb172d5d25d2995578d1772e2c239 files/digest-madwifi-ng-0.1420.20060201 78 -MD5 94fa700e7f5c8ec3598c00b31c724525 files/digest-madwifi-ng-0.1440.20060206 78 -MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-ng-0.1443.20060207 78 -MD5 a505c0375ea7fdfc85976a0fc0866c6c files/digest-madwifi-ng-0.1473.20060312 78 -MD5 cb9bb227fc8875077d219e7bcae57ba5 files/digest-madwifi-ng-0.1485.20060325 78 -MD5 f97361e3508b06548cb54b3992459d7b files/digest-madwifi-ng-0.1502.20060414 78 -MD5 1e8c2150ad4b3de67d9d61313a9f8a5f files/digest-madwifi-ng-0.1531.20060427 78 -MD5 50490c8660399ce1ad9e2baad987a99b madwifi-ng-0.1401.20060117.ebuild 3596 -MD5 e626a838009a50758c878d92f8f46861 madwifi-ng-0.1420.20060201.ebuild 3512 -MD5 de3f07cf2748ba4525f5dd9d1e316c58 madwifi-ng-0.1440.20060206.ebuild 3558 +DIST madwifi-ng-r1443-20060207.tar.gz 3249472 +DIST madwifi-ng-r1531-20060427.tar.gz 3117258 RMD160 823936efefeda2556c96184bc35daedd80922675 SHA1 eda264ff86772dd6b4f089efaa842a2bd51ecdc9 SHA256 5989216539f4c7188737c7e23e4c78e0765347d37e12df6d7e0e9cd2e22a087a +EBUILD madwifi-ng-0.1443.20060207.ebuild 3814 RMD160 7706b4dbec81379db17062553442735809552433 SHA1 c373622a06d0818248cc631bc9148f71cc52f319 SHA256 50e7e41596cc970ed1fd167bb68af358b722ef3b81b449ba8643558b6d081cbf MD5 b5dd9cee4af713c1cba3c907f0e41785 madwifi-ng-0.1443.20060207.ebuild 3814 -MD5 798822f88b9786db5d26e9b5e74011ad madwifi-ng-0.1473.20060312.ebuild 3815 -MD5 4baa7dacd5b13a2e70db94f45ba7d1a3 madwifi-ng-0.1485.20060325.ebuild 3815 -MD5 ce30e6957bb5a754a0f8da81cb4c6eb0 madwifi-ng-0.1502.20060414.ebuild 3826 +RMD160 7706b4dbec81379db17062553442735809552433 madwifi-ng-0.1443.20060207.ebuild 3814 +SHA256 50e7e41596cc970ed1fd167bb68af358b722ef3b81b449ba8643558b6d081cbf madwifi-ng-0.1443.20060207.ebuild 3814 +EBUILD madwifi-ng-0.1531.20060427.ebuild 3825 RMD160 02dccbf3f2108d70fb1a44f7efb3dd28f5b56c73 SHA1 ae94a94e07a02218dedef2b6c9d32baa3d27f9ef SHA256 d07696878b41c0814d74694e21cd262240f796fe0f4904c2b30ce52a30da196e MD5 f9934fe425a194bbc7f8577ada7eb3ea madwifi-ng-0.1531.20060427.ebuild 3825 +RMD160 02dccbf3f2108d70fb1a44f7efb3dd28f5b56c73 madwifi-ng-0.1531.20060427.ebuild 3825 +SHA256 d07696878b41c0814d74694e21cd262240f796fe0f4904c2b30ce52a30da196e madwifi-ng-0.1531.20060427.ebuild 3825 +MISC ChangeLog 10141 RMD160 66ce0779cbf29bce2da67f0bf0c42841cbf58d7f SHA1 409e3d3e6401f27586f247c00ac8796071383651 SHA256 27109292096bcaf2258367bb27bbd054aad202e98db33c46aea67dbc087692b8 +MD5 b7f431360a505dcab42cbcbbf3d829c0 ChangeLog 10141 +RMD160 66ce0779cbf29bce2da67f0bf0c42841cbf58d7f ChangeLog 10141 +SHA256 27109292096bcaf2258367bb27bbd054aad202e98db33c46aea67dbc087692b8 ChangeLog 10141 +MISC metadata.xml 255 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 SHA1 1258e0419f1fe7839c4db37602b5999d0e196bca SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 +RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 metadata.xml 255 +SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 metadata.xml 255 +MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-ng-0.1443.20060207 78 +RMD160 b0c6bbc4f72097ad117169aa94acf30c0ead5f4c files/digest-madwifi-ng-0.1443.20060207 78 +SHA256 2a1682a57b784414f50e75faa3e7533a7e5538bda4f6bc0bda69ceea281c46e0 files/digest-madwifi-ng-0.1443.20060207 78 +MD5 28c9a95778241e4c3a73c1e9b15e8d8f files/digest-madwifi-ng-0.1531.20060427 280 +RMD160 db9eab5e04a53c5fbeb76f00d59de0dd7d28320f files/digest-madwifi-ng-0.1531.20060427 280 +SHA256 bd8b772f3517f64508d610243e70fba53120ce64058b2c652d21d93b8194a787 files/digest-madwifi-ng-0.1531.20060427 280 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1401.20060117 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1401.20060117 deleted file mode 100644 index ac1f6c432a45..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1401.20060117 +++ /dev/null @@ -1 +0,0 @@ -MD5 1a99b4b3c32e41911bc20ca0870f64b0 madwifi-ng-r1401-20060117.tar.gz 3196291 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1420.20060201 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1420.20060201 deleted file mode 100644 index f2065bf75b64..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1420.20060201 +++ /dev/null @@ -1 +0,0 @@ -MD5 7aec9b28cc27519d5d58addc81bda290 madwifi-ng-r1420-20060201.tar.gz 3249497 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1440.20060206 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1440.20060206 deleted file mode 100644 index 4d249e405f84..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1440.20060206 +++ /dev/null @@ -1 +0,0 @@ -MD5 12ee6032818ee5ee5371da5c65f2d5ed madwifi-ng-r1440-20060206.tar.gz 3249614 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1473.20060312 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1473.20060312 deleted file mode 100644 index 110a69d918b6..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1473.20060312 +++ /dev/null @@ -1 +0,0 @@ -MD5 f4f057f4b416adc4f517c9bfc209a986 madwifi-ng-r1473-20060312.tar.gz 3107599 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1485.20060325 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1485.20060325 deleted file mode 100644 index 7bf0a487c531..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1485.20060325 +++ /dev/null @@ -1 +0,0 @@ -MD5 39e321eacb93e84f8a7a72a41dc611fc madwifi-ng-r1485-20060325.tar.gz 3108740 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1502.20060414 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1502.20060414 deleted file mode 100644 index b340de8b9556..000000000000 --- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.1502.20060414 +++ /dev/null @@ -1 +0,0 @@ -MD5 a65dfb227d80dfe23813e481407e115d madwifi-ng-r1502-20060414.tar.gz 3114204 diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1401.20060117.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1401.20060117.ebuild deleted file mode 100644 index 270296893759..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1401.20060117.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1401.20060117.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # make fails to determine TARGET if ARCH is set - unset ARCH - - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - linux-mod_src_compile - - set_arch_to_portage -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1420.20060201.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1420.20060201.ebuild deleted file mode 100644 index 1242f6e3632b..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1420.20060201.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1420.20060201.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1440.20060206.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1440.20060206.ebuild deleted file mode 100644 index c62130dc7890..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1440.20060206.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1440.20060206.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - # needed by the modules - emake svnversion.h - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1473.20060312.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1473.20060312.ebuild deleted file mode 100644 index 6f90c8d7ce98..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1473.20060312.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1473.20060312.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" -MODULESD_ATH_PCI_DOCS="README" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - # needed by the modules - emake svnversion.h - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "Interfaces (athX) are now automatically created upon loading the ath_pci" - einfo "module." - einfo - einfo "The type of the created interface can be controlled through the 'autocreate'" - einfo "module parameter." - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1485.20060325.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1485.20060325.ebuild deleted file mode 100644 index 85b61ce2a2ba..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1485.20060325.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1485.20060325.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" -MODULESD_ATH_PCI_DOCS="README" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - # needed by the modules - emake svnversion.h - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "Interfaces (athX) are now automatically created upon loading the ath_pci" - einfo "module." - einfo - einfo "The type of the created interface can be controlled through the 'autocreate'" - einfo "module parameter." - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.1502.20060414.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.1502.20060414.ebuild deleted file mode 100644 index 74497c455296..000000000000 --- a/net-wireless/madwifi-ng/madwifi-ng-0.1502.20060414.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.1502.20060414.ebuild,v 1.1 2006/04/14 13:52:48 brix Exp $ - -inherit linux-mod - -MY_P=${PN}-r${PV:2:4}-${PV:7:8} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards" -HOMEPAGE="http://www.madwifi.org/" -SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="amrr onoe" -DEPEND="app-arch/sharutils" -RDEPEND="!net-wireless/madwifi-old - >=net-wireless/madwifi-ng-tools-${PV}" - -CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" -ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." -ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)." -BUILD_TARGETS="all" -MODULESD_ATH_PCI_DOCS="README" - -pkg_setup() { - linux-mod_pkg_setup - - MODULE_NAMES="ath_hal(net:${S}/ath_hal) - wlan(net:${S}/net80211) - wlan_acl(net:${S}/net80211) - wlan_ccmp(net:${S}/net80211) - wlan_tkip(net:${S}/net80211) - wlan_wep(net:${S}/net80211) - wlan_xauth(net:${S}/net80211) - wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" -} - -src_unpack() { - unpack ${A} - - cd ${S} - for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do - convert_to_m ${S}/${dir}/Makefile - done -} - -src_compile() { - # assists in debugging - emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed" - - # needed by the modules - emake svnversion.h - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt - - # install headers for use by - # net-wireless/wpa_supplicant and net-wireless/hostapd - insinto /usr/include/madwifi/include/ - doins include/*.h - insinto /usr/include/madwifi/net80211 - doins net80211/*.h -} - -pkg_postinst() { - local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - - linux-mod_pkg_postinst - - einfo - einfo "Interfaces (athX) are now automatically created upon loading the ath_pci" - einfo "module." - einfo - einfo "The type of the created interface can be controlled through the 'autocreate'" - einfo "module parameter." - einfo - einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi" - einfo "you should remerge them now." - einfo -} |