old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 6 insertions, 149 deletions

diff --git a/games-arcade/commandergenius/ChangeLog b/games-arcade/commandergenius/ChangeLog
index fa8517c61711..0da9dc37965c 100644
--- a/games-arcade/commandergenius/ChangeLog
+++ b/games-arcade/commandergenius/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/commandergenius
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/ChangeLog,v 1.15 2015/02/06 17:58:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/ChangeLog,v 1.16 2015/02/09 05:12:14 mr_bones_ Exp $
+
+  09 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -commandergenius-1.7.4.0.ebuild, -files/commandergenius-1.7.4.0-build.patch,
+  -files/commandergenius-1.7.4.0-install.patch:
+  old
 
 *commandergenius-1.8.0.0 (06 Feb 2015)
 
diff --git a/games-arcade/commandergenius/commandergenius-1.7.4.0.ebuild b/games-arcade/commandergenius/commandergenius-1.7.4.0.ebuild
deleted file mode 100644
index 6b85ead3dad6..000000000000
--- a/games-arcade/commandergenius/commandergenius-1.7.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.7.4.0.ebuild,v 1.2 2014/07/01 22:30:23 hasufell Exp $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
-
-MY_P=CGenius-${PV}-Release-src
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net"
-SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl tremor"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
-	media-libs/sdl2-image
-	opengl? ( virtual/opengl )
-	tremor? ( media-libs/tremor )
-	!tremor? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{install,build}.patch
-
-	rm -rf vfsroot || die
-
-	cat <<-EOF > version.h
-	#ifndef __CG__VERSION_H__
-	#define __CG__VERSION_H__
-
-	#define CGVERSION	"${PV}-Release"
-
-	#endif
-	EOF
-
-	sed -i \
-		-e '/INCLUDE(package.cmake)/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPDIR="${GAMES_BINDIR}"
-		-DSHAREDIR="/usr/share"
-		-DGAMES_SHAREDIR="${GAMES_DATADIR}"
-		-DDOCDIR="/usr/share/doc/${PF}"
-		-DBUILD_TARGET="LINUX"
-		$(cmake-utils_use opengl OPENGL)
-		$(cmake-utils_use tremor TREMOR)
-		$(cmake-utils_use !tremor OGG)
-		-DUSE_SDL2=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon CGLogo.png ${PN}.png
-	newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
-	if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
-		mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
-			"${ED}${GAMES_BINDIR}"/CommanderGenius || die
-	fi
-
-	make_desktop_entry commandergenius
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
-	elog "after you have started the game for the first time."
-	use opengl && elog "You may also want to set \"OpenGL = true\""
-	elog
-	elog "Run the game via:"
-	elog "    'commandergenius [path-to-keen-data]'"
-	elog "or add your keen data dir to the search paths in cgenius.cfg"
-}
diff --git a/games-arcade/commandergenius/files/commandergenius-1.7.4.0-build.patch b/games-arcade/commandergenius/files/commandergenius-1.7.4.0-build.patch
deleted file mode 100644
index 2d1bf4466620..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-1.7.4.0-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Jul  1 22:23:59 UTC 2014
-Subject: fix build
-
---- lib/GsKit/CMakeLists.txt
-+++ lib/GsKit/CMakeLists.txt
-@@ -48,7 +48,6 @@
- #    pkg_check_modules(SDL sdl)
- #ENDIF(BUILD_TARGET STREQUAL WIN32)
- 
--Find_Package ( SDL_image REQUIRED )
- 
- 
- 
-@@ -92,6 +91,7 @@
-     set(SDL_IMAGE_LIBRARIES "SDL2_image")
-     target_link_libraries(GsKit ${SDL_IMAGE_LIBRARIES})
- else(SDL2_FOUND)
-+	Find_Package ( SDL_image REQUIRED )
-     target_link_libraries(GsKit ${SDL_LIBRARY})
-     target_link_libraries(GsKit ${SDLIMAGE_LIBRARY})
- endif(SDL2_FOUND)
---- src/CMakeLists.txt.old
-+++ src/CMakeLists.txt
-@@ -328,7 +328,6 @@
- 
- # Misc. Stuff I call it that way for now...
- #LIBS = -lSDL_sound -lasound -lm -ldl -lpthread -L/usr/lib -lSDL -lpng -lz -lSDL_net -lX11 -lGL
--target_link_libraries(CGeniusExe SDL_sound)
- target_link_libraries(CGeniusExe asound)
- target_link_libraries(CGeniusExe m)
- target_link_libraries(CGeniusExe dl)
diff --git a/games-arcade/commandergenius/files/commandergenius-1.7.4.0-install.patch b/games-arcade/commandergenius/files/commandergenius-1.7.4.0-install.patch
deleted file mode 100644
index 717d6bde8786..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-1.7.4.0-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun  1 17:57:40 UTC 2014
-Subject: fix install rules
-
---- src/install.cmake
-+++ src/install.cmake
-@@ -21,7 +21,7 @@
- 
- # This will copy the resources files to the proper directory
- IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
--	INSTALL(DIRECTORY vfsroot/ 
-+	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/vfsroot/ 
- 		DESTINATION ${DATADIR})
- ENDIF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
- 
-@@ -30,7 +30,7 @@
- 	DESTINATION ${DOCDIR})
- 
- # This will copy the readme file. 
--INSTALL(FILES changelog.txt 
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/changelog.txt 
- 	DESTINATION ${DOCDIR})
- 
- # Windows might not have those dlls so we ship them with the packages