gentoo resync : 28.07.2021

3 files changed, 0 insertions, 85 deletions

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index da2f807de937..d0b3d49008e9 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,4 @@
-AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
-DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
-EBUILD widelands-0.21.ebuild 1294 BLAKE2B 83dd55f08b40846aa9ccbe6ae4a1a77fe70e4e700978922b2642d5ed1cc19b03300fb5b1ff4046a5c30a1f58b5b799201b93aa5799517099bec4d4d0b642fc8f SHA512 d056e4c495b2279d1d95bdb5e3cfaf141b949c5db661783c08b204e7214e6a73cc780b00c04e93fe813350da3d70dc9b961e71f924a07a2439aca952cb82a475
 EBUILD widelands-1.0.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
deleted file mode 100644
index ee8fda17ee4a..000000000000
--- a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- widelands-build19-rc1/CMakeLists.txt
-+++ widelands-build19-rc1/CMakeLists.txt
-@@ -146,19 +146,13 @@
-   option(OPTION_ASAN "Build with AddressSanitizer" ON)
- elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--    set(WL_OPTIMIZE_FLAGS "-O2")
--  else()
--    set(WL_OPTIMIZE_FLAGS "-O3")
-+    message(STATUS "GCC >6.2.0 breaks -03")
-   endif ()
-   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-   option(OPTION_ASAN "Build with AddressSanitizer" OFF)
- elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--    set(WL_OPTIMIZE_FLAGS "-O2")
--  else()
--    set(WL_OPTIMIZE_FLAGS "-O3")
-+    message(STATUS "GCC >6.2.0 breaks -03")
-   endif ()
-   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-   option(OPTION_ASAN "Build with AddressSanitizer" ON)
diff --git a/games-strategy/widelands/widelands-0.21.ebuild b/games-strategy/widelands/widelands-0.21.ebuild
deleted file mode 100644
index 398bc433cb5a..000000000000
--- a/games-strategy/widelands/widelands-0.21.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-MY_PV="build$(ver_cut 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	media-libs/glew:0=
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	sys-libs/zlib:=
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
-		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
-		-DGTK_UPDATE_ICON_CACHE=OFF
-		-DOPTION_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}