punt QT support (bug #301735)

Package-Manager: portage-2.1.7.17/cvs/Linux i686

3 files changed, 16 insertions, 28 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 9b3480267bcf..c27edcf7a57a 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/nethack
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.32 2009/10/07 07:43:39 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.33 2010/03/02 20:57:16 mr_bones_ Exp $
+
+  02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  nethack-3.4.3-r1.ebuild:
+  punt QT support (bug #301735)
 
   07 Oct 2009; Tupone Alfredo <tupone@gentoo.org>
   +files/nethack-3.4.3-gibc210.patch, nethack-3.4.3-r1.ebuild:
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 19374f1ac34a..1cbbb9f76e61 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -7,6 +7,6 @@ AUX 3.4.3-macos.patch 307 RMD160 460ef1f4279e5c0e09de3cfe77b7984fbab0dede SHA1 a
 AUX dot.nethackrc 2717 RMD160 0e9868a1b8f017337d8c37e740399e25512bdb5b SHA1 27c973b8c336355012e2e2c4f0007bce9cce9f84 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c
 AUX nethack-3.4.3-gibc210.patch 330 RMD160 18a1bca6e71c7dc7930039fcb330f0c1791e31ce SHA1 45663beda1b67529886f1839f96be45021623c54 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c9a1e2b4005da7fd36692f1df47e
 DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
-EBUILD nethack-3.4.3-r1.ebuild 5038 RMD160 31abda0528a4a5280b451b6f5a3cc9422c68df8b SHA1 7784d75db6451967e47fd3f12abcbbaf705ae276 SHA256 6b85080ba3d04a121d874694a646418a71cc24733983a5bc92c8f307e89d16ce
-MISC ChangeLog 7000 RMD160 192ba217e5dc07af46c449e6b452c08e7883908a SHA1 1854fd1e343808d924c28ca938b3d2ef6fa24f1e SHA256 1b9ed6fb158f1296ddf6b35c6e644696e6dfd59625d92c92e3ff1e7271911e97
+EBUILD nethack-3.4.3-r1.ebuild 4512 RMD160 22cf029cf3f3b1cf4d90529c66b49ea6f2043c60 SHA1 a0911aab011111934ff0f11ef3bc4651be9e1f93 SHA256 3302256333fc8353f6dc6d763bbc477b602e1f79318805063019a2dfff860a91
+MISC ChangeLog 7118 RMD160 3ae22271363a67d38fde5c74d54dea611c60297c SHA1 4de4a154d050dc9f956d18a744d65f252e96984c SHA256 0e0ad31515f6346512a9661a83f36455e885b2f134abc515aff76b5aaf73b64b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index ad205862b1cb..50b390cdffff 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
@@ -1,28 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.25 2009/10/07 07:43:39 tupone Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.26 2010/03/02 20:57:16 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs flag-o-matic games
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
 HOMEPAGE="http://www.nethack.org/"
 SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-#SRC_URI="ftp://ftp.nethack.org/pub/nethack/nh340/src/nethack-340.tgz"
 
 LICENSE="nethack"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86 ~x86-fbsd"
-IUSE="X qt3"
+IUSE="X"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
 	X? (
 		x11-libs/libXaw
 		x11-libs/libXpm
 		x11-libs/libXt
-	)
-	qt3? ( =x11-libs/qt-3* )"
+	)"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/xproto
@@ -30,7 +28,7 @@ DEPEND="${RDEPEND}
 		x11-apps/mkfontdir
 	)"
 
-HACKDIR="${GAMES_DATADIR}/${PN}"
+HACKDIR=${GAMES_DATADIR}/${PN}
 
 src_prepare() {
 	# This copies the /sys/unix Makefile.*s to their correct places for
@@ -66,31 +64,22 @@ src_prepare() {
 
 	if use X ; then
 		epatch "${FILESDIR}/${PV}-X-support.patch"
-		if use qt3 ; then
-			epatch "${FILESDIR}/${PV}-QT-support.patch"
-		fi
 	fi
 }
 
 src_compile() {
-	local qtver=
 	local lflags="-L/usr/X11R6/lib"
 
-	has_version =x11-libs/qt-3* \
-		&& qtver=3 \
-		|| qtver=2
 	cd "${S}"/src
 	append-flags -I../include
 
 	emake \
-		QTDIR=/usr/qt/${qtver} \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="${lflags}" \
 		../util/makedefs \
 		|| die "initial makedefs build failed"
 	emake \
-		QTDIR=/usr/qt/${qtver} \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="${lflags}" \
@@ -100,7 +89,7 @@ src_compile() {
 }
 
 src_install() {
-	make \
+	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="-L/usr/X11R6/lib" \
@@ -110,7 +99,7 @@ src_install() {
 		GAMEDIR="${D}${HACKDIR}" \
 		SHELLDIR="${D}/${GAMES_BINDIR}" \
 		install \
-		|| die "make install failed"
+		|| die "emake install failed"
 
 	# We keep this stuff in ${GAMES_STATEDIR} instead so tidy up.
 	rm -rf "${D}/usr/share/games/nethack/save"
@@ -133,7 +122,6 @@ src_install() {
 	doins "${FILESDIR}/dot.nethackrc"
 
 	local windowtypes="tty"
-	use qt3 && windowtypes="${windowtypes} qt"
 	use X && windowtypes="${windowtypes} x11"
 	set -- ${windowtypes}
 	sed -i \
@@ -176,9 +164,5 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	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
 	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
 }