old

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

5 files changed, 8 insertions, 198 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/Manifest b/games-strategy/wargus/Manifest
index ce018a371303..773dc65cc87c 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX wargus-2.2.5.5-libpng.patch 974 SHA256 b48b53ee2f18abc5e4a76f72eca6702baf39ac129765f906ce1e33985b442c15 SHA512 cc9ab831cdf03ece102d881a2ef7bd477ca209c8f5b4800963277e4519a780c7bde8c41a661be06c88bc7342eb9c39b93a3c91eea4b391dd1a10cf4f16e086e7 WHIRLPOOL de6aa722fab06b18b1cc273001317f96eb393474d00d5dc3bbe8f43ec898bce7acaad1d0ca40e3007355ddb07abb64d60dd89d0522f49bd7eea4daa85b3c17ba
-AUX wargus-2.2.6-build.patch 3111 SHA256 07cba37dac4cf94ee6e84cd00b9b7f5424bde1854980b9fe8945248de2e020ec SHA512 a9df88945076a78e613fd274f7fb97d110d037b02c9431aa0733222c819e18db2256fcf93002f194309b95e9a3b17e369dc4ccf0e6ce6d3f0ad4f2ad63c258f1 WHIRLPOOL 233f51e4fcbe24008460b1acfa07f86209b1a5352a8e30d0ba950b3b198add75ab42606a428329669532bec83ab850c5994a8fb47b0a9f1db4588aff529121f7
-AUX wargus-2.2.6-underlinking.patch 656 SHA256 5032d5917e6d7e68900e711ae9d41dc5fea14ef0505a7ccf50173b92145e103d SHA512 3136f5c5a5bd5a7d451af3c608b09efb1d1e05fbb9b23cced5bb50f8dbde7831abaf0165e8d36c8dc09f605ea30a24092de740eaf9b568060ab943349bd70d7e WHIRLPOOL 38c3cab754f3b2f6f0b6404bae886e5f7112dc2a53b080208af69f764b21ad447c8f5595527ec850596575b3e7e83ac2396dd5cf3bbc8709eeaa662d2a942844
 DIST wargus.png 7561 SHA256 f8190a41f5131c45c76cb6d91c97e7fcf48c4fcd26cb231802c224c7e19ac0bd SHA512 fd911dbeb9678471d08c3274030c0872a3907c32d22f31b9b4736bbc4f9ca9187fc1407717108b7dfa839eb07d3647a5a9b2c08bf6f974028a1d96aa1fecf80e WHIRLPOOL 8d0382f4b11617dbea88627ddc82d7bd5a15edd1dc1d1eb8b7bfc6098dd03158473650ebe4e966fc728eb291409f72100867dfed8f361ac41c3b1b47240c881f
 DIST wargus_2.2.5.5.orig.tar.gz 3605444 SHA256 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f SHA512 5b1e6d56b2f715eecf16c16776bed699cee9739705c4bbf69883e6434d8451d05f514678505cc86898e37a56ad3864f5b23b58a0099ba53686c7471e8333d35d WHIRLPOOL 8f5005efb2d95393fba75869e8e3e8ad8ba164dffb513378612d65490fb366627c067bcda6c950aecdc56be6df029c5fb8eedf944b20d362e70f408c28e5a135
-DIST wargus_2.2.6.orig.tar.gz 3655036 SHA256 88c300661836d6eb6f5c7859ef8ba292455a5cf3dae274e2b6ac9bc3497622fe SHA512 29f58891b5117e7856a62373877c2ab3a22b8a53d954eb610665ed710ca2d2a5c2af3490df47a170304840e3fb631acb719898c6ff1fdb5637188660c8ab628d WHIRLPOOL 04eac1e7a786fbaf5582df8a5168bcde18702efcf5f91f3a2728af4e36cd65362d312860725b4ae266cdba7c80691f81cad178ded2647871ef21c7de180bb394
 DIST wargus_2.2.7.orig.tar.gz 3655476 SHA256 f688663458e035725f5cd18535a7a1eaecd66eaf55b032fe2ac21ed48b239908 SHA512 a419e70c53db6f3919255ef98ea717a0802e0854095b019bd9c6eef66d6602f75c1849a53ef654b5d66191a824725e3eff23f1f01767eab861e6ddfaf2414bbb WHIRLPOOL d440ac1f279912b13f37fd618f31b1bb2ac53f143789dbe56835343e9486a6ec2aeca71874c4ae2bd9c707706cdf33efbec8df8993d102b0276da0aa53e04cc3
 EBUILD wargus-2.2.5.5.ebuild 1100 SHA256 6b39eb75b688349391ec4bb7a44c29ef875f77bf8e848a74d16bbe3e15da556c SHA512 4860f44d5e9fbd1ff804987da559c07373b770d4ab94733297bc0ca2777c43d435bff39021557b81f4b464bf90fb1ecbf735e3eaa7047b1be2a7aeefb8623017 WHIRLPOOL ac0305947c0abdeb398f1aed41b209d59595e8490149195144e054100417284bd1e0d37b6d82ae698f06fd2d96a51ba2ba5fe6ff4f8e1d12a21115e24e491a05
-EBUILD wargus-2.2.6-r2.ebuild 1554 SHA256 cb70e65a768015422293d05cff277a74f9854d6906ee1c7766361eaf8a3468ca SHA512 25505a9e89bc3029215676f0399ed54b2555e9f164eef6bdb8c0705da779091b64ad95240c1da69eb49632007ef6754a380ebbf45962979b13fed2cfa1dde574 WHIRLPOOL 06b3121749f69379e8ea738c60bdfe1744450cc6601702580e3adf139689bdcdaa2b49f1a2c3026f8affddb176c624ba3b52b364df1615df75f399fdf1b6d262
 EBUILD wargus-2.2.7.ebuild 1329 SHA256 69b93590e054366715e166a4ca627bc6d4108c7153afc965bc60964f9b1b0bca SHA512 53f63a2df61a8a3d97321ce2a2bbe45a557bde4f123a94a3827aeedd328a9c708b7263c3029a4b09ef81447a860e16ae624be855ca5ecb01ef55531b33122dc9 WHIRLPOOL 0b6a0c24c996ef0a866cd82077db899222937fb8cbfd8778e539252c367042536145aa545c73524b8e18e9da50ee99909f27adbdda3cb37c21667bd0109b20f4
-MISC ChangeLog 4397 SHA256 ea2c558db17096a16633073f17ad790b13bb2aeab2414af9c662a9227469f41d SHA512 d6395751ad8ded117c5e8f06ddd3ea1e5d8c16539576b1e966a78f6b34670971736ce0f7d34ae371428af9c8c6e4c2ce80a1328e1c29f0e3e7a9b213e213542c WHIRLPOOL 2ab621bab4d707f8e13d8dff3582f36117059e74e8a2a65fc3c686a2a988821c1a2c4f537aec961140acc3ae561823a3829726b09e97f490db9433518d64f17a
+MISC ChangeLog 4561 SHA256 b4a3dc6ff9b59bcab1173cec2a6f81f17b1f5432113ea5dadbd93c530862a737 SHA512 d12fee39d287b2211b1c736c5cadb335297d758664d3dca3b2b281d6cb64ee41ef761ddc37b090de8342c355e0d0b2095ec1b40e64ea6ab5c1d010c0a20eed0c WHIRLPOOL 418bac85ced9bca3b88944a724ca00a83aa3253cde06847aa41d8ebc70297feee1670d985e78d4782ed401f6265447fece55721bd002c7c78203985d69a0c88a
 MISC metadata.xml 254 SHA256 42d769831f9be3fb5b0972b75bc3b1e4765416161881d7303cb637abbe03d6dd SHA512 2a78f67329bbc7aab1b971330a49fe7a0812e95f8775a91e6b97d4751b8b6fd92510ecf1bee9bd43dfb376cb0a71830a74e2b9f9212168168a2a7e22b223ae31 WHIRLPOOL 3d71526e2e1ce18ca62385c234302e0694490b40f263e456ff4166e1156279c97e3b58fb4b1959c69ce01d96bc9e1e9eda57e9f596a6155e53bb3f1f496be71e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQgRAQAAoJEFpvPKfnPDWzkisIAIjy38JkYtXtKZXNLD0kIK9I
-cpkny6JClU/bNBdp5p/NXLdQjRfa1IfuHQveZnJDVlwgfi3w3k0WzJNx13YVR+3E
-XhEO9pA1FQpBoWeG53Zw7K9Ordc2oQvZhTSIyyZAy6CnTJXX6lE22cdlxBEFgTFb
-vuZKoM/RX6EUO6AbiaxRJU5YlWG5b5FPlToIdQr+gpsSYoW0w5oeq7VMZPUWJaNn
-6OjQIne1gHprt7AhDahVcOZnZHsC7HrRekN4DyFFSA5QNDMyPny5urQkyqGrNtaF
-e7oQvHy8qap8judw2NAdAy8/vxowwxN2dxehuFe/qAlgyMP8By8aZyWHzOWFaa4=
-=iZC6
------END PGP SIGNATURE-----
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
-}