Fix QT4 support, #146177 thanks to Horst Schirmeier.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 130 insertions, 61 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 04b3707d0b60..158ce87054c7 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2006/09/03 16:06:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.71 2006/09/04 13:37:17 uberlord Exp $
+
+  04 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  +files/wpa_supplicant-0.5.5-qt4.patch, wpa_supplicant-0.5.5.ebuild:
+  Fix QT4 support, #146177 thanks to Horst Schirmeier.
+
+  03 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  wpa_supplicant-0.5.5.ebuild:
+  QT4 is broken in 0.5.5, #146177.
 
 *wpa_supplicant-0.5.5 (03 Sep 2006)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 0aa02ced3b7c..aea397d0bfa0 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -2,6 +2,10 @@ AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f7
 MD5 b7347d266a11ceada07f132fcde0a318 files/wpa_cli.sh 1312
 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 files/wpa_cli.sh 1312
 SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8 files/wpa_cli.sh 1312
+AUX wpa_supplicant-0.5.5-qt4.patch 2398 RMD160 10cf397ac7fa1b2146d55114c95d1663b66ef94e SHA1 6e9f26011b3d9ea1f7f1d5254cd069fe6447c571 SHA256 cf72c70ab0ce1c79c25bcd02545271e7c1fe395c0b303b55cee87562f50877e1
+MD5 5d8913030686471a3ab843514c4018b5 files/wpa_supplicant-0.5.5-qt4.patch 2398
+RMD160 10cf397ac7fa1b2146d55114c95d1663b66ef94e files/wpa_supplicant-0.5.5-qt4.patch 2398
+SHA256 cf72c70ab0ce1c79c25bcd02545271e7c1fe395c0b303b55cee87562f50877e1 files/wpa_supplicant-0.5.5-qt4.patch 2398
 DIST wpa_supplicant-0.4.9.tar.gz 483279 RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 SHA1 e6a5cd6fbb7f12cc0a074da212f4fd7fbde0aec0 SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857
 DIST wpa_supplicant-0.5.4.tar.gz 630779 RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 SHA1 53a03be9c39c783cb83f5e32f7aab493ef8b529e SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7
 DIST wpa_supplicant-0.5.5.tar.gz 661097 RMD160 eda95756c49fb140063c14e0b9950b7045f47972 SHA1 b0992a71e759432fa3536bc4013885f0fe65aba1 SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543
@@ -13,14 +17,14 @@ EBUILD wpa_supplicant-0.5.4.ebuild 5333 RMD160 344935aee3bbadf6de4a67f6f663dc1a4
 MD5 8f57caf0c241208570824936f077a4eb wpa_supplicant-0.5.4.ebuild 5333
 RMD160 344935aee3bbadf6de4a67f6f663dc1a4435eaf0 wpa_supplicant-0.5.4.ebuild 5333
 SHA256 6a05efeb01886f95270b05a4923ab5a723569e785f16d4882b69d02454f92953 wpa_supplicant-0.5.4.ebuild 5333
-EBUILD wpa_supplicant-0.5.5.ebuild 5227 RMD160 7462ea3bde12d83ff2a406a930cbf65f4a5b1cf1 SHA1 c2a10e51aa95f458101877f5d2a542ea5f74795d SHA256 59e8e5af3ee8b01b323ae92d87dcdfecec437d5a2fa6244afb95518d16062bab
-MD5 e802c0ab9162ae6898e81a8412adc707 wpa_supplicant-0.5.5.ebuild 5227
-RMD160 7462ea3bde12d83ff2a406a930cbf65f4a5b1cf1 wpa_supplicant-0.5.5.ebuild 5227
-SHA256 59e8e5af3ee8b01b323ae92d87dcdfecec437d5a2fa6244afb95518d16062bab wpa_supplicant-0.5.5.ebuild 5227
-MISC ChangeLog 16833 RMD160 e0f99336504db6ec992149a80968dd5aa527aff4 SHA1 eeb63cb84305147aa5b4787c2d272ed79acb06cb SHA256 87590e0cf768043cfd0143fb6d445e2f76983ea282bfb60b28d6811957435dbb
-MD5 0e731e02154593cfb946c3d9e4428ee5 ChangeLog 16833
-RMD160 e0f99336504db6ec992149a80968dd5aa527aff4 ChangeLog 16833
-SHA256 87590e0cf768043cfd0143fb6d445e2f76983ea282bfb60b28d6811957435dbb ChangeLog 16833
+EBUILD wpa_supplicant-0.5.5.ebuild 5169 RMD160 06d34679a0ab1c7d12f1bd0f07e1de0c1da8f6ae SHA1 64f2004a1f827366adf7daee9b461d1696914090 SHA256 a7777383b81a1e54d50f8553c07d292399060faa9d8571255ac3337e8539d5ed
+MD5 5facdf446c4245e97d76e4334ed17adb wpa_supplicant-0.5.5.ebuild 5169
+RMD160 06d34679a0ab1c7d12f1bd0f07e1de0c1da8f6ae wpa_supplicant-0.5.5.ebuild 5169
+SHA256 a7777383b81a1e54d50f8553c07d292399060faa9d8571255ac3337e8539d5ed wpa_supplicant-0.5.5.ebuild 5169
+MISC ChangeLog 17124 RMD160 c3a7236f4dde5ada8b2e49ea593a19ae99cc6a4b SHA1 7c7f9a61f87999a0adf0427bd0be1e395fba5067 SHA256 c7b9e1f3fb128f523742145ba51423449cbbb400fc814d21751547abec736807
+MD5 b001c46318507563fe9022d048f05116 ChangeLog 17124
+RMD160 c3a7236f4dde5ada8b2e49ea593a19ae99cc6a4b ChangeLog 17124
+SHA256 c7b9e1f3fb128f523742145ba51423449cbbb400fc814d21751547abec736807 ChangeLog 17124
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch
new file mode 100644
index 000000000000..c13c41837ae3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch
@@ -0,0 +1,55 @@
+--- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/eventhistory.h	2006-09-04 14:06:41.000000000 +0200
++++ wpa_supplicant-0.5.5/wpa_gui-qt4/eventhistory.h	2006-09-04 14:07:02.000000000 +0200
+@@ -47,7 +47,7 @@ class EventHistory : public QDialog, pub
+ public:
+ 	EventHistory(QWidget *parent = 0, const char *name = 0,
+ 		     bool modal = false, Qt::WFlags fl = 0);
+-	EventHistory::~EventHistory();
++	~EventHistory();
+ 
+ public slots:
+ 	virtual void addEvents(WpaMsgList msgs);
+--- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/scanresults.h	2006-09-04 14:06:41.000000000 +0200
++++ wpa_supplicant-0.5.5/wpa_gui-qt4/scanresults.h	2006-09-04 14:07:59.000000000 +0200
+@@ -27,7 +27,7 @@ class ScanResults : public QDialog, publ
+ public:
+ 	ScanResults(QWidget *parent = 0, const char *name = 0,
+ 		    bool modal = false, Qt::WFlags fl = 0);
+-	ScanResults::~ScanResults();
++	~ScanResults();
+ 
+ public slots:
+ 	virtual void setWpaGui(WpaGui *_wpagui);
+--- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/userdatarequest.h	2006-09-04 14:06:41.000000000 +0200
++++ wpa_supplicant-0.5.5/wpa_gui-qt4/userdatarequest.h	2006-09-04 14:11:08.000000000 +0200
+@@ -27,7 +27,7 @@ class UserDataRequest : public QDialog, 
+ public:
+ 	UserDataRequest(QWidget *parent = 0, const char *name = 0,
+ 			bool modal = false, Qt::WFlags fl = 0);
+-	UserDataRequest::~UserDataRequest();
++	~UserDataRequest();
+ 
+ 	int setParams(WpaGui *_wpagui, const char *reqMsg);
+ 
+--- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/networkconfig.h	2006-09-04 14:06:41.000000000 +0200
++++ wpa_supplicant-0.5.5/wpa_gui-qt4/networkconfig.h	2006-09-04 14:11:30.000000000 +0200
+@@ -27,7 +27,7 @@ class NetworkConfig : public QDialog, pu
+ public:
+ 	NetworkConfig(QWidget *parent = 0, const char *name = 0,
+ 		      bool modal = false, Qt::WFlags fl = 0);
+-	NetworkConfig::~NetworkConfig();
++	~NetworkConfig();
+ 
+ 	virtual void paramsFromScanResults(Q3ListViewItem *sel);
+ 	virtual void setWpaGui(WpaGui *_wpagui);
+--- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/wpagui.h	2006-09-04 14:06:41.000000000 +0200
++++ wpa_supplicant-0.5.5/wpa_gui-qt4/wpagui.h	2006-09-04 14:12:43.000000000 +0200
+@@ -28,7 +28,7 @@ class WpaGui : public QMainWindow, publi
+ public:
+ 	WpaGui(QWidget *parent = 0, const char *name = 0,
+ 	       Qt::WFlags fl = Qt::WType_TopLevel);
+-	WpaGui::~WpaGui();
++	~WpaGui();
+ 
+ 	virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);
+ 	virtual void triggerUpdate();
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
index b9c134e5806c..17f2cce28774 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.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.5.ebuild,v 1.1 2006/09/03 16:06:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.2 2006/09/04 13:37:17 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,79 +31,81 @@ pkg_setup() {
 }
 
 src_unpack() {
-	local CONFIG="${S}/.config"
-
 	unpack ${A}
+	cd "${S}"
+
+	# Fix QT4 support, #146177 thanks to Horst Schirmeier.
+	epatch "${FILESDIR}/${P}-qt4.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:" \
-		"${S}"/l2_packet_freebsd.c
+		l2_packet_freebsd.c || die
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > "${CONFIG}"
+	echo "CC = $(tc-getCC)" > .config
 
 	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> "${CONFIG}"
-	echo "CONFIG_BACKEND=file" >> "${CONFIG}"
+	echo "CONFIG_CTRL_IFACE=y" >> .config
+	echo "CONFIG_BACKEND=file" >> .config
 
 	# basic authentication methods
-	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}"
-
-	if use dbus; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> "${CONFIG}"
+	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
+
+	if use dbus ; then
+		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
-	if use gsm; then
+	if use gsm ; then
 		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> "${CONFIG}"
-		echo "CONFIG_EAP_AKA=y" >> "${CONFIG}"
-		echo "CONFIG_PCSC=y"    >> "${CONFIG}"
+		echo "CONFIG_EAP_SIM=y" >> .config
+		echo "CONFIG_EAP_AKA=y" >> .config
+		echo "CONFIG_PCSC=y"    >> .config
 	fi
 
-	if use readline; then
+	if use readline ; then
 		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> "${CONFIG}"
+		echo "CONFIG_READLINE=y" >> .config
 	fi
 
-	if use ssl; then
+	if use ssl ; then
 		# SSL authentication methods
-		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}"
-		echo "CONFIG_SMARTCARD=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
+		echo "CONFIG_SMARTCARD=y"    >> .config
 	fi
 
-	if use kernel_linux; then
+	if use kernel_linux ; then
 		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=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
+		echo "CONFIG_DRIVER_ATMEL=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${ROOT}/usr/include/madwifi" >> "${CONFIG}"
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> "${CONFIG}"
+			echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> .config
+			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
 		fi
 	fi
 
-	if use kernel_FreeBSD; then
+	if use kernel_FreeBSD ; then
 		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> "${CONFIG}"
+		echo "CONFIG_DRIVER_BSD=y" >> .config
 	fi
 
 	# people seem to take the example configuration file too literally
@@ -112,23 +114,23 @@ src_unpack() {
 		-e "s:^\(opensc_engine_path\):#\1:" \
 		-e "s:^\(pkcs11_engine_path\):#\1:" \
 		-e "s:^\(pkcs11_module_path\):#\1:" \
-		${S}/wpa_supplicant.conf || die
+		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):" \
-		"${S}"/wpa_supplicant.conf || die
+		wpa_supplicant.conf || die
 }
 
 src_compile() {
 	emake || die "emake failed"
 
-	if use qt4; 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
+	elif use qt3 ; then
 		[[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
 		/usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
 		cd "${S}"/wpa_gui
@@ -144,10 +146,10 @@ src_install() {
 	exeinto /etc/wpa_supplicant/
 	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
 
-	if use qt4; then
+	if use qt4 ; then
 		into /usr
 		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3; then
+	elif use qt3 ; then
 		into /usr
 		dobin wpa_gui/wpa_gui
 	fi