qt support added back to the beta4 ebuild, #139399.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 36 insertions, 23 deletions

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index 1a0ab717e419..261501815d20 100644
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/rt2500
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.28 2006/06/24 01:26:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.29 2006/07/10 11:43:48 uberlord Exp $
+
+  10 Jul 2006; Roy Marples <uberlord@gentoo.org> rt2500-1.1.0_beta4.ebuild:
+  qt support added back to the beta4 ebuild, #139399.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> rt2500-1.1.0_beta3.ebuild:
   USE flag qt->qt3/qt4 change bug #137785
diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index 5b9d387b0c11..a6ae8d776cb9 100644
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST rt2500-1.1.0-b3.tar.gz 305057 RMD160 445f347cd0d5ceb850dfc5900a1c19c82ef23f01 SHA1 bee68bb1e8ed27f98a0cde30e21829bc919481ef SHA256 1fc4700255a9777c3275b34e77acfccd6e9105c916f8a6cc195a97dfdd61a2aa
 DIST rt2500-1.1.0-b4.tar.gz 386980 RMD160 604e6ae067d3fe27a52f595e311bae8c4d18c557 SHA1 dd9a747c819a6507ea3ef9e803d4fae1074d84df SHA256 0c48b157fa2e77268064b5cf9ee956097974f2f4c0caea239e92ae800002a4dc
 EBUILD rt2500-1.1.0_beta3.ebuild 2213 RMD160 f9cbe834869600e3a2b078123ba5ca3dfaed99ba SHA1 4b023fb98a5648e5ea5f6297998ba3ed9a1993df SHA256 1ef09bc098c919e7b913c1a7e67c3858b62f1ffc863474a71f836701666f595d
 MD5 ed395a96f4daa4a9b40895927315ee40 rt2500-1.1.0_beta3.ebuild 2213
 RMD160 f9cbe834869600e3a2b078123ba5ca3dfaed99ba rt2500-1.1.0_beta3.ebuild 2213
 SHA256 1ef09bc098c919e7b913c1a7e67c3858b62f1ffc863474a71f836701666f595d rt2500-1.1.0_beta3.ebuild 2213
-EBUILD rt2500-1.1.0_beta4.ebuild 949 RMD160 eb3c0c3c7114a982c65106593961b04b11c588bc SHA1 5fdfa5c217e94a9a326884c626ba5f354d17cfa4 SHA256 34d03555620042b49cd0f3163d7080176dcd0103d0c8053b314a60f711554cd7
-MD5 4056faae7502f8f2c64ece2d6b497945 rt2500-1.1.0_beta4.ebuild 949
-RMD160 eb3c0c3c7114a982c65106593961b04b11c588bc rt2500-1.1.0_beta4.ebuild 949
-SHA256 34d03555620042b49cd0f3163d7080176dcd0103d0c8053b314a60f711554cd7 rt2500-1.1.0_beta4.ebuild 949
-MISC ChangeLog 5343 RMD160 73beea5254b93e48f9f5ae6d88c9b95e73f21c1d SHA1 62b0665cc4004d90ffcdc2860b31e2a7aad0e754 SHA256 89c5fea7c5eb1da97802ceb75f82125534479aaab4dda394b6494dd510120700
-MD5 db025803e64449e52c9559bc5bb769c3 ChangeLog 5343
-RMD160 73beea5254b93e48f9f5ae6d88c9b95e73f21c1d ChangeLog 5343
-SHA256 89c5fea7c5eb1da97802ceb75f82125534479aaab4dda394b6494dd510120700 ChangeLog 5343
+EBUILD rt2500-1.1.0_beta4.ebuild 1415 RMD160 404dfb9e30a8a78719ddea679e5289e275b8dabf SHA1 9c303d7127c82ecfdde679183f02e86661c61646 SHA256 b5e17ed926bd24bed84a31eff8fc1d53775dfa00af68506c3e007fc0207efc62
+MD5 035f0bbebbcce77062aeaded1c16a3b2 rt2500-1.1.0_beta4.ebuild 1415
+RMD160 404dfb9e30a8a78719ddea679e5289e275b8dabf rt2500-1.1.0_beta4.ebuild 1415
+SHA256 b5e17ed926bd24bed84a31eff8fc1d53775dfa00af68506c3e007fc0207efc62 rt2500-1.1.0_beta4.ebuild 1415
+MISC ChangeLog 5476 RMD160 16aaf5c7ca6228b8b054c542c9ac05ca46b285d5 SHA1 61d3ab7392fbb0f0327d6c8d936f364e13731334 SHA256 a4475f06ed44aacbdb217f229aaf68aac7dc46c2ca0d73439b8c0cf106ae5e9f
+MD5 afb423ca02d724d4b14164fff7bf6025 ChangeLog 5476
+RMD160 16aaf5c7ca6228b8b054c542c9ac05ca46b285d5 ChangeLog 5476
+SHA256 a4475f06ed44aacbdb217f229aaf68aac7dc46c2ca0d73439b8c0cf106ae5e9f ChangeLog 5476
 MISC metadata.xml 344 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 SHA1 7ab30e72fdf815e078229880fc82e4816b0277df SHA256 315758d6bea25daed93d8dafff181b2ec3d5b759d77724d7b31efb2ba59cdeb4
 MD5 2b5e62280e51f48cf22deee6f03a7fa4 metadata.xml 344
 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 metadata.xml 344
@@ -25,10 +22,3 @@ SHA256 e47f54689608ff2c61852cba0b222322d883e89d1e36c3827992fea9deab8e7f files/di
 MD5 279251445f2f660bcc729df8fc2da0dc files/digest-rt2500-1.1.0_beta4 247
 RMD160 8dc1ea3e0a5481862c3a4b76aca7d424985c787d files/digest-rt2500-1.1.0_beta4 247
 SHA256 c756c72508e9386d66ef21df26c43a6fe38804a3aa5bd92ad3936862da5aeb5a files/digest-rt2500-1.1.0_beta4 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnJS2oeSe8B0zEfwRAk6EAKCHOhVPS6tW7umCjM6mcjAKP7BC4QCfYrna
-WS4Gxkk3WzeXwjjWFG3v2+Y=
-=rqkw
------END PGP SIGNATURE-----
diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
index b627be596988..506102bd5ec0 100644
--- a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild,v 1.1 2006/06/23 16:04:38 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild,v 1.2 2006/07/10 11:43:48 uberlord Exp $
 
-inherit eutils linux-mod
+inherit eutils linux-mod kde-functions
+set-qtdir 3
 
 MY_P="${P/_beta/-b}"
 DESCRIPTION="Driver for the RaLink RT2500 wireless chipset"
@@ -11,8 +12,9 @@ SRC_URI="mirror://sourceforge/rt2400/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="net-wireless/wireless-tools"
+IUSE="qt3"
+DEPEND="net-wireless/wireless-tools
+	qt3? ( =x11-libs/qt-3* )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -30,9 +32,27 @@ pkg_setup() {
 	fi
 }
 
+src_compile() {
+	linux-mod_src_compile
+
+	if use qt3; then
+		cd "${S}"/Utilitys
+		"${QTDIR}"/bin/qmake -o Makefile raconfig2500.pro
+		emake || die "make Utilities failed"
+	fi
+}
+
 src_install() {
 	linux-mod_src_install
 
 	dodoc Module/README Module/TESTING Module/iwpriv_usage.txt \
 		THANKS FAQ CHANGELOG
+
+	if use qt3; then
+		dobin ${S}/Utilitys/RaConfig2500
+		doicon Utilitys/ico/RaConfig2500.xpm
+		make_desktop_entry RaConfig2500 "RaLink RT2500 Config" RaConfig2500.xpm
+		insinto /etc/Wireless/RT2500STA
+		doins Module/RT2500STA.dat
+	fi
 }