version bump, remove old

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

6 files changed, 190 insertions, 263 deletions

diff --git a/games-fps/eduke32/ChangeLog b/games-fps/eduke32/ChangeLog
index 305fa22f792d..ff710e13c274 100644
--- a/games-fps/eduke32/ChangeLog
+++ b/games-fps/eduke32/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/eduke32
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.8 2013/06/28 00:07:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.9 2013/11/22 19:44:23 hasufell Exp $
+
+*eduke32-20131119.4169 (22 Nov 2013)
+
+  22 Nov 2013; Julian Ospald <hasufell@gentoo.org>
+  -eduke32-20130207.3467.ebuild, -files/eduke32-20130207.3467-QA.patch,
+  -eduke32-20130317.3572.ebuild, +eduke32-20131119.4169.ebuild,
+  +files/eduke32-20131119.4169-QA.patch, metadata.xml:
+  version bump, remove old
 
 *eduke32-20130627.3905 (28 Jun 2013)
 
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index a970580f107f..580a8fcf29ea 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,32 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX eduke32-20130207.3467-QA.patch 4354 SHA256 a2f774e625284db8f2cbd1c366e3df0e16597bf948c8b0cff86ee6a65899cce4 SHA512 542c8ed8b79ae86aef74efcabf53834c41c348e7327418b392245b4d5d0ec8cb836d378f324c5d6787fcfe989c22df8d99f73016a67280c97191884e1fa482ab WHIRLPOOL f6879bb4d745227d812ecdfe09d625e1d3b38f3ac22a99ec9c080e9b8484eb797179a244a954600d93749a16781003f0d5762600a137a52be1cb2e2360b22afd
 AUX eduke32-20130317.3572-QA.patch 4584 SHA256 539891e0b87cc1da985e5fa2ef0f0bbf7d96a45218008d757700a279f63d0a44 SHA512 6d7909685edbabd2351d3d1cc7a0ede43d52ff8c7b4723bd12d1e6bc8f35d955a96d397b3a60fb7b40fd4166f6f88a02c66147d89dc2956c17d84abcb78ec343 WHIRLPOOL 979e5fbe6da328402725a2e8d2bc4e46fecdb12c2526352f8c9f453fc5bfa43cca49c756a7c99b1ae05ee09fa31daa0413b982755013283c9d36a77abe20b484
 AUX eduke32-20130317.3572-libpng-1.6.patch 1346 SHA256 8bbf0cdd185371318f7867b185499498d6f38f0ecdcaff1fed7cd5f0c2ab8045 SHA512 7a9d2c199efaddc9bab3308a6f96020b009dfdd13066e09637bf6ff24b4a036bd639d3f6c215f2692f26fddacc8069c62c245942e7f7c31de205832ca4879053 WHIRLPOOL 8ec08e7201d8c2a5438dd0e9219e45b9f64e29e4f49ddaaf85c0a70e454efd30685c241c8264e4625c16289f267e09b547f2e9ace324d2719a04ec29637a2464
 AUX eduke32-20130627.3905-QA.patch 4456 SHA256 6d6b952a07b53e03eadd4a75f06a5b8ee501e1530945f5398a4a68aa56835697 SHA512 ab2a9706229ce6a1c2b3aa31a39ef9464fe432c15e23d1758c8e13bb5380719298432f6096d474ee6a4e8f30ac64e5c4c5c181018670622c22145a49f9c3ac9e WHIRLPOOL 020338f875f4fd685b848375d7a4fd87928b959f7b4367e4152ad384f3bc3af2b8e0b0d318d9b22de4f472fd505aea9357ff6caeacc5d5a388003c56ebdfa3a5
+AUX eduke32-20131119.4169-QA.patch 4485 SHA256 6676ba6a48369e73dcb4c00443c672a2226d4bc3ca533ae353b5165c61a40ff6 SHA512 6b23e5d9de1d6fbdf32fced01e9432f1d96442c44fdb591cf3e51830b57622c5734c10c2c0de8ef6849f75697fd9394c14ce5ab16271774a7bd46bde08502c4e WHIRLPOOL 728c09a7bd1b690683384d2af3f04965985e38a45d6770bda582bde4eecea8d7c5b36338df2933566b0b6902e4328da599767a437ad5a9f66d91839784d57593
 DIST duke3d_hrp_5.2.zip 709961560 SHA256 d5dc9ef4be517de1464e8ed886f2a6352402fdec2b9cf271d292a5aee82fae27 SHA512 6b80739082d01e879ee77c85d3702269a605bc5f5b9393ce2f391d50c2a14e8fd0cd274a7e3010636646c3b7725591f45f107503c04a84655621a197f5f3c69e WHIRLPOOL 03cbc7fe0b8f3f7d4eaf7e5df4d8c9537ffaa0e7a49d938f0138bf0a6c87a72ecfa30666a94ec228dc66da6e55a6632d08340edcb2c49d9c4aaa4031ab5f231c
 DIST duke3d_mus_3.0.zip 129992841 SHA256 6dc9eb70ee1850519b55e547a399e3f7f03ddf60a6b16b0e205edd8a05bdda4a SHA512 9b782a2b6bb006a01e7ca2a8c395fcbe0884cc7648fce03f7760d67e67e4b03d73e31fff5964a604270ffddf09df69f306147dffd115efcd738de416939060cf WHIRLPOOL dec7613bf321a8392361ed414c3cba1909adf6106ae16fe04858549d8574d696f677ac90b0a8a7ab7cf6fb31b6263223b03434536f528c7f50c8b77fd7c059d2
 DIST duke3d_musopl_2.0.zip 266444907 SHA256 4f0afc46bfb5f38b1a1417a6145c0c548355cf4c4438e0330a9de704b139f1c3 SHA512 e9ae69727f84ff71bf9abffa283fda1fcaf56fd6ae6b865d12f138d64b0fca0d36fd9695b1e60a64716154055373eecd6499ebd8801a4ecb55ddc4722208eff7 WHIRLPOOL b69b76050f97785b54a1693b3f9eeb124b208cb785719c9c37a499a7af8f9cdd2362a7ce0cab81b17a3ab7f80744eadd0a286b45844dee6bf37e0f320d61148a
 DIST duke3d_xxx_1.33.zip 26586453 SHA256 c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534 SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf WHIRLPOOL 1e7c8a06fd8ff558a8f5a5cc37093fe055555bdfd296194935c986978b4630c225a1f5da7d54e274bd8a5258a4b518ffc2456c79f515185bfb6e403488cad125
 DIST eduke32-icons.tar 102400 SHA256 efce5cddd9a55f07824f5739831b79cff2ea6e508f0b17b996316533af925842 SHA512 797f76cfc0e253ce3364e80f70b616fc004811c08519020727871addc90c7780b475ee7769398e13859f93893ccbb916bd4229a39f4c119169a69231e6fd411c WHIRLPOOL 9815abce63dcf8e865c61610f1b04915ced9b29c65cd831022f5b6f261bd55efc700b6fd5ee2741332023b85682b08d3a327998c57be33846dffdcb60eb1339b
-DIST eduke32_src_20130207-3467.tar.bz2 5707852 SHA256 95bd278a3d0e88dd202ee93616bbc55a64e88f9947efb80e058f7174cd66d021 SHA512 84b2effa4b5a6b60d60096dc216cb217e0b6a5998ecb76460ccb93cf903dfe24b464b4b99d142ebc4f7c0999761106f4a7d10b42d61575a93a7b1c43ead44d51 WHIRLPOOL 4892a3dee06a86ccb2d4ef05f1f01069e088d01445872e81703c21b28e12c5d002f09471e6f52c698609186c38d947ce5f01df27812d3077dd96f5a7a44b2435
 DIST eduke32_src_20130317-3572.tar.bz2 10591673 SHA256 082b0676f184ad6fe574925f9be95e31318b9eff38a7117c9d094fb64b57967d SHA512 911c282918ae6173ced1bca3461da69ecb7c5893023dfe9a4d1261fd47b64aba1fcde9514746ae38daabf8ece7739f8e1c9257e68d929ef607bbcff030179e60 WHIRLPOOL 1642facdedd1a8824ac1d453278b3ac6d61d0dfd72210511cf1855bede570bc3111b972f7f6fe984f9aba039f28967e4e546d7e8f53be7e592ce1a8b1f19cef5
 DIST eduke32_src_20130627-3905.tar.bz2 11047453 SHA256 de177c7f064c8fb44b78d31cc4ba35c35b29525bfecee628fe3b171fe7b104c4 SHA512 16ceaf3c6949078a3fcbd66d1e0d5bf9be4ef1c1595fe93b00b7fc7de8c2f329e7f2981976aad8f417d1d6977b30f6176d5f399714771499aeae229db390f483 WHIRLPOOL b83504536ad6dfc70588116b7b91102a0623d149d47b7747dcd5b8b15aa0782a7f28fd757bb63a7a4dd5f2a9468f631b8242f9ec41b637d098aba24019a52a23
-EBUILD eduke32-20130207.3467.ebuild 4281 SHA256 608c1a6c9f1d6f639cccb0f04f002ee23006feea0571e15fd00700ae635951d0 SHA512 8f6b5fb2c5496ca42e771c893325f4c981aecddc9ba666af7db08531624dcf92a2a6c98fbadf79cf7ef08874ce71495dbda96bba612afc4610fb73c251756f2e WHIRLPOOL 9e56add07d73b587a6c98a1a47abaa9135ccfae90d17f7229574b061c3d12227a36c009299c944b3ffac56a696acb6ac62ae468deafc91b24e29a9d1cee5f02c
+DIST eduke32_src_20131119-4169.tar.xz 12228040 SHA256 1aaeadb7b8ac68d6a7e3b0cc568875df6a2b319cc7626c6a4d38cb69fa5f162e SHA512 6ab7babc18c80e111603b9b731f37963f3bfe2ee753a2e383d58a21e77ad5a561cf95f5392adcf76259e6ded2dcd5eb5d0fc484edf65ec6887a746c4f422f292 WHIRLPOOL 576e0f0e73b383fe221ef5db8b54889bf3e8271e361a0af41fd1a914d8a9be3711a9b536d668790013f8fcd0ea3c11b31b47bf333e685bbf853f48152e2fc194
 EBUILD eduke32-20130317.3572-r1.ebuild 6465 SHA256 61296578601dbc0beea59cbd67ef57360f19db91318f88479a1635688739011e SHA512 adfc89ecc91ebd4fc149d8f9788744a18a0788b345b7bc657bd52cb7edf2e264313a38bbd4b2a2864f35d286d5cdaf2c4be5c5722c615cd7502e0088db4d21fa WHIRLPOOL 91a38c3daddba853d4a4f2fee67b7765f4c301d2a6df75b2a634601f431ec92a1737b2555bd3194593e39aa9e7225f4fe66d49b22d76e203f9face6f3ccec722
-EBUILD eduke32-20130317.3572.ebuild 4281 SHA256 b2382001a625a6907629d9440b93ae891ad8794a45283be4eb92f80d7393cb71 SHA512 5075f0bbba780adfd2812f22e8692cda260f6b76f2e7adeb6364d658720619822b002367d7f98d53ade6a6d3b877b80b58167fa9bfd42b75597c5c46288535a9 WHIRLPOOL 9d8fe2514293efc324cd28563e6398ce2523494a2de2f0fa304a0612c967a41ac36daca5f43df64a78f6c918ce1a5446c3c1e4b3133e231b49ffc14335dd5aa3
 EBUILD eduke32-20130627.3905.ebuild 6458 SHA256 8d98136327ca9095f63094df09ef066f9eef871238e43419db8bd606a2cf3c2e SHA512 67f96ff03443136f53576d1dfb1f4179257838cd28d9413b2d3944f3ea29e2ca8396e12fb279a84e521819ab9e0fbbf1cd553ebf9a882eaa082fbdd961c3a1db WHIRLPOOL bbc87a799b6095e028268bd5764f28741f1ee100021ef9fb674fa4c559195317138ec42af49c095a11f3876e0beb1ab79877db89a6af8c5fcc5bded18a8354f4
-MISC ChangeLog 1683 SHA256 f87657bfac0fc2ba4370b1a36894cc975fd5db7a62f71cfd54c65a1b8bfe89bf SHA512 ff372f9ae44ba28ca1c0c81bc03b8d303629b5098174cc13b514119ee0759306bed9653d55e87b1368611df043855c0bc0c66195af04aabcb241251714bf354b WHIRLPOOL 931c995ee591bc161cb93c27f48544bf78b354dc4f312e73a1e69e2a2121a81583fdfacbdd1fa63e1e7498baca149f0ac38e92be7879f58e4c656ea6973d7291
-MISC metadata.xml 935 SHA256 8a0d14f365b505bd844e29a4a6d78105dd85ac7f006d54e725c5ddb39b430ec3 SHA512 a73aed4971a38b46c906c69a7cc052e2faafa40766207befdc3fea99ff6278729b867c0757000216542db6902eef3398491338dc56b7dfc3459c66bb8ae34898 WHIRLPOOL e049c978f5f7ebdc6aafa1a2f9f11664b6c3d8e03e0f75fc483e18b3ff7e7dc6f5360cede02290ec8b70cdfa6fdbe94b5d7d1f9bfce7c4efcbdef8198fd271a9
+EBUILD eduke32-20131119.4169.ebuild 6470 SHA256 46088588a0fd15c2a2c8ba28aafe9fc91e7ecb654ea4f247b35be9df10cac6eb SHA512 7cd3fe650f6ad6b38196899badf2bb9be098381b74ed7aa81686dc35c8c556af57933cb7567148a640ad101577b274d59d562a75877718ec52da7f8472479a43 WHIRLPOOL a16b64a641288936f26b9cba2f83826bc6257f21fbc8d4700427754b4de332f8cca25fd2f818c9af1a8ac9fc688e753db212e203246742937fc1332b0e87df0b
+MISC ChangeLog 1991 SHA256 9b634c6ae82929a9084ad3c2b8c86d1afdb0903e3ccd2597243d4c5f1b141978 SHA512 f1b5388a986299d1f795887177736ccda3b9c53127ded20eb08e3a82126955f84b85b59dcc3b2b6e7042e519b8347e7cc53983d38651c00be557a747534fca2b WHIRLPOOL bc37499eee5cfe0e1e2f4be528544943c12eae8fe64eb5d58b387ad8caa9abc95e8026b673403eeeee7fe21a3ad7125b9996939526d3e4fbcb361b6ac089c912
+MISC metadata.xml 1021 SHA256 ce6e2cdb18b2c4e8882714da2eb4d3be795c9b124dec883da86d49d204228621 SHA512 3e337730eba15a6be40d184b8d06944cf52516a02ddb9e7b74e24cc6512b44511cf56e610d6565c9431ecc8e0760e87e8da267223c1f37653156cfed869cf24d WHIRLPOOL 9b906fe56aef04263520c6e63ef5ff9443942e0669484166f7a7d34b0126f5e42275c8f5bbba3f70e03f7f02ace159867bd0865ab54e9ff3c8a3acff55ceb456
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRzNO8AAoJEFpvPKfnPDWzFA4H/0WIO3dwwWm4Q/oBRSXI78xe
-tBvAK4GDitiL2XvtnVcpu4wroVnZ+vmshE1ky7DW8OGw1tXixoQjoBG2Mpi0xlzq
-CPfO1Qfjyaa30TNM+xZAW+I8vqH9T138XdYgg2LMh/ZfABCGlS8aHw1VMZAJVlvG
-YI0Jexy/E4TgkSWvN5vTIK2uIWf2ySGM8nYr0ObtvB530pqATpgwkszH24QRx/vf
-5g7txcCMlbqLw+4YgY/nj4HJbS6ihXOVnbxkqqZ/UlzDupa+F5B/k82csftWUe8a
-uBDRBeKsy+DAbjNA3BMhpVx0tmE1WeDWrccDUaFvVbtRJ0O90A8l4W1OmdFz8IM=
-=bmXc
+iQEcBAEBCAAGBQJSj7QZAAoJEFpvPKfnPDWzLKcIAJKLj+3tw4m1LrRPAxVzJOYZ
+XCT+G7TtdpkW2e6HfMxgMwMyk+gSs58j4mdEbCL6kPZ3Un7gjyzcYm9Ntjw6SM5+
+1AJgE/UdgOjwi4K7bpozd8WozTvuAgwIikQ8PTzGr0k7b2gz8VtHES2lcJszlq/+
+zw6iUYnACx8n1a+MGfSSPymSI0BHJZCWWMNSVcj45sXOkoW0Gtf1cflhkZb4jyxr
+kUmJvp7OXDUkEhNfd8pD7JH1V2mZMx5A6/L3v4/gXt+n35KJ+L656G0PdSUv6+Uz
+GgabEAq+6fF2S88erwmrS9tIJEjVcdmGE7dttMzYkaPNn++yX6uu7VCCGJnn1Ag=
+=/auN
 -----END PGP SIGNATURE-----
diff --git a/games-fps/eduke32/eduke32-20130317.3572.ebuild b/games-fps/eduke32/eduke32-20130317.3572.ebuild
deleted file mode 100644
index 280a0b3938ce..000000000000
--- a/games-fps/eduke32/eduke32-20130317.3572.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130317.3572.ebuild,v 1.1 2013/03/17 21:16:21 hasufell Exp $
-
-# TODO/FIXME:
-# lunatic broken
-# lunatic? ( >=dev-lang/luajit-2.0.0_beta10:2 )
-# $(usex lunatic "LUNATIC=1" "LUNATIC=0")
-#
-# extras? ( games-fps/${PN}-extras )
-
-EAPI=5
-
-inherit eutils gnome2-utils games
-
-MY_PV=${PV%.*}
-MY_BUILD=${PV#*.}
-
-DESCRIPTION="Port of Duke Nukem 3D for SDL"
-HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/"
-SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2
-	http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar"
-
-LICENSE="GPL-2 BUILDLIC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo gtk +opengl +png samples +server tools +vpx"
-REQUIRED_USE="vpx? ( opengl )"
-
-RDEPEND="media-libs/flac
-	media-libs/libogg
-	media-libs/libsdl[X,joystick,opengl?,video]
-	media-libs/libvorbis
-	media-libs/sdl-mixer[timidity]
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? ( virtual/glu
-		virtual/opengl )
-	png? ( media-libs/libpng:0
-		sys-libs/zlib )
-	vpx? ( media-libs/libvpx )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-PDEPEND="cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )"
-
-S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
-
-	# Point eduke32 to data files in shared duke3d folder.
-	# Multiple search paths can be defined, so that with the default configuration as of
-	# the 20130128 release, this adds /usr/share/games/duke3d in ADDITION to
-	# /usr/share/games/eduke32 so that eduke32 and duke3d's base data can be kept separate.
-	# also redirect log file so it's not always written in $PWD
-	sed -i \
-		-e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \
-		-e "s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \
-		source/astub.c || die "sed astub.c path update failed"
-	sed -i \
-		-e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \
-		-e "s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \
-		source/game.c || die "sed game.c path update failed"
-}
-
-src_compile() {
-	local MY_OPTS=(
-		ARCH=
-		LTO=0
-		PRETTY_OUTPUT=0
-		RELEASE=1
-		LUNATIC=0
-		STRIP=touch
-		LINKED_GTK=1
-		CPLUSPLUS=0
-		$(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1")
-		$(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0")
-		$(usex x86 "NOASM=0" "NOASM=1")
-		$(usex server "NETCODE=1" "NETCODE=0")
-		$(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0")
-		$(usex png "USE_LIBPNG=1" "USE_LIBPNG=0")
-		$(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0")
-	)
-
-	emake ${MY_OPTS[@]}
-
-	if use tools; then
-		emake -C build ${MY_OPTS[@]}
-	fi
-}
-
-src_install() {
-	dogamesbin ${PN} mapster32
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg}
-	use samples && doins -r package/samples
-
-	local i
-	for i in 16 32 128 256 ; do
-		newicon -s ${i} "${WORKDIR}"/${PN}_${i}x${i}x32.png ${PN}.png
-		newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png
-	done
-
-	make_desktop_entry ${PN} EDuke32 ${PN}
-	make_desktop_entry mapster32 Mapster32 mapster32
-
-	if use tools; then
-		dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map}
-		dodoc build/doc/*.txt
-	fi
-
-	dodoc build/buildlic.txt
-
-	dodir "${GAMES_LOGDIR}"
-
-	prepgamesdirs
-
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	use cdinstall || use demo || {
-		elog "Note: You must also install the game data files, either manually or with"
-		elog "games-fps/duke3d-demodata or games-fps/duke3d-data before playing."
-	}
-
-	einfo
-	elog "${PN} reads data files from ${GAMES_DATADIR}/duke3d"
-	einfo
-
-	[[ -e ${ROOT}/${GAMES_LOGDIR} ]] || mkdir -p "${ROOT}/${GAMES_LOGDIR}"
-	touch "${ROOT}/${GAMES_LOGDIR}"/${PN}.log
-	touch "${ROOT}/${GAMES_LOGDIR}"/mapster32.log
-	chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/${PN}.log
-	chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/mapster32.log
-	chmod g+w "${ROOT}/${GAMES_LOGDIR}"/${PN}.log
-	chmod g+w "${ROOT}/${GAMES_LOGDIR}"/mapster32.log
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20130207.3467.ebuild b/games-fps/eduke32/eduke32-20131119.4169.ebuild
index 91f81d8f1afa..393097ef7404 100644
--- a/games-fps/eduke32/eduke32-20130207.3467.ebuild
+++ b/games-fps/eduke32/eduke32-20131119.4169.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130207.3467.ebuild,v 1.2 2013/03/17 21:16:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20131119.4169.ebuild,v 1.1 2013/11/22 19:44:23 hasufell Exp $
 
 # TODO/FIXME:
 # lunatic broken
@@ -16,16 +16,26 @@ inherit eutils gnome2-utils games
 MY_PV=${PV%.*}
 MY_BUILD=${PV#*.}
 
+# extensions
+MY_HRP=5.2
+MY_SC55=3.0
+MY_OPL=2.0
+MY_XXX=1.33
+
 DESCRIPTION="Port of Duke Nukem 3D for SDL"
 HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/"
-SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2
-	http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar"
-
-LICENSE="GPL-2 BUILDLIC"
+SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.xz
+	http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar
+	textures? (	http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_${MY_HRP}.zip )
+	sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_${MY_SC55}.zip )
+	opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_${MY_OPL}.zip )
+	offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_${MY_XXX}.zip )"
+
+LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo gtk +opengl +png samples +server tools +vpx"
-REQUIRED_USE="vpx? ( opengl )"
+IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx"
+REQUIRED_USE="?? ( opl-musicpack sc55-musicpack )"
 
 RDEPEND="media-libs/flac
 	media-libs/libogg
@@ -34,18 +44,44 @@ RDEPEND="media-libs/flac
 	media-libs/sdl-mixer[timidity]
 	sys-libs/zlib
 	gtk? ( x11-libs/gtk+:2 )
-	opengl? ( virtual/glu
-		virtual/opengl )
-	png? ( media-libs/libpng:0
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		vpx? ( media-libs/libvpx )
+	)
+	png? ( media-libs/libpng:0=
 		sys-libs/zlib )
-	vpx? ( media-libs/libvpx )"
+	"
 DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/xz-utils
 	x86? ( dev-lang/nasm )"
 PDEPEND="cdinstall? ( games-fps/duke3d-data )
 	demo? ( games-fps/duke3d-demodata )"
 
 S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD}
 
+src_unpack() {
+	unpack ${PN}_src_${MY_PV}-${MY_BUILD}.tar.xz eduke32-icons.tar
+
+	if use textures; then
+		unzip -q "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip "hrp_readme.txt" \
+			|| die "unzip hrp readme"
+		if use offensive; then
+			unzip -q "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip "xxx_readme.txt" \
+				|| die "unzip xxx readme"
+		fi
+	fi
+	if use opl-musicpack; then
+		unzip -q "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip "readme.txt" \
+			|| die "unzip musopl readme"
+		mv readme.txt musopl_readme.txt || die "mv musopl_readme"
+	elif use sc55-musicpack; then
+		unzip -q "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip "music_readme.txt" \
+			|| die "unzip mus readme"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-QA.patch
 
@@ -56,17 +92,20 @@ src_prepare() {
 	# also redirect log file so it's not always written in $PWD
 	sed -i \
 		-e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \
-		-e "s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \
+		source/common.c || die "sed common.c path update failed"
+	sed -i \
+		-e "/OSD_SetLogFile/s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \
 		source/astub.c || die "sed astub.c path update failed"
 	sed -i \
-		-e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \
-		-e "s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \
+		-e "/OSD_SetLogFile/s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \
 		source/game.c || die "sed game.c path update failed"
 }
 
 src_compile() {
 	local MY_OPTS=(
+		AS=$(type -P nasm)
 		ARCH=
+		SYSARCH=
 		LTO=0
 		PRETTY_OUTPUT=0
 		RELEASE=1
@@ -74,13 +113,14 @@ src_compile() {
 		STRIP=touch
 		LINKED_GTK=1
 		CPLUSPLUS=0
+		SDL_TARGET=1
 		$(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1")
 		$(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0")
 		$(usex x86 "NOASM=0" "NOASM=1")
 		$(usex server "NETCODE=1" "NETCODE=0")
 		$(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0")
 		$(usex png "USE_LIBPNG=1" "USE_LIBPNG=0")
-		$(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0")
+		$(usex opengl "$(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0")" "USE_LIBVPX=0")
 	)
 
 	emake ${MY_OPTS[@]}
@@ -91,10 +131,42 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin ${PN} mapster32
+	local ARGS
+
+	newgamesbin ${PN} ${PN}.bin
+	dogamesbin mapster32
+
+	if use tools; then
+		dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map}
+		dodoc build/doc/*.txt
+	fi
 
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg}
+	# Install optional components
+	if use textures; then
+		newins "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip duke3d_hrp.zip
+		dodoc "${WORKDIR}"/hrp_readme.txt
+		ARGS+=" -g duke3d_hrp.zip"
+
+		if use offensive; then
+			newins "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip duke3d_xxx.zip
+			dodoc "${WORKDIR}"/xxx_readme.txt
+			ARGS+=" -g duke3d_xxx.zip"
+		fi
+	fi
+
+	if use opl-musicpack; then
+		newins "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip duke3d_musopl.zip
+		dodoc "${WORKDIR}"/musopl_readme.txt
+		ARGS+=" -g duke3d_musopl.zip"
+	elif use sc55-musicpack; then
+		newins "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip duke3d_mus.zip
+		dodoc "${WORKDIR}"/music_readme.txt
+		ARGS+=" -g duke3d_mus.zip"
+	fi
+
+	# Install game data
+	doins package/sdk/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg}
 	use samples && doins -r package/samples
 
 	local i
@@ -103,20 +175,15 @@ src_install() {
 		newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png
 	done
 
+	games_make_wrapper "${PN}" "${GAMES_BINDIR}/${PN}.bin ${ARGS}"
 	make_desktop_entry ${PN} EDuke32 ${PN}
 	make_desktop_entry mapster32 Mapster32 mapster32
 
-	if use tools; then
-		dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map}
-		dodoc build/doc/*.txt
-	fi
-
 	dodoc build/buildlic.txt
 
-	dodir "${GAMES_LOGDIR}"
+	keepdir "${GAMES_LOGDIR}"
 
 	prepgamesdirs
-
 }
 
 pkg_preinst() {
diff --git a/games-fps/eduke32/files/eduke32-20130207.3467-QA.patch b/games-fps/eduke32/files/eduke32-20131119.4169-QA.patch
index 534c507e0a4a..38e9b36fa2b3 100644
--- a/games-fps/eduke32/files/eduke32-20130207.3467-QA.patch
+++ b/games-fps/eduke32/files/eduke32-20131119.4169-QA.patch
@@ -6,7 +6,7 @@ Subject: build system
 
 --- eduke32_20130201-3453/Makefile
 +++ eduke32_20130201-3453/Makefile
-@@ -308,10 +308,10 @@
+@@ -311,10 +311,10 @@
  endif
  
  COMPILER=$(CC) $(OURCONLYFLAGS)
@@ -21,29 +21,29 @@ Subject: build system
  ifeq ($(PRETTY_OUTPUT),1)
 --- eduke32_20130201-3453/Makefile.common
 +++ eduke32_20130201-3453/Makefile.common
-@@ -8,13 +8,14 @@
- PRETTY_OUTPUT ?= 1
+@@ -10,13 +10,14 @@
  
  # Tools
--CC=gcc
--CXX=g++
--AS=nasm
--AR=ar
--RC=windres
--RANLIB=ranlib
--STRIP=strip
-+CC ?= gcc
-+CXX ?= g++
-+AS ?= nasm
-+AR ?= ar
-+RC ?= windres
-+RANLIB ?= ranlib
-+STRIP ?= strip
+ CROSS=
+-CC=$(CROSS)gcc
+-CXX=$(CROSS)g++
+-AS=$(CROSS)nasm
+-AR=$(CROSS)ar
+-RC=$(CROSS)windres
+-RANLIB=$(CROSS)ranlib
+-STRIP=$(CROSS)strip
++CC ?= $(CROSS)gcc
++CXX ?= $(CROSS)g++
++AS ?= $(CROSS)nasm
++AR ?= $(CROSS)ar
++RC ?= $(CROSS)windres
++RANLIB ?= $(CROSS)ranlib
++STRIP ?= $(CROSS)strip
 +PKG_CONFIG ?= pkgconfig
  
  L_CC=$(CC)
  L_CXX=$(CXX)
-@@ -152,7 +153,6 @@
+@@ -164,7 +165,6 @@
  #  FORCEWARNINGS - 1 = do not disable any compiler warnings within the source
  #  KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system
  #  EFENCE  - 1 = compile with Electric Fence for malloc() debugging
@@ -51,20 +51,26 @@ Subject: build system
  #  LTO - 1 = enable link-time optimization, for GCC 4.5 and up
  #
  CPLUSPLUS?=0
-@@ -163,7 +163,6 @@
- FORCEWARNINGS?=0
- EFENCE?=0
- DMALLOC?=0
--OPTLEVEL?=2
+@@ -178,13 +178,6 @@
  PROFILER?=0
  MUDFLAP?=0
  
-@@ -269,10 +268,9 @@
+-# Select the default optimization level for release and debug builds.
+-ifeq ($(RELEASE),0)
+-    OPTLEVEL?=0
+-else
+-    OPTLEVEL?=2
+-endif
+-
+ ifeq ($(RELEASE),0)
+     override STRIP=
+ endif
+@@ -293,10 +286,9 @@
  
  # compiler flags etc.
  BASECFLAGS=
 -BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement
--BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing
+-BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings
 -BASEASFLAGS=-s #-g
 -BASELDFLAGS=
 +BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement
@@ -73,58 +79,48 @@ Subject: build system
  
  
  ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
-@@ -300,14 +298,11 @@
-         debug=-g
-     else ifeq ($(PLATFORM), WII)
-         debug=-g
--    else
--        debug=-ggdb
-     endif
+@@ -330,19 +322,6 @@
  endif
  
- ifneq (0,$(RELEASE))
-     # Debugging disabled
--    debug+= -O$(OPTLEVEL)
-     ifeq (0,$(CLANG))
-         debug+= -funswitch-loops
-         ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \< 4)))
-@@ -330,7 +325,6 @@
-     endif
- else
-     # Debugging enabled
--    debug+= -O0
- 
-     ifeq (0,$(DEBUGANYWAY))
-         debug+= -DDEBUGGINGAIDS
-@@ -411,7 +405,7 @@
- 
- #### Lunatic development, do not touch!
- LUNATIC=0
--LUAJIT=luajit
-+LUAJIT=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0)
- 
- # for LJ headers:
- LUAJIT_WIN_SRC:= g:/mod/LuaJIT-2.0.0-beta8/src
-@@ -424,14 +418,14 @@
-     ifeq ($(PLATFORM),WINDOWS)
-         BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC)
-     else
--        BASECOMMONFLAGS+= -I/usr/local/include/luajit-2.0
-+        BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0)
-     endif
-     BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC
  
+-ifneq ($(RELEASE)$(DEBUGANYWAY),10)
+-    # debug build or DEBUGANYWAY=1 --> -g flag
+-    ifneq (0,$(CLANG))
+-        debug=-g
+-    else ifeq ($(PLATFORM), WII)
+-        debug=-g
+-    else
+-        debug=-ggdb
+-    endif
+-endif
+-
+-debug+= -O$(OPTLEVEL)
+-
+ # See http://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
+ # for a list of possible UBSan options.
+ # Clang 3.2 does only supports -fsanitize=address for the AddressSanitizer
+@@ -458,7 +437,7 @@
+ 
+ #### Lunatic development
+ # LuaJIT standalone interpreter executable:
+-LUAJIT:=luajit
++LUAJIT:=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0)
+ # Options to "luajit -b" for synthesis. Since it runs on Linux, we need to tell
+ # the native LuaJIT to emit PE object files.
+ ifneq ($(SYNTHESIS),0)
+@@ -487,7 +466,8 @@
      ifeq ($(PLATFORM),WINDOWS)
          BASELIBS+= -lluajit
      else
 -        BASELIBS+= -lluajit-5.1
++        BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0)
 +        BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0)
      endif
  endif
  
 --- eduke32_20130201-3453/build/Makefile
 +++ eduke32_20130201-3453/build/Makefile
-@@ -166,13 +166,15 @@
+@@ -167,13 +167,15 @@
  OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS)
  
  COMPILER=$(CC) $(OURCONLYFLAGS)
@@ -136,13 +132,14 @@ Subject: build system
 +    LINKER=$(L_CXX) $(OURCXXFLAGS)
  endif
  
+-.SILENT:
 +ifeq ($(PRETTY_OUTPUT),1)
- .SILENT:
++ .SILENT:
 +endif
  .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib
  
  # TARGETS
-@@ -265,7 +267,7 @@
+@@ -266,7 +268,7 @@
  	if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi
  arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS)
  	$(ONESTEP_STATUS)
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 7a69069c509c..3713d9505098 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -7,16 +7,23 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name="demo">Install <pkg>games-fps/duke3d-demodata</pkg> as well</flag>
+		<flag name="demo">Install <pkg>games-fps/duke3d-demodata</pkg>
+			as well</flag>
 		<flag name="gtk">Compile with gtk launcher</flag>
-		<flag name="offensive">Include optional XXX texture pack</flag>
-		<flag name="opl-musicpack">Include optional OPL (AdLib) music pack</flag>
+		<flag name="offensive">Include optional XXX texture pack
+			(needs USE 'textures')</flag>
+		<flag name="opl-musicpack">Include optional OPL (AdLib)
+			music pack</flag>
 		<flag name="samples">Install samples</flag>
-		<flag name="sc55-musicpack">Include optional Roland SC-55 music pack</flag>
+		<flag name="sc55-musicpack">Include optional Roland SC-55
+			music pack</flag>
 		<flag name="server">Compile with server support</flag>
-		<flag name="textures">Include optional high-resolution textures</flag>
-		<flag name="tools">Build several tools for modding and development</flag>
-		<flag name="vpx">Enable support for WebM VP8 Codecs</flag>
+		<flag name="textures">Include optional high-resolution
+			textures (needs USE 'opengl')</flag>
+		<flag name="tools">Build several tools for modding and
+			development</flag>
+		<flag name="vpx">Enable support for WebM VP8 Codecs
+			(needs USE 'opengl')</flag>
 	</use>
 </pkgmetadata>