old

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

4 files changed, 6 insertions, 165 deletions

diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 0dba767d0681..3876ac965341 100644
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-engines/stratagus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.26 2012/10/19 08:17:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.27 2012/11/17 18:05:47 mr_bones_ Exp $
+
+  17 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/stratagus-2.2.6-build.patch, -files/stratagus-2.2.6-debug.patch,
+  -stratagus-2.2.6-r1.ebuild:
+  old
 
 *stratagus-2.2.7 (19 Oct 2012)
 
diff --git a/games-engines/stratagus/files/stratagus-2.2.6-build.patch b/games-engines/stratagus/files/stratagus-2.2.6-build.patch
deleted file mode 100644
index 348c1145636b..000000000000
--- a/games-engines/stratagus/files/stratagus-2.2.6-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun May 20 17:02:54 UTC 2012
-Subject: build-system
-
-respect system LDFLAGS
-make install paths modifiable
-
-included upstream: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8279
-also merged: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8061
-
---- stratagus_2.2.6.orig/CMakeLists.txt
-+++ stratagus_2.2.6.orig/CMakeLists.txt
-@@ -587,6 +587,12 @@
- 	set(ENABLE_TOUCHSCREEN ON)
- endif()
- 
-+# Stratagus needs to have char by default signed
-+# No idea how to tell this to other compilers
-+if(CMAKE_COMPILER_IS_GNUCXX)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
-+endif()
-+
- check_function_exists("strcasestr" HAVE_STRCASESTR)
- check_function_exists("strnlen" HAVE_STRNLEN)
- 
-@@ -602,9 +608,7 @@
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(ENABLE_STRIP)
--	set(CMAKE_EXE_LINKER_FLAGS "-s")
--else()
--	set(CMAKE_EXE_LINKER_FLAGS "")
-+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
- endif()
- 
- # Print compile info
-@@ -836,15 +840,22 @@
- 
- ########### install files ###############
- 
--install(TARGETS stratagus DESTINATION games)
--install(TARGETS png2stratagus DESTINATION bin)
-+# install paths
-+set(BINDIR "bin" CACHE PATH "Where to install binaries")
-+set(SBINDIR "sbin" CACHE PATH "Where to install metaserver binary")
-+set(DOCDIR "share/doc/stratagus" CACHE STRING "Sets the doc directory to a non-default location.")
-+set(MANDIR "share/man/man6" CACHE STRING "Sets the man directory to a non-default location.")
-+set(STRATAGUS_HEADERS "include" CACHE STRING "Where to install stratagus headers.")
-+
-+install(TARGETS stratagus DESTINATION ${BINDIR})
-+install(TARGETS png2stratagus DESTINATION ${BINDIR})
- 
- if(SQLITE_FOUND)
--	install(TARGETS metaserver DESTINATION sbin)
-+	install(TARGETS metaserver DESTINATION ${SBINDIR})
- endif()
- 
- if(ENABLE_DOC AND DOXYGEN_FOUND)
--	install(FILES doc/stratagus.6 DESTINATION share/man/man6)
-+	install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
- 	install(FILES
- 		doc/development.html
- 		doc/faq.html
-@@ -858,9 +869,9 @@
- 		doc/README-SDL.txt
- 		DESTINATION share/doc/stratagus
- 	)
--	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION share/doc/stratagus)
-+	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
- endif(ENABLE_DOC AND DOXYGEN_FOUND)
- 
- if(ENABLE_DEV)
--	install(FILES ${gameheaders_HDRS} DESTINATION include)
-+	install(FILES ${gameheaders_HDRS} DESTINATION ${STRATAGUS_HEADERS})
- endif()
diff --git a/games-engines/stratagus/files/stratagus-2.2.6-debug.patch b/games-engines/stratagus/files/stratagus-2.2.6-debug.patch
deleted file mode 100644
index 7ffe2e308612..000000000000
--- a/games-engines/stratagus/files/stratagus-2.2.6-debug.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun May 20 17:02:54 UTC 2012
-Subject: build-system
-
-do not rename the target if debug is enabled
-
---- stratagus_2.2.6.orig/CMakeLists.txt
-+++ stratagus_2.2.6.orig/CMakeLists.txt
-@@ -729,10 +729,6 @@
- add_executable(stratagus WIN32 ${stratagus_SRCS} ${stratagus_HDRS})
- target_link_libraries(stratagus ${stratagus_LIBS})
- 
--if(CMAKE_BUILD_TYPE STREQUAL "Debug")
--	set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
--endif()
--
- if(WIN32 AND MINGW AND ENABLE_STATIC)
- 	set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -Wl,--stack,10485760")
- endif()
diff --git a/games-engines/stratagus/stratagus-2.2.6-r1.ebuild b/games-engines/stratagus/stratagus-2.2.6-r1.ebuild
deleted file mode 100644
index b1de08472c17..000000000000
--- a/games-engines/stratagus/stratagus-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.6-r1.ebuild,v 1.2 2012/06/02 19:53:52 hasufell Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils games
-
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="http://stratagus.sourceforge.net/"
-SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 debug doc mikmod mng theora vorbis"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-lang/lua-5
-	dev-lua/toluapp
-	media-libs/libpng:0
-	virtual/opengl
-	x11-libs/libX11
-	media-libs/libsdl[audio,opengl,video]
-	bzip2? ( app-arch/bzip2 )
-	mikmod? ( media-libs/libmikmod )
-	mng? ( media-libs/libmng )
-	vorbis? ( media-libs/libvorbis
-		theora? ( media-libs/libtheora )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-REQUIRED_USE="theora? ( vorbis )"
-
-S=${WORKDIR}/${PN}_${PV}.orig
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-debug.patch
-}
-
-src_configure() {
-	# there are in-source switches
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		-DSBINDIR="${GAMES_BINDIR}"
-		$(cmake-utils_use_with bzip2 BZIP2)
-		$(cmake-utils_use_enable doc DOC)
-		$(cmake-utils_use_with mikmod MIKMOD)
-		$(cmake-utils_use_with mng MNG)
-		$(cmake-utils_use_with vorbis OGGVORBIS)
-		$(cmake-utils_use_with theora THEORA)
-		-DENABLE_DEV=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}