remove old (broken FHS)

Package-Manager: portage-2.2.0_alpha153/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 13 insertions, 164 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/Manifest b/games-roguelike/tomenet/Manifest
index 9eea83e80804..d4a934fecb1e 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,27 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tomenet-4.5.0-makefile.patch 1499 SHA256 328b0d02987940b85a19834f242ac2026d783792843b7d0be8f2455d9af3ddc5 SHA512 5512462c3f28237f7b0b773bb7f806096c31c81ab404a3e4d69c5b7a3852b42f3383f42eb685d62c86be72fddb2d28a86f280eecb817b05e957509ad2bd581c3 WHIRLPOOL 5cb902059189773ff2cde6daf33fb67dd8d21eed330c50c9a52557562c1fcaac980fab446081a05d93291db636f56f762f8776ae2ad28cce59ff4008f10fc7fa
 AUX tomenet-4.5.2-makefile.patch 1655 SHA256 90c81421117d372d7ab57881d87d1fb6ec250eeeb292d95e41df2a55770067d2 SHA512 d949c96dcd710b9549db05ace79816bd3a516e41ce1fe2c2fa1111dfe6852a4d8743e51362ab9581d971ce01c807b85ab9b836b83f691d0b1cb05a4cbe94b63e WHIRLPOOL a3f85e1ccce1f2d9acc451bf735e0dc187226357066ebd833561623ed1e4e7c242c46469e53e379b1fb9afbe0e3a8b5945f4d5132d846e5b0f699ba3ee71bde8
 AUX tomenet-server-wrapper 105 SHA256 0133c13d1276cd528d4f4686db6226faf43a964acb02eca08fbf4cc8618412f4 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3 WHIRLPOOL c635eeb761fd2014194b49f8eebee9581b705a06da067ab55258aba51241d923df16feaf145b3e0f28f2e0484dd92f5653f25f542d4f011ac9b5ecb71c6313f0
 AUX tomenet-wrapper 446 SHA256 c1eb467f742df807440230f82a193e6b1f283ab48bcb86b21d76b5a434babd0d SHA512 f148ad2fb52c060ada829810edc46d3aee6bd6c5229489a52b6af080b38b164c0417157bb8ec21294e16903b3e8328329fbb86645ab57a0f0a4407875844c5a2 WHIRLPOOL 773ce42ac55e1a73c57df1dcb9092a0c92c37160e78c2943389547eeea406e3051dbaa2f45e6abb69eeebe5a886f0f79ca871d0234f8b59b13b3f2f52d7e843f
-DIST tomenet-4.5.0.tar.bz2 2628908 SHA256 e74bdcdea6c05eff8247e23f59baa773c53472196b415e79cd4d37f4937e6f56 SHA512 e85c6f1c51e4317f9806070894440e2a9472fe6147d7611d29dcd84e69329c58b4cb2d6ff2b7c5fa59161c9a6fe4a9d607050db8c9a3a0e6d71e7404df8e0c47 WHIRLPOOL 154babe0385c29c43689bc6490c89c5f018e73ddcdcbc6eff03f91ee343c0d255d6130d748b51362d5c7509bc7e537be4ddd371ac3c20af3d387551757dccff7
 DIST tomenet-4.5.2.tar.bz2 2647359 SHA256 29f09d36137e788e7a4df3872f2aee9f476cc714dcdb74c2e57899567869a798 SHA512 44fea45df8984bce7636dca2ea4bfa31d7771643720fc5b242b52c4a461aedd812936c0f888be81cc763b25c3f4d1840b755a70e8fe959110cb4512003bb72b9 WHIRLPOOL ebfcc43a0abcbd297e16d1e8a624015b0c22d785f8469023a1042f69f4efee4cf76c8f56a59e26d1db56df61aec04611913a58d5b68df6e22e6bd5b628091cd4
 DIST tomenet-cvs-snapshot-100310.tar.bz2 2253747 SHA256 f76872a4f36d5b509d1b4e9c4449610b7f5f1897928541b8fe5d96f81095d658
-DIST tomenet4.png 1641 SHA256 4b6a56defee04d9144d4d80b672e048a5d612e65660d93f7441f4f3f8b40d9b7 SHA512 6ece9a1a5831920a069282b6764b8023b6cee679dba659a61cfdd0ee9e7919ad48de8ab8de9224be405f16594f16e7471c7306b58713f1e4f2491365ecb2b531 WHIRLPOOL 5f734674c780da90dcd9b850344a39b4e6263450489af47c7d65ac11e36238a13490e405355389a5118d7a55ab3989117c24984980587f888d67281017b31a20
 EBUILD tomenet-100310.ebuild 1389 SHA256 df9a2fcd1167fc930546c8d17835ef792f83b0013d60897dc2bd813a1f7b70d0 SHA512 d49d251709595b678caeb209e335fe2cab1c2836b6723a267b79bbb0008453b89c548d636f0727b0174afc8e0a41e7e4ca948c1af2fb8ac8a2678a612e02adf0 WHIRLPOOL f73131b8b78444d55e86af66699ed86d85221ef9388f488f1b4ce1af6abfdc1428ff680188d87a9cac865bb7f74f12ba55b1f358e569bcbe7aaadb889915051d
-EBUILD tomenet-4.5.0.ebuild 2247 SHA256 885df499636e6a77c82b22c9f8f3ef2fc811ee215e3767b33aa0737a3330fdd8 SHA512 aeb5429a9e673cf71fdaa94c30d59d57a9cd8ade33b9f1659b71592f97be28574ba8248f987d2eb876872bc0869113256a6c349f9c5f22007e045bd5df0a5a71 WHIRLPOOL e09364b4a09974393b7a7129bd1227e73cfceeb1505b29e2f0a00fe0d83c5390d65f986739b0e0b264788016de75263402df7e1360ec057f33071c66c6ad9a12
 EBUILD tomenet-4.5.2.ebuild 2222 SHA256 4e5ea09cb1d36bd49f225db1759c6f852c56b2086f7d0c99f468573d6c124db5 SHA512 d1bc31a50d1b8ed69408ee2a4c09f5f9508fd9af55209dce7da9780636b152708e60a67f49d6f771d2f4e51d38d9b79f938b5f52680a986749342ce152c426de WHIRLPOOL 0339919205fea2431d2ef5f6aed5c5014b27f6bc7cc8d9a0422abd98ab2c9b8b0d0e4e99c279d6b546ce599b132614faf2804fa3a3d9af618acaff69a4c0f960
-MISC ChangeLog 1674 SHA256 a0d5d0b3d7afb94497e5faadb4e159264fa7dc8df82adb07f2e85b20ae56c0a1 SHA512 8192bc6090bc015d4aca501e33a0110754bc0cb9839e921411b02a76d4fbfde67720f7d3e68549a56c320407d0f1c381608b24701d8407542c5e8c2386d7ee8a WHIRLPOOL 282978caa004f009929d979fe36ce322758c40b5654e097d9889ee363906ae6bd707331129361dde08ac5687ee8a87a12513777dd6b1e440304b6fcd68981500
+MISC ChangeLog 1814 SHA256 0770ff06a0c82acf53ff35c7824dea668ce32d225dab5aa4e42f94e3c268b724 SHA512 5a12d5bbec564c482ec56c311b9f815e40f08af9c00c9f5e60289f73ec3a526bd85fbf253d523dc38eeb0274c23587ab8896a4a4a24afa8296b71ec77a18f5e1 WHIRLPOOL 71eb10038069ed03952aa0d197b9fd1b6f27c28284a59da78cd678b0c3fd4e38c27b6fbf567e8f8a0ea8f1fdb51b2e74df5f5fb49f1bf7dfd5583c677920d87d
 MISC metadata.xml 702 SHA256 87ae42911bd86b56de7c0bc51d6ef64c71bcfee305540e923bc98454a43c4485 SHA512 b9878d09060df615054d8a2a351b7f90d2ae385bc1740d640569c97b3f6961136f5f6df2f2485dbe84e9f5ca311e9eb4816d11ab04a348aac9b05b0fe537d107 WHIRLPOOL b56e0cd138185a7b2e7dc8f92b9d1de088bdcf2bb8197bb88a95498d895f5a2b7aaa2421e77702b720735d7016bc94edb29a92f17842f6bc091a86fb1b641b24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ+CjGAAoJEFpvPKfnPDWzoZoH/1XyKxOsPpN0RDw2PsclJlZD
-PFHlL40QqZbxO4Y+U5LEVDGsPgKGiCiSMAQ0mwqk1tefB2Wow65EXgzfL3AzI3N8
-yEHkIwjQH3lKFQ4tIVLJPjctOQ36Q7qc0Evr2oNwTBG1sxarELHKob9OLJWj8OVI
-4Xy+vK9PyWVHM7HaBmjpohhkY/yPsARs9yU8/eLOSbWDizsv+pxZ+c5dXA5wyZP0
-T1cRcBuK4SwNTePybnXc4a3J2aUalfM1K4wWIZ+65SE2qLHJimWiibrey1L5HNdb
-WD4WGbkfdw+K83Pi2vBLqm7t1pubNWnKXDgG1aXrQ0KrD44UjKI6Q/dQiSK7ad8=
-=3UnF
+iQEcBAEBCAAGBQJQ+CoGAAoJEFpvPKfnPDWz4WkH/3XRNNebyvjBQq3Iw6WjMNox
+/k2/mSaA9ZCDqS2LVeJsncVmnWoYHA5gYA2Q15H6tzq04LXzYaur+K2vVBlM8Soa
+A0hUN6zTRKn2ji2bVLfvr3w8OXRZXdzT24aJhbnRmPPpS82YjgPbyejtXt2XZKPt
+N0qJH6LldmkQbkf5Bw3Q+k6PHZoSUs1vp+JxHt4/BUblD70qkZwflizN7puk9nVD
+iWulWujKlpkUSZN6Dc8t3YHfoj9fC2Drk8oG93q5MGueKodSApIbkSFaesKFvAhk
+dYWvoYUtYRj0WCdrCWF/wsCW2oMVeIqALSaKrSmQqGhIrndTbtYMuRLpaSawGKU=
+=rgHG
 -----END PGP SIGNATURE-----
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
-}