Cleanup and testing

svn path=/; revision=295

14 files changed, 63 insertions, 945 deletions

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
new file mode 100644
index 0000000..5b0adcb
--- /dev/null
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.23 2009/11/01 12:17:21 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils distutils subversion flag-o-matic
+
+ESVN_REPO_URI="http://svn.deluge-torrent.org/trunk"
+ESVN_PROJECT="deluge"
+
+DESCRIPTION="BitTorrent client with a client/server model."
+HOMEPAGE="http://deluge-torrent.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk libnotify webinterface"
+
+DEPEND=">=virtual/python-2.5
+	>=net-libs/rb_libtorrent-0.14.5[python]
+	dev-python/setuptools"
+RDEPEND="${DEPEND}
+	dev-python/chardet
+	dev-python/pyopenssl
+	dev-python/pyxdg
+	|| ( >=virtual/python-2.6 dev-python/simplejson )
+	>=dev-python/twisted-8.1
+	>=dev-python/twisted-web-8.1
+	gtk? (
+		dev-python/pygame
+		dev-python/pygobject
+		>=dev-python/pygtk-2.12
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python )
+	)
+	webinterface? ( dev-python/mako )"
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
+src_install() {
+	distutils_src_install
+	newinitd "${FILESDIR}"/deluged.init deluged
+	newconfd "${FILESDIR}"/deluged.conf deluged
+}
+
+pkg_postinst() {
+	elog
+	elog "If after upgrading it doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-wireless/madwifi-ng-svn/ChangeLog b/net-wireless/madwifi-ng-svn/ChangeLog
deleted file mode 100644
index e74f761..0000000
--- a/net-wireless/madwifi-ng-svn/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for net-wireless/madwifi-ng-svn
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  16 Apr 2008; Jeff Gardner <je_fro@gentoo.org> ++,
-  -madwifi-ng-svn-3544.ebuild:
-  -m latest, hopefully fixes 32bit bug
-
diff --git a/net-wireless/madwifi-ng-svn/Manifest b/net-wireless/madwifi-ng-svn/Manifest
deleted file mode 100644
index 51f6657..0000000
--- a/net-wireless/madwifi-ng-svn/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea SHA1 3c84bf4e203ab3c810c734816dd1291ba19b0005 SHA256 be6e7a66acad56044c25ab56d9cbd7d5326c4ba21f5d9ed25caef56a9577bdc8
-AUX svnversion.h 31 RMD160 d73c1f1493ff6d2e5129a57ade0c19e12ac306d0 SHA1 05e08f811f02203fde4245d39e89846f0a72c9b5 SHA256 12cae6e93e934a5f817065d1eccab347513b4651d814ca275dc509e857398e0b
-EBUILD madwifi-ng-svn-3714.ebuild 2487 RMD160 dc5962dcb74f884b61f0f4d4677d8fbbce4174d0 SHA1 2d3fb5a80a017cb3dc06b4b7dfadc7ed6fc0bf7b SHA256 b1a16c63fff8d476f6a285d56c317fb4510d12b6df5e570446272b692b1ce21c
-EBUILD madwifi-ng-svn-3742.ebuild 2487 RMD160 dc5962dcb74f884b61f0f4d4677d8fbbce4174d0 SHA1 2d3fb5a80a017cb3dc06b4b7dfadc7ed6fc0bf7b SHA256 b1a16c63fff8d476f6a285d56c317fb4510d12b6df5e570446272b692b1ce21c
-EBUILD madwifi-ng-svn-3750.ebuild 2487 RMD160 dc5962dcb74f884b61f0f4d4677d8fbbce4174d0 SHA1 2d3fb5a80a017cb3dc06b4b7dfadc7ed6fc0bf7b SHA256 b1a16c63fff8d476f6a285d56c317fb4510d12b6df5e570446272b692b1ce21c
-EBUILD madwifi-ng-svn-3811.ebuild 2487 RMD160 dc5962dcb74f884b61f0f4d4677d8fbbce4174d0 SHA1 2d3fb5a80a017cb3dc06b4b7dfadc7ed6fc0bf7b SHA256 b1a16c63fff8d476f6a285d56c317fb4510d12b6df5e570446272b692b1ce21c
-EBUILD madwifi-ng-svn-3867.ebuild 2488 RMD160 be2b9ffb950bf8cfeed1fbe774f3bbc19eadc1d1 SHA1 1f8873f061c28bf8d94974d584cd392e154c052f SHA256 d287243f3eac47480f4d0253ed783de84d07b60c98ba76a2e67ecb4991cd31bc
-EBUILD madwifi-ng-svn-3876.ebuild 2504 RMD160 950e082c4bafb08d46ec80a2cb72553badab8891 SHA1 47df21e8640d5ea99848a721de5ca48ca191e6bb SHA256 8751a36dc44f66ac1595cd1740e3836637b4e52bbd5dd202aabeb93cc1a6b3ad
-EBUILD madwifi-ng-svn-9999.ebuild 2495 RMD160 05727fae6a335c38509b1a5b0e98094583ce9588 SHA1 02c6cdc7b412fbb8a1fab47b3f7303d262c85659 SHA256 feea704ce6943176e1fc788c4e3ee703caeda1919a7041def6ec9249c3a47c7c
-MISC ChangeLog 251 RMD160 4d4105cadc66c2d3465788b94d6a5340ccaa1c86 SHA1 c59738d9c4a46a5878927f7880904448c78ed63a SHA256 7513b76d59895c7617484e66f7636c32cd00a02da7305d55fa398538160d8907
diff --git a/net-wireless/madwifi-ng-svn/files/madwifi-ng-0.9.3-uudecode-gcda-fix.patch b/net-wireless/madwifi-ng-svn/files/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
deleted file mode 100644
index 686958c..0000000
--- a/net-wireless/madwifi-ng-svn/files/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ath_hal/Makefile
-===================================================================
---- ath_hal/Makefile	(revision 1648)
-+++ ath_hal/Makefile	(working copy)
-@@ -61,6 +61,7 @@
- ath_hal-objs	:= ah_osdep.o ${TARGET}.hal.o
- 
- hostprogs-y	:= uudecode
-+uudecode-objs	:= uudecode.o
- 
- # For older 2.6 kernels
- host-progs	:= $(hostprogs-y)
diff --git a/net-wireless/madwifi-ng-svn/files/svnversion.h b/net-wireless/madwifi-ng-svn/files/svnversion.h
deleted file mode 100644
index cf16d8a..0000000
--- a/net-wireless/madwifi-ng-svn/files/svnversion.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SVNVERSION "svn r3747"
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3714.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3714.ebuild
deleted file mode 100644
index c46a684..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3714.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3742.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3742.ebuild
deleted file mode 100644
index c46a684..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3742.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3750.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3750.ebuild
deleted file mode 100644
index c46a684..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3750.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3811.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3811.ebuild
deleted file mode 100644
index c46a684..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3811.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3867.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3867.ebuild
deleted file mode 100644
index 2b50c06..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3867.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-#	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3876.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3876.ebuild
deleted file mode 100644
index 200fe65..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-3876.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi-project.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn -r ${PV} update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi-project.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-#	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-9999.ebuild b/net-wireless/madwifi-ng-svn/madwifi-ng-svn-9999.ebuild
deleted file mode 100644
index 647c77e..0000000
--- a/net-wireless/madwifi-ng-svn/madwifi-ng-svn-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# This ebuild is intended for macbook pro users.
-
-inherit linux-mod subversion flag-o-matic
-
-ESVN_REPO_URI="http://svn.madwifi-project.org/madwifi/trunk/"
-ESVN_UPDATE_CMD="svn update"
-ESVN_PROJECT="madwifi-ng"
-
-DESCRIPTION="Wireless-ng driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://www.madwifi-project.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-
-S="${WORKDIR}"/madwifi
-
-CONFIG_CHECK="CRYPTO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-
-pkg_setup() {
-
-	if ! ( kernel_is ge 2 6 22 ); then
-		die "This only works on >=2.6.22 kernels"
-	fi
-
-	linux-mod_pkg_setup
-
-	use x86 && ARCH=i386
-	use amd64 && ARCH=x86_64
-	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)
-		ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample)
-		ath_rate_minstrel(net:${S}/ath_rate/minstrel)
-		ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		ARCH=${ARCH} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-
-	subversion_src_unpack
-
-	epatch "${FILESDIR}"/madwifi-ng-0.9.3-uudecode-gcda-fix.patch
-
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample ath_rate/minstrel
-	do
-		convert_to_m "${S}"/${dir}/Makefile
-	done
-
-#	cp "${FILESDIR}"/svnversion.h "${S}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	dodoc README
-# install headers for use by
-# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins "${S}"/include/*.h
-	insinto /usr/include/madwifi/include/sys/
-	doins "${S}"/include/sys/*.h
-	insinto /usr/include/madwifi/net80211
-	doins "${S}"/net80211/*.h
-
-	cd "${S}"/tools
-	emake DESTDIR="${D}" BINDIR=/sbin MANDIR=/usr/man install || die "emake install failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'wifiX'"
-	einfo ""
-	einfo "Any bugs with this ebuild report to je_fro@gentoo.org"
-}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
deleted file mode 100644
index 6437522..0000000
--- a/net-wireless/wpa_supplicant/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wpa_supplicant-0.5.10.tar.gz 720661 RMD160 8559827e5df80b50a8c7a9ddd2190189c1c689be SHA1 db2bba1df664675ff06c7e334e22a60c4e3a7a49 SHA256 c5c5ae89b4d3a247d4f5dcfa37e86df248d7e483d42636ef1f82c0bc48597dde
-EBUILD wpa_supplicant-0.5.10.ebuild 6551 RMD160 f9c7de234f263604847fd5226c8d7511561d9a44 SHA1 2b05f6158f1a058b49fd119e252056ed3dc23de0 SHA256 c55c05a9fc8e4a22db019bb075a985f3343db1fa86d662d41d7fbe7e1bb02a29
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
deleted file mode 100644
index 949457d..0000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild,v 1.3 2008/06/03 02:26:55 mr_bones_ Exp $
-
-inherit eutils toolchain-funcs
-
-# Modified by je_fro for his overlay. No longer depend on madwifi-ng-tools. Files are provided by 
-# madwifi-ng-svn in my overlay.
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
-		 	madwifi? ( net-wireless/madwifi-ng-svn )
-		)
-		!kernel_linux? ( net-libs/libpcap )
-		qt4? ( =x11-libs/qt-4* )
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
-		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-
-pkg_setup() {
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-
-	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		l2_packet_freebsd.c || die
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > .config
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	echo "CONFIG_EAP_LEAP=y"        >> .config
-	echo "CONFIG_EAP_MSCHAPV2=y"    >> .config
-	echo "CONFIG_EAP_PEAP=y"        >> .config
-	echo "CONFIG_EAP_TLS=y"         >> .config
-	echo "CONFIG_EAP_TTLS=y"        >> .config
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-	fi
-
-	if use gsm ; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> .config
-		echo "CONFIG_EAP_AKA=y" >> .config
-		echo "CONFIG_PCSC=y"    >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use gnutls ; then
-		echo "CONFIG_TLS=gnutls" >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	elif use ssl ; then
-		echo "CONFIG_TLS=openssl" >> .config
-		echo "CONFIG_SMARTCARD=y" >> .config
-	else
-		echo "CONFIG_TLS=internal" >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_PRISM54=y"     >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
-		fi
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# people seem to take the example configuration file too literally
-	# bug #102361
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations, #143750
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-		cd "${S}"/wpa_gui-qt4
-		emake || die "emake wpa_gui-qt4 failed"
-	elif use qt3 ; then
-		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
-		cd "${S}"/wpa_gui
-		emake || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-	dosym /usr/bin/wpa_cli /bin/wpa_cli
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	dodoc ChangeLog eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	if use qt3 || use qt4; then
-		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-		insinto /usr/share/dbus-1/system-services
-		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service'
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "A default configuration file has been installed to"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should remerge ${PN} after upgrading these packages."
-	fi
-}