diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2005-12-08 11:56:27 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-12-08 11:56:27 +0000 |
| commit | 04204caad0d874bbacf1b2aa69f2ecb6d4f867fa (patch) | |
| tree | 875705614eb5f52209d79dd5a05251a94546ee11 /net-wireless | |
| parent | commons-httpclient only needs ant-core to compile instead of full ant. Part o... (diff) | |
| download | historical-04204caad0d874bbacf1b2aa69f2ecb6d4f867fa.tar.gz historical-04204caad0d874bbacf1b2aa69f2ecb6d4f867fa.tar.bz2 historical-04204caad0d874bbacf1b2aa69f2ecb6d4f867fa.zip | |
Add Qt4 support, bug #113581.
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/Manifest | 4 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild | 21 |
3 files changed, 23 insertions, 8 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 73564f1a5fdd..66366cd06770 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.40 2005/11/25 13:26:07 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.41 2005/12/08 11:56:27 brix Exp $ + + 08 Dec 2005; Henrik Brix Andersen <brix@gentoo.org> + wpa_supplicant-0.4.7.ebuild: + Add Qt4 support, bug #113581. 25 Nov 2005; Henrik Brix Andersen <brix@gentoo.org> wpa_supplicant-0.4.5.ebuild, wpa_supplicant-0.4.6.ebuild, diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 455eefbc1ede..8d95c769689c 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -1,8 +1,8 @@ -MD5 ac77ba8e337bbf96928e9847d74ea278 wpa_supplicant-0.4.7.ebuild 3115 +MD5 a84b950a9410f05d118b6b1c50eea0b4 wpa_supplicant-0.4.7.ebuild 3416 MD5 090212b7ed178b6a7e269f4eb57fdc25 wpa_supplicant-0.3.9-r1.ebuild 3236 MD5 be2aec0f8389165bc248a47c48e08125 wpa_supplicant-0.4.6.ebuild 3152 MD5 c49fb2bfb9587a39da2533eea26fdbe8 wpa_supplicant-0.3.8-r1.ebuild 3172 -MD5 7a76dff9d975867caeb223b9bf5504ae ChangeLog 10759 +MD5 5f85498b60c8cce1f95db8c8cb53ec1f ChangeLog 10877 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 MD5 8d9bc29e476934dc410c05add8202651 wpa_supplicant-0.4.5.ebuild 3627 MD5 647ec6dd4aa43749b03eabb84072b161 files/wpa_supplicant-0.4.7-wpa_cli.action 1233 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 79054d48107c..9ca976b2a4be 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-2005 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.2 2005/11/25 13:26:07 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild,v 1.3 2005/12/08 11:56:27 brix Exp $ inherit eutils toolchain-funcs @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="gsm qt readline ssl" DEPEND="gsm? ( sys-apps/pcsc-lite ) - qt? ( =x11-libs/qt-3* ) + qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl )" @@ -79,8 +79,14 @@ src_compile() { emake || die "emake failed" if use qt; then - [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" + 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 fi } @@ -94,7 +100,12 @@ src_install() { if use qt; then into /usr - dobin wpa_gui/wpa_gui + + if has_version '=x11-libs/qt-4*'; then + dobin wpa_gui-qt4/wpa_gui + else + dobin wpa_gui/wpa_gui + fi fi dodoc ChangeLog COPYING eap_testing.txt README todo.txt |