[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/, games-strategy/widelands/

[David Seifert]

commit:     b8ffc51a58e7d300dff95f4d3a101196cf83d424
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 20:24:32 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May  3 20:25:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ffc51a

games-strategy/widelands: Remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/widelands/Manifest                  |  1 -
 .../widelands/files/widelands-0.17-cxxflags.patch  | 33 -----------
 .../widelands/files/widelands-0.17-gcc47.patch     | 12 ----
 games-strategy/widelands/widelands-0.17.ebuild     | 68 ----------------------
 games-strategy/widelands/widelands-0.18.ebuild     | 63 --------------------
 5 files changed, 177 deletions(-)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 321553871a8..23fd39ae368 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
-DIST widelands-build17-src.tar.bz2 175547379 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512 ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d WHIRLPOOL 35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa
 DIST widelands-build18-src.tar.bz2 183443325 SHA256 6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72 WHIRLPOOL ca46c70d951f83c00c37465bc0da9eb94d8d66be50e00c015ee6264ebc99669eca08aeb4117fbcd97fcb7c0e689af4947ad96c231746fc4a2626bb6ac4005be1

diff --git a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch b/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
deleted file mode 100644
index 419d5d78a35..00000000000
--- a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Ospald <hasufell@g.o>
-Date: Wed May 16 12:06:13 UTC 2012
-
-respect CXXFLAGS
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -209,24 +209,7 @@
- 
- # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
- set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--
--#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
--IF (${CMAKE_COMPILER_IS_GNUCXX})
--EXEC_PROGRAM (
--    ${CMAKE_CXX_COMPILER}
--    ARGS --version
--    OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
--    )
--    STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
--    IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--        message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
--        message("Suffering from gcc bug, disabling -O3")
--        set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--    ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--        #This line is the default and should be preserved.
--        set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--    ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
-+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Release compiler flags" FORCE)
- 
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)

diff --git a/games-strategy/widelands/files/widelands-0.17-gcc47.patch b/games-strategy/widelands/files/widelands-0.17-gcc47.patch
deleted file mode 100644
index 9ea19c3571d..00000000000
--- a/games-strategy/widelands/files/widelands-0.17-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/main.cc'
---- src/main.cc	2012-02-15 21:25:34 +0000
-+++ src/main.cc	2012-05-02 07:43:01 +0000
-@@ -28,6 +28,7 @@
- #include <iostream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <unistd.h>
- 
- #include <SDL_main.h>
- 
-

diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
deleted file mode 100644
index e8e0ddf80eb..00000000000
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-gfx
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib
-	media-libs/glew
-	media-libs/sdl-ttf
-	>=dev-libs/boost-1.37"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-PREFIX=${GAMES_DATADIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cxxflags.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
-	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
-	sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}

diff --git a/games-strategy/widelands/widelands-0.18.ebuild b/games-strategy/widelands/widelands-0.18.ebuild
deleted file mode 100644
index 5857977c943..00000000000
--- a/games-strategy/widelands/widelands-0.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-gfx
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib[minizip]
-	media-libs/glew
-	media-libs/sdl-ttf
-	>=dev-libs/boost-1.48"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-PREFIX=${GAMES_DATADIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cxxflags.patch
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}