version bump, add gtk+ useflag

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

5 files changed, 46 insertions, 26 deletions

diff --git a/games-fps/eduke32/ChangeLog b/games-fps/eduke32/ChangeLog
index ed34b3955826..2221e30fa70c 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.3 2013/02/09 23:03:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.4 2013/03/17 21:16:21 hasufell Exp $
+
+*eduke32-20130317.3572 (17 Mar 2013)
+
+  17 Mar 2013; Julian Ospald <hasufell@gentoo.org>
+  -eduke32-20130201.3453.ebuild, -files/eduke32-20130201.3453-QA.patch,
+  eduke32-20130207.3467.ebuild, +eduke32-20130317.3572.ebuild,
+  +files/eduke32-20130317.3572-QA.patch:
+  version bump, add gtk+ useflag
 
 *eduke32-20130207.3467 (09 Feb 2013)
 
diff --git a/games-fps/eduke32/eduke32-20130207.3467.ebuild b/games-fps/eduke32/eduke32-20130207.3467.ebuild
index 4b43cfcbc19d..91f81d8f1afa 100644
--- a/games-fps/eduke32/eduke32-20130207.3467.ebuild
+++ b/games-fps/eduke32/eduke32-20130207.3467.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.1 2013/02/09 23:03:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130207.3467.ebuild,v 1.2 2013/03/17 21:16:21 hasufell Exp $
 
 # TODO/FIXME:
 # lunatic broken
@@ -24,7 +24,7 @@ SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}
 LICENSE="GPL-2 BUILDLIC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo +opengl +png +server tools +vpx"
+IUSE="cdinstall debug demo gtk +opengl +png samples +server tools +vpx"
 REQUIRED_USE="vpx? ( opengl )"
 
 RDEPEND="media-libs/flac
@@ -33,7 +33,7 @@ RDEPEND="media-libs/flac
 	media-libs/libvorbis
 	media-libs/sdl-mixer[timidity]
 	sys-libs/zlib
-	x11-libs/gtk+:2
+	gtk? ( x11-libs/gtk+:2 )
 	opengl? ( virtual/glu
 		virtual/opengl )
 	png? ( media-libs/libpng:0
@@ -74,6 +74,7 @@ src_compile() {
 		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")
@@ -94,7 +95,7 @@ src_install() {
 
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg}
-	doins -r package/samples
+	use samples && doins -r package/samples
 
 	local i
 	for i in 16 32 128 256 ; do
diff --git a/games-fps/eduke32/eduke32-20130201.3453.ebuild b/games-fps/eduke32/eduke32-20130317.3572.ebuild
index 5bb2a18e2124..280a0b3938ce 100644
--- a/games-fps/eduke32/eduke32-20130201.3453.ebuild
+++ b/games-fps/eduke32/eduke32-20130317.3572.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-20130201.3453.ebuild,v 1.1 2013/02/02 18:36:55 hasufell Exp $
+# $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
@@ -8,8 +8,6 @@
 # $(usex lunatic "LUNATIC=1" "LUNATIC=0")
 #
 # extras? ( games-fps/${PN}-extras )
-#
-# clang does not build
 
 EAPI=5
 
@@ -26,7 +24,7 @@ SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}
 LICENSE="GPL-2 BUILDLIC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo +opengl +png +server tools +vpx"
+IUSE="cdinstall debug demo gtk +opengl +png samples +server tools +vpx"
 REQUIRED_USE="vpx? ( opengl )"
 
 RDEPEND="media-libs/flac
@@ -35,7 +33,7 @@ RDEPEND="media-libs/flac
 	media-libs/libvorbis
 	media-libs/sdl-mixer[timidity]
 	sys-libs/zlib
-	x11-libs/gtk+:2
+	gtk? ( x11-libs/gtk+:2 )
 	opengl? ( virtual/glu
 		virtual/opengl )
 	png? ( media-libs/libpng:0
@@ -76,6 +74,7 @@ src_compile() {
 		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")
@@ -96,7 +95,7 @@ src_install() {
 
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg}
-	doins -r package/samples
+	use samples && doins -r package/samples
 
 	local i
 	for i in 16 32 128 256 ; do
diff --git a/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch b/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch
index 534c507e0a4a..06f8b87fdc4f 100644
--- a/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch
+++ b/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch
@@ -59,7 +59,7 @@ Subject: build system
  PROFILER?=0
  MUDFLAP?=0
  
-@@ -269,10 +268,9 @@
+@@ -269,11 +268,9 @@
  
  # compiler flags etc.
  BASECFLAGS=
@@ -67,36 +67,45 @@ Subject: build system
 -BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing
 -BASEASFLAGS=-s #-g
 -BASELDFLAGS=
+-
 +BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement
 +BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing
 +BASELDFLAGS = $(LDFLAGS)
  
- 
  ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
-@@ -300,14 +298,11 @@
-         debug=-g
-     else ifeq ($(PLATFORM), WII)
-         debug=-g
--    else
--        debug=-ggdb
-     endif
+     ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 1)))
+@@ -293,20 +290,8 @@
  endif
  
+ 
+-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
+-
  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 @@
+@@ -328,9 +313,6 @@
+         debug+= -DUSING_LTO -flto
      endif
  else
-     # Debugging enabled
+-    # Debugging enabled
 -    debug+= -O0
- 
+-
      ifeq (0,$(DEBUGANYWAY))
          debug+= -DDEBUGGINGAIDS
-@@ -411,7 +405,7 @@
+     else
+@@ -411,7 +393,7 @@
  
  #### Lunatic development, do not touch!
  LUNATIC=0
@@ -104,8 +113,8 @@ Subject: build system
 +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 @@
+ LUAJIT_WIN_SRC:= g:/mod/luajit-2.0/src
+@@ -424,7 +406,7 @@
      ifeq ($(PLATFORM),WINDOWS)
          BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC)
      else
@@ -114,6 +123,7 @@ Subject: build system
      endif
      BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC
  
+@@ -436,7 +418,7 @@
      ifeq ($(PLATFORM),WINDOWS)
          BASELIBS+= -lluajit
      else
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 766196bc3ed4..81ad67ea53fe 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -8,6 +8,8 @@
 	</maintainer>
 	<use>
 		<flag name="demo">Install <pkg>games-fps/duke3d-demodata</pkg> as well</flag>
+		<flag name="gtk">Compile with gtk launcher</flag>
+		<flag name="samples">Install samples</flag>
 		<flag name="server">Compile with server support</flag>
 		<flag name="tools">Build several tools for modding and development</flag>
 		<flag name="vpx">Enable support for WebM VP8 Codecs</flag>