version bump, remove old

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

5 files changed, 177 insertions, 249 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/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>