USE flag change qt->qt3/qt4 bug #137785

Package-Manager: portage-2.1.1_pre1-r1

3 files changed, 21 insertions, 18 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index e67c4055fe30..3533d1c10e0e 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-roguelike/nethack
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.20 2006/05/22 20:59:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.21 2006/06/24 05:06:23 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> nethack-3.4.3-r1.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
 
   22 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   nethack-3.4.3-r1.ebuild:
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index b6ddc279bd67..d5398047a750 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -38,14 +38,14 @@ MD5 f128c014d1efb8861cec5dae19eedb5b files/dot.nethackrc 2717
 RMD160 0e9868a1b8f017337d8c37e740399e25512bdb5b files/dot.nethackrc 2717
 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c files/dot.nethackrc 2717
 DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
-EBUILD nethack-3.4.3-r1.ebuild 5380 RMD160 a4e5c46f3e1c53bb8ab7eeb5f6bc8e1062dd184c SHA1 35340ffc17c361f03ca1bbfdd76041f1acc8b616 SHA256 3b776ebfc2b14e3e09134fdd01bf774f4a6b024cb202a09b21b5eacb70317a67
-MD5 747f835a728239e91c430ad2586c4367 nethack-3.4.3-r1.ebuild 5380
-RMD160 a4e5c46f3e1c53bb8ab7eeb5f6bc8e1062dd184c nethack-3.4.3-r1.ebuild 5380
-SHA256 3b776ebfc2b14e3e09134fdd01bf774f4a6b024cb202a09b21b5eacb70317a67 nethack-3.4.3-r1.ebuild 5380
-MISC ChangeLog 577 RMD160 26df3573310b1623e2818a5e886adc205a1a86e4 SHA1 5b3387f5215bda792f5089eeab38d9e47779427b SHA256 ad0ef0abc0388570e42fe78c6dbd391a420950b3421e54e4d816e1cd4c8f7713
-MD5 c5132421eddd1e1888bfb3438809537d ChangeLog 577
-RMD160 26df3573310b1623e2818a5e886adc205a1a86e4 ChangeLog 577
-SHA256 ad0ef0abc0388570e42fe78c6dbd391a420950b3421e54e4d816e1cd4c8f7713 ChangeLog 577
+EBUILD nethack-3.4.3-r1.ebuild 5382 RMD160 df5f74c8c14069433054f1b6db8073e0fee5bd0c SHA1 d8b2efe39c2e46397933eddcd2d0b02fbbefea3c SHA256 3640c67f69f46f92b7ec04d17e93362a16825676cad1330a4a3d21ef8607121b
+MD5 cb464f781cadad6bdd280dfeef53bab2 nethack-3.4.3-r1.ebuild 5382
+RMD160 df5f74c8c14069433054f1b6db8073e0fee5bd0c nethack-3.4.3-r1.ebuild 5382
+SHA256 3640c67f69f46f92b7ec04d17e93362a16825676cad1330a4a3d21ef8607121b nethack-3.4.3-r1.ebuild 5382
+MISC ChangeLog 692 RMD160 9a5f79df71e774ef1846af362f68899592c8b3c2 SHA1 d3f41e0ee51ca6ba37cdd354980faca2f47e176a SHA256 fea6a98d1331edeaac1d056c67ee1e04c85435652f50e3970e98085f44f57636
+MD5 2f3e8d828e7fb8df19ee50ef71355240 ChangeLog 692
+RMD160 9a5f79df71e774ef1846af362f68899592c8b3c2 ChangeLog 692
+SHA256 fea6a98d1331edeaac1d056c67ee1e04c85435652f50e3970e98085f44f57636 ChangeLog 692
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -56,7 +56,7 @@ SHA256 802cf82d51e1cd7b9ec5bff1d4bd14cadd3e3900bdc13419227f543a9df64575 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEciZHAiZjviIA2XgRArSDAKCmdwqWgiu4viC+BuUfgG0eQP9iDACfQ8Uu
-RwPZ7Pp/7lSoWvlTk2wtOY0=
-=KqEr
+iD8DBQFEnMhZoeSe8B0zEfwRAn2LAKCAsPyfCjHMZOWlSHkPTejzWHz8rACgiVpp
+mB5t27Y/pJxgp4g3dBPAU4A=
+=W7s3
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index 317809a8ccb5..c5296a77b2af 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r1.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/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.13 2006/05/22 20:59:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.14 2006/06/24 05:06:23 cardoe Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
 LICENSE="nethack"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc-macos sparc x86 ~x86-fbsd"
-IUSE="X qt gnome"
+IUSE="X qt3 gnome"
 
 RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r5
@@ -24,7 +24,7 @@ RDEPEND="virtual/libc
 				x11-libs/libXpm
 				x11-libs/libXt )
 			virtual/x11 ) )
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
 DEPEND="${RDEPEND}
 	X? (
@@ -68,7 +68,7 @@ src_unpack() {
 
 	if use X ; then
 		epatch "${FILESDIR}/${PV}-X-support.patch"
-		if use qt ; then
+		if use qt3 ; then
 			epatch "${FILESDIR}/${PV}-QT-support.patch"
 			use gnome && epatch "${FILESDIR}/${PV}-QT-GNOME-support.patch"
 		elif use gnome ; then
@@ -141,7 +141,7 @@ src_install() {
 
 	local windowtypes="tty"
 	use gnome && windowtypes="${windowtypes} gnome"
-	use qt && windowtypes="${windowtypes} qt"
+	use qt3 && windowtypes="${windowtypes} qt"
 	use X && windowtypes="${windowtypes} x11"
 	set -- ${windowtypes}
 	sed -i \
@@ -184,7 +184,7 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	if use qt && has_version '=x11-libs/qt-3.1*' ; then
+	if use qt3 && has_version '=x11-libs/qt-3.1*' ; then
 		ewarn "the qt frontend may be a little unstable with this version of qt"
 		ewarn "please see Bug 32629 for more information"
 	fi