old

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

4 files changed, 7 insertions, 179 deletions

diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog
index 63d5e4c69604..03446fc2c279 100644
--- a/games-strategy/wargus/ChangeLog
+++ b/games-strategy/wargus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/wargus
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.25 2012/10/19 08:32:15 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.26 2013/01/03 00:29:05 mr_bones_ Exp $
+
+  03 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/wargus-2.2.6-build.patch, -files/wargus-2.2.6-underlinking.patch,
+  -wargus-2.2.6-r2.ebuild:
+  old
 
 *wargus-2.2.7 (19 Oct 2012)
 
@@ -114,4 +119,3 @@
   <flanders@simnet.is>, Chris Gianelloni <wolf31o2@gentoo.org>, Wescott
   <wescott2003@hotmail.com> and Florian Manschwetus
   <FlorianManschwetus@gmx.de>
-
diff --git a/games-strategy/wargus/files/wargus-2.2.6-build.patch b/games-strategy/wargus/files/wargus-2.2.6-build.patch
deleted file mode 100644
index 4825b341e646..000000000000
--- a/games-strategy/wargus/files/wargus-2.2.6-build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun May 27 18:28:48 UTC 2012
-Subject: build system
-
-make paths modifiable
-respect LDFLAGs
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -30,6 +30,13 @@
- cmake_minimum_required(VERSION 2.6)
- set(WARGUS_VERSION 2.2.6)
- 
-+########### PATH OPTIONS ###############
-+set(BINDIR "bin" CACHE PATH "Where to install binaries")
-+set(SHAREDIR "share/games/stratagus/wargus" CACHE PATH "Where to install data files")
-+set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location")
-+set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Sets the icon directory for desktop entry to a non-default location.")
-+set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE PATH "Sets the desktop file directory for desktop entry to a non-default location.")
-+
- # Wargus sources
- 
- set(pudconvert_SRCS
-@@ -154,8 +161,13 @@
- endif()
- 
- if (NOT WIN32 AND NOT MAEMO)
--	add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus")
--	add_definitions(-DSCRIPTS_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus")
-+	if(NOT IS_ABSOLUTE "${SHAREDIR}")
-+		set(var "${CMAKE_INSTALL_PREFIX}/${SHAREDIR}")
-+	else()
-+		set(var "${SHAREDIR}")
-+	endif()
-+	add_definitions(-DDATA_PATH="${var}")
-+	add_definitions(-DSCRIPTS_PATH="${var}")
- 	add_definitions(-DSTRATAGUS_BIN="${STRATAGUS}")
- endif()
- 
-@@ -169,9 +181,7 @@
- endif()
- 
- 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()
- 
- # Compile Wargus
-@@ -232,16 +242,16 @@
- 
- ########### install files ###############
- 
--install(TARGETS wargus DESTINATION games)
--install(TARGETS pudconvert wartool DESTINATION bin)
--install(FILES wargus.png DESTINATION share/pixmaps)
--install(FILES wargus.desktop DESTINATION share/applications)
--
--install(DIRECTORY campaigns maps scripts DESTINATION share/games/stratagus/wargus)
--install(FILES contrib/red_cross.png DESTINATION share/games/stratagus/wargus/graphics/missiles)
--install(FILES contrib/cross.png DESTINATION share/games/stratagus/wargus/graphics/ui/cursors)
--install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION share/games/stratagus/wargus/graphics/ui)
-+install(TARGETS wargus DESTINATION ${BINDIR})
-+install(TARGETS pudconvert wartool DESTINATION ${BINDIR})
-+install(FILES wargus.png DESTINATION ${ICONDIR})
-+install(FILES wargus.desktop DESTINATION ${DESKTOPDIR})
-+
-+install(DIRECTORY campaigns maps scripts DESTINATION ${SHAREDIR})
-+install(FILES contrib/red_cross.png DESTINATION ${SHAREDIR}/graphics/missiles)
-+install(FILES contrib/cross.png DESTINATION ${SHAREDIR}/graphics/ui/cursors)
-+install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION ${SHAREDIR}/graphics/ui)
- 
- if(MAEMO)
--	install(TARGETS warextract DESTINATION bin)
-+	install(TARGETS warextract DESTINATION ${BINDIR})
- endif()
diff --git a/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch b/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch
deleted file mode 100644
index bad54b0d1764..000000000000
--- a/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun  1 20:15:57 UTC 2012
-Subject: build system
-
-fix underlinking
-see: https://bugs.launchpad.net/wargus/+bug/1007586
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -109,6 +109,7 @@
- endif()
- 
- if(NOT WIN32)
-+	find_package(X11 REQUIRED)
- 	find_package(GTK2 REQUIRED gtk)
- endif()
- 
-@@ -149,8 +150,8 @@
- # Platform definitions
- 
- if(NOT WIN32)
--	include_directories(${GTK2_INCLUDE_DIRS})
--	set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES})
-+	include_directories(${X11_INCLUDE_DIR} ${GTK2_INCLUDE_DIRS})
-+	set(wargus_LIBS ${wargus_LIBS} ${X11_X11_LIB} ${GTK2_LIBRARIES})
- endif()
- 
- if (NOT WIN32 AND NOT MAEMO)
diff --git a/games-strategy/wargus/wargus-2.2.6-r2.ebuild b/games-strategy/wargus/wargus-2.2.6-r2.ebuild
deleted file mode 100644
index c115b605ef8f..000000000000
--- a/games-strategy/wargus/wargus-2.2.6-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.6-r2.ebuild,v 1.2 2012/06/02 20:06:48 hasufell Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="http://wargus.sourceforge.net/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=games-engines/stratagus-${PV}*[theora]
-	media-libs/freetype
-	media-libs/libpng:0
-	sys-libs/zlib
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="games-strategy/wargus-data"
-
-S=${WORKDIR}/${PN}_${PV}.orig
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2.5.5-libpng.patch" \
-		"${FILESDIR}/${P}-build.patch" \
-		"${FILESDIR}/${P}-underlinking.patch"
-
-	sed \
-		-e "/^Exec/s#/usr/games/wargus#${GAMES_BINDIR}/wargus#" \
-		-i wargus.desktop || die "fixing desktop file failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		-DSTRATAGUS="${GAMES_BINDIR}"/stratagus
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "Enabling OpenGL in-game seems to cause segfaults/crashes."
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}