remove old (broken FHS)

(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 5 insertions, 152 deletions

diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index fc9acad912a5..89a882061f06 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/tomenet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.10 2013/01/17 16:37:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.11 2013/01/17 16:42:47 hasufell Exp $
+
+  17 Jan 2013; Julian Ospald <hasufell@gentoo.org> -tomenet-4.5.0.ebuild,
+  -files/tomenet-4.5.0-makefile.patch:
+  remove old (broken FHS)
 
   17 Jan 2013; Julian Ospald <hasufell@gentoo.org> tomenet-4.5.2.ebuild,
   files/tomenet-4.5.2-makefile.patch:
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch
deleted file mode 100644
index 8c78b42fd531..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.5.0-makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- makefile
-+++ makefile
-@@ -185,7 +185,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -197,11 +197,11 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP ?= cpp
-+#CPPFLAGS += -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- #
-@@ -225,6 +225,15 @@
- #CFLAGS = -Wall -g -pipe -DUSE_X11 -DUSE_GCU
- #LIBS = -L/usr/X11R6/lib -lX11 -lcurses
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef DEFAULT_PATH
-+CFLAGS += -DDEFAULT_PATH=\"$(DEFAULT_PATH)\"
-+endif
- 
- X11BASE = /usr/X11R6
- 
-@@ -241,8 +250,9 @@
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm
- ##
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -O2 -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+CFLAGS += -Wall
-+CFLAGS += -I${X11BASE}/include -DUSE_GCU -DUSE_X11 -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 $(shell sdl-config --cflags)
-+LIBS += -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm ${SDL_LIBS}
- #-lXtst (for numlock - obsolete)
- 
- ## Uncomment this if you want to bundle libraries with the client
diff --git a/games-roguelike/tomenet/tomenet-4.5.0.ebuild b/games-roguelike/tomenet/tomenet-4.5.0.ebuild
deleted file mode 100644
index af05a4d2e66d..000000000000
--- a/games-roguelike/tomenet/tomenet-4.5.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.0.ebuild,v 1.1 2012/12/20 17:34:58 hasufell Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2
-	http://dev.gentoo.org/~hasufell/distfiles/${PN}4.png"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound"
-
-# VERSION BUMP REMINDER:
-# libX11 might be optional at next release
-# via -DUSE_X11
-DEPEND="sys-libs/ncurses
-	x11-libs/libX11
-	sound? (
-		media-libs/libsdl[audio]
-		media-libs/sdl-mixer[vorbis,smpeg,mp3]
-	)"
-RDEPEND="${DEPEND}
-	sound? ( app-arch/p7zip[wxwidgets] )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	rm -r ../lib/{data,save} || die
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex sound "USE_SDL=1" "") \
-		-f makefile \
-		"${mytargets[@]}"
-}
-
-src_install() {
-	dodoc ../{ChangeLog,TomeNET-Guide.txt,changes.txt}
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 "${DISTDIR}"/${PN}4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		dogamesbin accedit tomenet.server evilmeta
-		docinto server
-		dodoc runonce runserv runserv3
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use server || use dedicated ; then
-		elog "Server scripts in /usr/share/doc/${PF}/server will need adjustment."
-		elog "\"lib\" dir is in ${GAMES_DATADIR}/${PN}"
-	fi
-
-	if use sound; then
-		elog "You can get soundepacks from here:"
-		elog '  http://www.tomenet.net/phpBB3/viewtopic.php?f=4&t=120'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}