diff options
8 files changed, 111 insertions, 65 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index d781860bff6a..417f516cc5b0 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.61 2006/06/21 19:58:07 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.62 2006/06/24 16:10:09 brix Exp $ + + 24 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> + -files/wpa_supplicant-0.5.2-wpa_cli.sh, + -files/wpa_supplicant-0.5.3-stakey.patch, + -files/wpa_supplicant-0.5.3-wpa_cli.sh, wpa_supplicant-0.4.7.ebuild, + wpa_supplicant-0.4.8.ebuild, wpa_supplicant-0.4.9.ebuild, + -wpa_supplicant-0.5.2.ebuild, -wpa_supplicant-0.5.3.ebuild, + wpa_supplicant-0.5.4.ebuild: + Switched to new qt3/qt4 USE flag scheme, thanks to Cardoe. Fixes bug + #137659. Also pruned old ebuilds. *wpa_supplicant-0.5.4 (21 Jun 2006) diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.7 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.7 index 7ed2b5d9055a..342b08cd27d4 100644 --- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.7 +++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.7 @@ -1 +1,3 @@ MD5 1345730f15d5f93f2f083096ddc903eb wpa_supplicant-0.4.7.tar.gz 470644 +RMD160 0a895830905eb232515f8e742775a2da41e54b2b wpa_supplicant-0.4.7.tar.gz 470644 +SHA256 002a5d52c1c8f516efe6a834227d3fe63ecf2588966e44fbde1e72a5844c334f wpa_supplicant-0.4.7.tar.gz 470644 diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.8 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.8 index c1873f281556..70f8147f009f 100644 --- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.8 +++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.8 @@ -1 +1,3 @@ MD5 765d6c70d75e88cd4dc010fa6b52c45f wpa_supplicant-0.4.8.tar.gz 476091 +RMD160 0dcc7410fee4b41a6ef56440a711142a4d383abb wpa_supplicant-0.4.8.tar.gz 476091 +SHA256 6d03f514211c9b806fb649e8dc5d0b047aa55b4762ddc7b675cf0bd7de230cf8 wpa_supplicant-0.4.8.tar.gz 476091 diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 index 941dcf9f24c9..cba126fa9367 100644 --- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 +++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 @@ -1 +1,3 @@ MD5 98498c152cbfc388c306fd9bbf7d57d4 wpa_supplicant-0.4.9.tar.gz 483279 +RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 wpa_supplicant-0.4.9.tar.gz 483279 +SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857 wpa_supplicant-0.4.9.tar.gz 483279 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild index c14621359b0b..156d6a6172af 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.4.7.ebuild,v 1.6 2006/01/02 18:15:38 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild,v 1.7 2006/06/24 16:10:09 brix Exp $ inherit eutils toolchain-funcs @@ -14,14 +14,23 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="gsm qt readline ssl" +IUSE="gsm qt3 qt4 readline ssl" DEPEND="gsm? ( sys-apps/pcsc-lite ) - qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) ) + qt4? ( =x11-libs/qt-4* ) + !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl )" +pkg_setup() { + if use qt3 && use qt4; then + einfo + einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" + einfo + fi +} + src_unpack() { local CONFIG=${S}/.config @@ -78,15 +87,13 @@ src_unpack() { src_compile() { emake || die "emake failed" - if use qt; then - if has_version '=x11-libs/qt-4*'; 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" - else - [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" - fi + 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 + emake wpa_gui || die "emake wpa_gui failed" fi } @@ -98,14 +105,12 @@ src_install() { newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action - if use qt; then + if use qt4; then into /usr - - if has_version '=x11-libs/qt-4*'; then - dobin wpa_gui-qt4/wpa_gui - else - dobin wpa_gui/wpa_gui - fi + dobin wpa_gui-qt4/wpa_gui + elif use qt3; then + into /usr + dobin wpa_gui/wpa_gui fi dodoc ChangeLog COPYING eap_testing.txt README todo.txt diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild index 8626b36a5428..5d3c8a44e9ef 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.4.8.ebuild,v 1.6 2006/04/30 09:43:17 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild,v 1.7 2006/06/24 16:10:09 brix Exp $ inherit eutils toolchain-funcs @@ -14,15 +14,24 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="gsm madwifi qt readline ssl" +IUSE="gsm madwifi qt3 qt4 readline ssl" DEPEND="gsm? ( sys-apps/pcsc-lite ) - qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) ) + qt4? ( =x11-libs/qt-4* ) + !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) )" +pkg_setup() { + if use qt3 && use qt4; then + einfo + einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" + einfo + fi +} + src_unpack() { local CONFIG=${S}/.config @@ -85,15 +94,13 @@ src_unpack() { src_compile() { emake || die "emake failed" - if use qt; then - if has_version '=x11-libs/qt-4*'; 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" - else - [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" - fi + 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 + emake wpa_gui || die "emake wpa_gui failed" fi } @@ -105,14 +112,12 @@ src_install() { newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action - if use qt; then + if use qt4; then into /usr - - if has_version '=x11-libs/qt-4*'; then - dobin wpa_gui-qt4/wpa_gui - else - dobin wpa_gui/wpa_gui - fi + dobin wpa_gui-qt4/wpa_gui + elif use qt3; then + into /usr + dobin wpa_gui/wpa_gui fi dodoc ChangeLog COPYING eap_testing.txt README todo.txt diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild index 84329c97f901..794421c5dc1c 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.4.9.ebuild,v 1.1 2006/05/27 20:01:35 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild,v 1.2 2006/06/24 16:10:09 brix Exp $ inherit eutils toolchain-funcs @@ -14,10 +14,11 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gsm madwifi qt readline ssl" +IUSE="gsm madwifi qt3 qt4 readline ssl" RDEPEND="gsm? ( sys-apps/pcsc-lite ) - qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) ) + qt4? ( =x11-libs/qt-4* ) + !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) ) @@ -25,6 +26,14 @@ RDEPEND="gsm? ( sys-apps/pcsc-lite ) DEPEND="sys-apps/sed ${RDEPEND}" +pkg_setup() { + if use qt3 && use qt4; then + einfo + einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" + einfo + fi +} + src_unpack() { local CONFIG=${S}/.config @@ -106,15 +115,13 @@ src_unpack() { src_compile() { emake || die "emake failed" - if use qt; then - if has_version '=x11-libs/qt-4*'; 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" - else - [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" - fi + 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 + emake wpa_gui || die "emake wpa_gui failed" fi } @@ -126,17 +133,15 @@ src_install() { exeinto /etc/wpa_supplicant/ newexe ${FILESDIR}/${MY_P}-wpa_cli.sh wpa_cli.sh - # compatibility symlink for older baselayout + # compatibility symlink for =baselayout-1.11* dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action - if use qt; then + if use qt4; then into /usr - - if has_version '=x11-libs/qt-4*'; then - dobin wpa_gui-qt4/wpa_gui - else - dobin wpa_gui/wpa_gui - fi + dobin wpa_gui-qt4/wpa_gui + elif use qt3; then + into /usr + dobin wpa_gui/wpa_gui fi dodoc ChangeLog COPYING eap_testing.txt README todo.txt diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild index d98b767f1e42..50993142a1a2 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.4.ebuild,v 1.1 2006/06/21 19:58:07 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild,v 1.2 2006/06/24 16:10:09 brix Exp $ inherit eutils toolchain-funcs @@ -11,11 +11,12 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dbus gsm madwifi qt readline ssl" +IUSE="dbus gsm madwifi qt3 qt4 readline ssl" RDEPEND="dbus? ( sys-apps/dbus ) gsm? ( sys-apps/pcsc-lite ) - qt? ( =x11-libs/qt-4* ) + qt4? ( =x11-libs/qt-4* ) + !qt4? ( qt3? ( =x11-libs/qt-3* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) ) @@ -23,6 +24,14 @@ RDEPEND="dbus? ( sys-apps/dbus ) DEPEND="sys-apps/sed ${RDEPEND}" +pkg_setup() { + if use qt3 && use qt4; then + einfo + einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" + einfo + fi +} + src_unpack() { local CONFIG=${S}/.config @@ -111,10 +120,13 @@ src_unpack() { src_compile() { emake || die "emake failed" - if use qt; then + 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 + emake wpa_gui || die "emake wpa_gui failed" fi } @@ -126,12 +138,15 @@ src_install() { exeinto /etc/wpa_supplicant/ newexe ${FILESDIR}/${P}-wpa_cli.sh wpa_cli.sh - # compatibility symlink for older baselayout + # compatibility symlink for =baselayout-1.11* dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action - if use qt; then + if use qt4; then into /usr dobin wpa_gui-qt4/wpa_gui + elif use qt3; then + into /usr + dobin wpa_gui/wpa_gui fi dodoc ChangeLog COPYING eap_testing.txt README todo.txt |