clean older ebuilds; fix deps

6 files changed, 9 insertions, 304 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 5e89543281c9..3639542542b2 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/nethack
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.10 2004/08/31 21:22:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.11 2004/09/10 09:52:55 mr_bones_ Exp $
+
+  10 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -nethack-3.4.2.ebuild,
+  nethack-3.4.3-r1.ebuild, -nethack-3.4.3.ebuild:
+  clean older ebuilds; fix deps
 
   31 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/3.4.3-bison.patch, nethack-3.4.3-r1.ebuild:
diff --git a/games-roguelike/nethack/files/digest-nethack-3.4.2 b/games-roguelike/nethack/files/digest-nethack-3.4.2
deleted file mode 100644
index a4ec600f1de8..000000000000
--- a/games-roguelike/nethack/files/digest-nethack-3.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90e971dbaee2f05f6a2ed3454851903a nethack-342.tgz 3475583
diff --git a/games-roguelike/nethack/files/digest-nethack-3.4.3 b/games-roguelike/nethack/files/digest-nethack-3.4.3
deleted file mode 100644
index ba80af888282..000000000000
--- a/games-roguelike/nethack/files/digest-nethack-3.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21479c95990eefe7650df582426457f9 nethack-343-src.tgz 3497458
diff --git a/games-roguelike/nethack/nethack-3.4.2.ebuild b/games-roguelike/nethack/nethack-3.4.2.ebuild
deleted file mode 100644
index 23346c534be2..000000000000
--- a/games-roguelike/nethack/nethack-3.4.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.2.ebuild,v 1.8 2004/07/01 05:21:55 mr_bones_ Exp $
-
-inherit eutils gcc 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}.tgz"
-#SRC_URI="ftp://ftp.nethack.org/pub/nethack/nh340/src/nethack-340.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="X qt gnome"
-
-DEPEND="virtual/libc
-	dev-util/yacc
-	>=sys-libs/ncurses-5.2-r5
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
-
-HACKDIR="${GAMES_DATADIR}/${PN}"
-
-src_unpack() {
-	append-flags -I../include
-	unpack ${A}
-
-	# This copies the /sys/unix Makefile.*s to their correct places for 
-	# seding and compiling.
-	cd ${S}/sys/unix
-	source setup.sh || die
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	epatch ${FILESDIR}/${PV}-errno.patch
-	epatch ${FILESDIR}/${PV}-default-options.patch
-
-	sed -i \
-		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \
-			|| die "setting statedir"
-	sed -i \
-		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
-			|| die "seting hackdir"
-
-	if use X ; then
-		epatch ${FILESDIR}/${PV}-X-support.patch
-		if use qt ; then
-			epatch ${FILESDIR}/${PV}-QT-support.patch
-			use gnome && epatch ${FILESDIR}/${PV}-QT-GNOME-support.patch
-		elif use gnome ; then
-			epatch ${FILESDIR}/${PV}-GNOME-support.patch
-		fi
-	fi
-}
-
-src_compile() {
-	local qtver=
-	has_version =x11-libs/qt-3* \
-		&& qtver=3 \
-		|| qtver=2
-	cd ${S}/src
-
-	make \
-		QTDIR=/usr/qt/${qtver} \
-		CC="$(gcc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		|| die
-	cd ${S}/util
-	make CFLAGS="${CFLAGS}" recover || die
-}
-
-src_install() {
-	make \
-		CC="$(gcc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		GAMEPERM=0755 \
-		PREFIX=${D}/usr \
-		GAMEDIR=${D}${HACKDIR} \
-		SHELLDIR=${D}/${GAMES_BINDIR} \
-		install \
-			|| die "make install failed"
-	newgamesbin util/recover recover-nethack
-
-	# The final nethack is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
-	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" ${GAMES_BINDIR}/nethack
-
-	doman doc/*.6
-	dodoc doc/*.txt
-
-	# Can be copied to ~/.nethackrc to set options
-	# Add this to /etc/.skel as well, thats the place for default configs
-	insinto ${HACKDIR}
-	doins ${FILESDIR}/dot.nethackrc
-	local windowtypes="tty"
-	use gnome && windowtypes="${windowtypes} gnome"
-	use qt && windowtypes="${windowtypes} qt"
-	use X && windowtypes="${windowtypes} x11"
-	set -- ${windowtypes}
-	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" ${HACKDIR}/dot.nethackrc
-	dosed "s:GENTOO_DEFWINDOWTYPE:$1:" ${HACKDIR}/dot.nethackrc
-	insinto /etc/skel
-	newins ${D}/${HACKDIR}/dot.nethackrc .nethackrc
-
-	if use X ; then
-		# install nethack fonts
-		cd ${S}/win/X11
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto ${HACKDIR}/fonts
-		doins *.pcf
-		cd ${D}/${HACKDIR}/fonts
-		mkfontdir || die "The action mkfontdir ${D}${HACKDIR}/fonts failed"
-
-		# copy nethack x application defaults
-		cd ${S}/win/X11
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack || die "Failed to install NetHack X app defaults"
-		dosed 's:^!\(NetHack.tile_file.*\):\1:' /etc/X11/app-defaults/NetHack
-	fi
-
-	# make sure we dont overwrite previous settings #16428
-	local statedir=${GAMES_STATEDIR}/${PN}
-	dodir ${statedir}
-	mv ${D}/${HACKDIR}/{record,logfile,perm} ${D}/${statedir}/
-	for f in record logfile perm ; do
-		[ ! -e ${statedir}/${f} ] && continue
-		mv ${D}/${statedir}/${f}{,.sample}
-	done
-	keepdir ${statedir}/save
-
-	prepgamesdirs
-	chmod -R 660 ${D}/${statedir}
-	chmod 770 ${D}/${statedir} ${D}/${statedir}/save
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if use qt && 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
-	einfo "you may want to look at /etc/skel/.nethackrc for interesting options"
-}
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index d7f083f2474d..fdee35496b6a 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-2004 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.3 2004/08/31 21:22:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.4 2004/09/10 09:52:55 mr_bones_ Exp $
 
 inherit eutils gcc flag-o-matic games
 
@@ -16,7 +16,6 @@ KEYWORDS="x86 ppc sparc amd64"
 IUSE="X qt gnome"
 
 DEPEND="virtual/libc
-	dev-util/yacc
 	>=sys-libs/ncurses-5.2-r5
 	X? ( virtual/x11 )
 	qt? ( x11-libs/qt )
@@ -33,9 +32,9 @@ src_unpack() {
 	source setup.sh || die
 
 	cd "${S}"
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	epatch ${FILESDIR}/${PV}-default-options.patch
-	epatch ${FILESDIR}/${PV}-bison.patch
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+	epatch "${FILESDIR}/${PV}-default-options.patch"
+	epatch "${FILESDIR}/${PV}-bison.patch"
 
 	sed -i \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \
diff --git a/games-roguelike/nethack/nethack-3.4.3.ebuild b/games-roguelike/nethack/nethack-3.4.3.ebuild
deleted file mode 100644
index bb4591fa6c7c..000000000000
--- a/games-roguelike/nethack/nethack-3.4.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.6 2004/07/01 05:21:55 mr_bones_ Exp $
-
-inherit eutils gcc 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="x86 ppc sparc amd64"
-IUSE="X qt gnome"
-
-DEPEND="virtual/libc
-	dev-util/yacc
-	>=sys-libs/ncurses-5.2-r5
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
-
-HACKDIR="${GAMES_DATADIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# This copies the /sys/unix Makefile.*s to their correct places for 
-	# seding and compiling.
-	cd ${S}/sys/unix
-	source setup.sh || die
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	epatch ${FILESDIR}/${PV}-default-options.patch
-
-	sed -i \
-		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \
-			|| die "setting statedir"
-	sed -i \
-		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
-			|| die "seting hackdir"
-
-	if use X ; then
-		epatch ${FILESDIR}/${PV}-X-support.patch
-		if use qt ; then
-			epatch ${FILESDIR}/${PV}-QT-support.patch
-			use gnome && epatch ${FILESDIR}/${PV}-QT-GNOME-support.patch
-		elif use gnome ; then
-			epatch ${FILESDIR}/${PV}-GNOME-support.patch
-		fi
-	fi
-}
-
-src_compile() {
-	local qtver=
-	has_version =x11-libs/qt-3* \
-		&& qtver=3 \
-		|| qtver=2
-	cd ${S}/src
-	append-flags -I../include
-	make \
-		QTDIR=/usr/qt/${qtver} \
-		CC="$(gcc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		|| die "main build failed"
-	cd ${S}/util
-	make CFLAGS="${CFLAGS}" recover || die "util build failed"
-}
-
-src_install() {
-	make \
-		CC="$(gcc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		GAMEPERM=0755 \
-		PREFIX=${D}/usr \
-		GAMEDIR=${D}${HACKDIR} \
-		SHELLDIR=${D}/${GAMES_BINDIR} \
-		install \
-			|| die "make install failed"
-	newgamesbin util/recover recover-nethack
-
-	# The final nethack is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
-	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" ${GAMES_BINDIR}/nethack
-
-	doman doc/*.6
-	dodoc doc/*.txt
-
-	# Can be copied to ~/.nethackrc to set options
-	# Add this to /etc/.skel as well, thats the place for default configs
-	insinto ${HACKDIR}
-	doins ${FILESDIR}/dot.nethackrc
-	local windowtypes="tty"
-	use gnome && windowtypes="${windowtypes} gnome"
-	use qt && windowtypes="${windowtypes} qt"
-	use X && windowtypes="${windowtypes} x11"
-	set -- ${windowtypes}
-	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" ${HACKDIR}/dot.nethackrc
-	dosed "s:GENTOO_DEFWINDOWTYPE:$1:" ${HACKDIR}/dot.nethackrc
-	insinto /etc/skel
-	newins ${D}/${HACKDIR}/dot.nethackrc .nethackrc
-
-	if use X ; then
-		# install nethack fonts
-		cd ${S}/win/X11
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto ${HACKDIR}/fonts
-		doins *.pcf
-		cd ${D}/${HACKDIR}/fonts
-		mkfontdir || die "The action mkfontdir ${D}${HACKDIR}/fonts failed"
-
-		# copy nethack x application defaults
-		cd ${S}/win/X11
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack || die "Failed to install NetHack X app defaults"
-		dosed 's:^!\(NetHack.tile_file.*\):\1:' /etc/X11/app-defaults/NetHack
-	fi
-
-	# make sure we dont overwrite previous settings #16428
-	local statedir=${GAMES_STATEDIR}/${PN}
-	dodir ${statedir}
-	mv ${D}/${HACKDIR}/{record,logfile,perm} ${D}/${statedir}/
-	for f in record logfile perm ; do
-		[ ! -e ${statedir}/${f} ] && continue
-		mv ${D}/${statedir}/${f}{,.sample}
-	done
-	keepdir ${statedir}/save
-
-	prepgamesdirs
-	chmod -R 660 ${D}/${statedir}
-	chmod 770 ${D}/${statedir} ${D}/${statedir}/save
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if use qt && 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
-	einfo "you may want to look at /etc/skel/.nethackrc for interesting options"
-}