version bump wrt #492596

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

7 files changed, 269 insertions, 2 deletions

diff --git a/games-action/supertuxkart/ChangeLog b/games-action/supertuxkart/ChangeLog
index f31c31079d41..6b4116b13cd8 100644
--- a/games-action/supertuxkart/ChangeLog
+++ b/games-action/supertuxkart/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-action/supertuxkart
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.37 2013/02/07 21:59:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.38 2013/11/26 21:22:50 hasufell Exp $
+
+*supertuxkart-0.8.1 (26 Nov 2013)
+
+  26 Nov 2013; Julian Ospald <hasufell@gentoo.org> +supertuxkart-0.8.1.ebuild,
+  +files/supertuxkart-0.8.1-desktopfile.patch,
+  +files/supertuxkart-0.8.1-gentoo.patch,
+  +files/supertuxkart-0.8.1-icon-dest.patch,
+  +files/supertuxkart-0.8.1-irrlicht.patch, metadata.xml:
+  version bump wrt #492596
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> supertuxkart-0.8.ebuild:
   Move Creative Commons licenses to shorter names.
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
new file mode 100644
index 000000000000..076645692bcd
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
@@ -0,0 +1,24 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Dec 13 18:45:18 UTC 2012
+Subject: fix desktop file
+
+--- data/supertuxkart_desktop.template
++++ data/supertuxkart_desktop.template
+@@ -1,14 +1,14 @@
+ [Desktop Entry]
+ Name=SuperTuxKart
+-Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
++Icon=supertuxkart
+ GenericName=A kart racing game
+ GenericName[de_DE]=Ein Kart-Rennspiel
+ GenericName[fr_FR]=Un jeu de karting
+ GenericName[gl]=Xogo de carreiras con karts
+ GenericName[ro_RO]=Un joc de curse cu carturi
+-Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
++Exec=@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
+ Terminal=false
+ StartupNotify=false
+ Type=Application
+-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
++TryExec=@STK_INSTALL_BINARY_DIR@/supertuxkart
+ Categories=Game;ArcadeGame;
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
new file mode 100644
index 000000000000..071c1b053f7a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
@@ -0,0 +1,49 @@
+gentoo specific hacks because we unbundle the
+deps of irrlicht
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09edd58..1f51a30 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+ 
+ # Build the irrlicht library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
+ 
+ # Build the Wiiuse library
+@@ -137,6 +136,13 @@ else()
+ endif()
+ 
+ 
++# Irrlicht
++if (APPLE)
++    set(IRRLICHT_LIBRARY "/Library/Frameworks/IrrFramework.framework")
++else()
++    set(IRRLICHT_LIBRARY ${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a)
++endif()
++
+     
+ # Set some compiler options
+ if(UNIX)
+@@ -226,12 +232,17 @@ target_link_libraries(supertuxkart
+     bulletcollision
+     bulletmath
+     enet
+-    stkirrlicht
+     ${CURL_LIBRARIES}
++    ${IRRLICHT_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
++    ${IRRLICHT_LIBRARY}
+     ${IRRLICHT_XF86VM_LIBRARY}
+     ${OPENAL_LIBRARY}
+-    ${OPENGL_LIBRARIES})
++    ${OPENGL_LIBRARIES}
++    png
++    jpeg
++    bz2
++    z)
+ 
+ if(APPLE)
+     # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
new file mode 100644
index 000000000000..f9a5a04d676a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
@@ -0,0 +1,21 @@
+commit f46a26640382ffc76e71f58eaaf1e5223a11c9a0
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Nov 26 22:13:21 2013 +0100
+
+    fix icon install dest
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1f51a30..9c07659 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -304,7 +304,9 @@ endif()
+ install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
+ install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE)
+ install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
+-install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
++install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
++install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
++
+ 
+ set(PREFIX ${CMAKE_INSTALL_PREFIX})
+ configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch
new file mode 100644
index 000000000000..43130d14a09a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch
@@ -0,0 +1,69 @@
+unbundle Irrlicht dependencies
+and respect CFLAGS
+
+--- lib/irrlicht/include/IrrCompileConfig.h
++++ lib/irrlicht/include/IrrCompileConfig.h
+@@ -245,7 +245,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.

+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.

+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */

+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_

++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #endif

+@@ -261,7 +261,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.

+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.

+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */

+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_

++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_

+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_

+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_

+ #endif

+@@ -598,7 +598,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib

+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is

+ defined. */

+-#define _IRR_USE_NON_SYSTEM_ZLIB_

++//#define _IRR_USE_NON_SYSTEM_ZLIB_

+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_

+ #undef _IRR_USE_NON_SYSTEM_ZLIB_

+ #endif

+--- lib/irrlicht/source/Irrlicht/Makefile
++++ lib/irrlicht/source/Irrlicht/Makefile
+@@ -46,11 +46,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o

+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o

+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o

+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o

+ 

+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions

+ EXTRAOBJ =

+@@ -61,18 +57,16 @@
+ 

+ ###############

+ #Compiler flags

+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

++CXXINCS = -I../../include

+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

++CXXFLAGS += -Wall -fno-exceptions -fno-rtti

+ ifndef NDEBUG

+-CXXFLAGS += -g -D_DEBUG

+-else

+-CXXFLAGS += -fexpensive-optimizations -O3

++CXXFLAGS += -D_DEBUG

+ endif

+ ifdef PROFILE

+ CXXFLAGS += -pg

+ endif

+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

+ 

+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC

+ sharedlib sharedlib_osx: CFLAGS += -fPIC

diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
index d3c2cc926f0b..4ecc4afb4c01 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<use>
+		<flag name='fribidi'>Support for right-to-left languages</flag>
+		<flag name='wiimote'>Support for wiimote input devices</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-action/supertuxkart/supertuxkart-0.8.1.ebuild b/games-action/supertuxkart/supertuxkart-0.8.1.ebuild
new file mode 100644
index 000000000000..6c0c78770a76
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.8.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/supertuxkart-0.8.1.ebuild,v 1.1 2013/11/26 21:22:50 hasufell Exp $
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.net/"
+SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.bz2
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+# VERSION BUMP NOTICE: enet might be needed for supertuxkart-0.9
+RDEPEND="media-libs/freeglut
+	media-libs/libpng:0
+	media-libs/libvorbis
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	fribidi? ( dev-libs/fribidi )
+	wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/SuperTuxKart-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{gentoo,irrlicht}.patch
+
+	# inconsistent handling of debug definition
+	# avoid using Debug build type
+	use debug && {
+		sed -i \
+			-e 's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
+			CMakeLists.txt || die ;}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use fribidi FRIBIDI)
+		$(cmake-utils_use_use wiimote WIIUSE)
+		-DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
+		-DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# build bundled irrlicht
+	NDEBUG=1 emake -C lib/irrlicht/source/Irrlicht
+
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+	dodoc AUTHORS ChangeLog README TODO
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}