10 files changed, 122 insertions, 76 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 34a373d158d7..cdabf473d697 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 6f194d924cda..7e4deb1fff7c 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,5 +1,3 @@
-AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
-DIST hedgewars-src-0.9.25.tar.bz2 175276967 BLAKE2B 8f0779ca05ffbf18f607716bbec03bf0d6633cd6c3594bcb94b78ba606ed8c36d418d7b5456574cc0a08489e143d2390ed7ebcc8637e7987231ba04c0d5b5331 SHA512 956c21a7203586485e885f98fa4eccdc2fd34b50c0f817c1f6f610af1b4f341a5bb32bb8e0ace13f78ce2fb79a489000034b89c1b56459a411c07a1809041968
-DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
-EBUILD hedgewars-0.9.25.ebuild 2794 BLAKE2B c9be8c1774be0791b6762809b188eb456383a5eaaab8bc60f7e756dc78738a54df37c62e0f1d562da22e0d77970654b8af942a8771796aafff163452a2a7fce1 SHA512 846aea392913a8c97e012d6966e0e4c021ab4e4a9e1a843cb083380d30ad0c9e971f49ffc6296572423d1e5a57593af31b688fd32843e557b7249942e91252f4
+DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
+EBUILD hedgewars-1.0.0-r1.ebuild 2637 BLAKE2B 2cde20a1a3938c31377668f3ff92cbd66f1753b2063e22492e1c378cf353d58d1e01f0dd5c984c8b7c23ad17e4931a084b066b4294ffba1af4cb7f15efb5b038 SHA512 63a859d5a124b70afa9dc7fc45e6826ef64551226fadcc34b9e67822af3ef8b2c48334e3fcce01107261d5a71d13931bbd792ca4cd91c58d1870d2bfe06f4303
 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
deleted file mode 100644
index 881c0d3217d6..000000000000
--- a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake_modules/paths.cmake	2015-12-02 15:02:38.000000000 +0100
-+++ b/cmake_modules/paths.cmake	2015-12-02 15:15:24.729980850 +0100
-@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
-     # - the third one is the full path of the system dir
-     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
-     #skip this if the install prefix is the standard one
--    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
-+    #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
- endif(APPLE)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.25.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
index c98f3a05e5de..9e8d0f6b1289 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
@@ -7,12 +7,10 @@ CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils xdg-utils
 
 MY_P=${PN}-src-${PV}
-DEB_PATCH_VER=2
 
 DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
 HOMEPAGE="https://www.hedgewars.org/"
-SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
-	mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
@@ -70,10 +68,6 @@ BDEPEND="
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DMINIMAL_FLAGS=ON
diff --git a/games-strategy/mindrover-demo/Manifest b/games-strategy/mindrover-demo/Manifest
deleted file mode 100644
index 14f2b2370beb..000000000000
--- a/games-strategy/mindrover-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mindrover_demo.run 25266633 BLAKE2B 427dd9a808309634ff59c5cb756b7433225f15f4bfed8ef6ed5ebf0f85db1a0db5e488b4041c04aa3b75a6f651bd0a013e89d70b8c11b1cab262861888d26bb2 SHA512 ddb78f6a40bd42dd3b3ce0a6793f5e217937d3be1dd294d7d8596f8409eee506522a64d9396db2d93fa3beca197d85c7a6507a8f2ae773d0b9b123e9be1e761c
-EBUILD mindrover-demo-1.07b.ebuild 1102 BLAKE2B cc5f9cd09c652dc9576824bfa46b4fa851d0f7c39db84ac1573f4fbb5a7b2a578eb5c11d4c125ef33c981f44fd65bd9e3478d261d4436e590c10f4240d7edc51 SHA512 b778ebbe2c38346ca1a0e1ce4c7a60308a08809c930df095eb9bef7fc941b219c20a4246cad746ef7b718e1ff22d60a19aa6c95e639a3dae8badc174c6f4cb89
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/mindrover-demo/metadata.xml b/games-strategy/mindrover-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/mindrover-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
deleted file mode 100644
index c41f3c126707..000000000000
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_P="mindrover_demo.run"
-DESCRIPTION="Control a robot as it races across Europa"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=9"
-SRC_URI=" http://demos.linuxgamepublishing.com/mindrover/${MY_P}"
-
-LICENSE="all-rights-reserved GPL-2+"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="virtual/opengl"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-
-	dodir "${dir}"
-
-	tar -zxf data.tar.gz -C "${Ddir}"/ || die
-	tar -zxf music.tar.gz -C "${Ddir}"/ || die
-
-	dodoc README
-	newicon icon.xpm ${PN}.xpm || die
-	exeinto "${dir}"
-	doexe bin/Linux/x86/glibc-2.1/mindrover_demo \
-		bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die
-	dosym "${dir}"/libopenal.so.0.0.6 "${dir}"/libopenal.so.0
-
-	games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)"
-
-	prepgamesdirs
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index dec59817f837..a945f4ccf832 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,9 @@
 AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
-DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c SHA512 abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2
+DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
+DIST wesnoth-1.15.2.tar.gz 500575489 BLAKE2B c94ff72034f0253c3a2ceb29f10617227c407baa6365116a8cd23c70dd960d9898f5a6291235347769780798438380fe78ada8fb75b4dd83e2d2831f495360ae SHA512 c15bdc214147a222ceb2e6243a75e2dbe4f10eb6153a32c10f37b1ec163a7e0b8f6fb12747917602773fd149d23dc8a6b3ed0b0c017f44f713388743126d6b94
 EBUILD wesnoth-1.14.7.ebuild 2819 BLAKE2B 194395547f79c162c8ced3294df0b5b45e53dcaa86c8f7bab5a8d4f4199ecdab103992adb012ea34579591051c48fd53bf8af0589628b20685e462b29907d72d SHA512 4f9ff22b984f899a7b534eb0ac9a8ca23c8599da1503c346943741018bf1d0d0d65a65d59c4e8bf7f0ab476a0edfeb8ffa8b01d425bc5c6d0f4d42e3817d4263
-EBUILD wesnoth-1.15.1.ebuild 2638 BLAKE2B fcac93c5e7463383370c8e914347e38c40e6e5f7b1ac0050f71ffdba3984aae796d5f9cbfcb4d496385fddc84febbf8efa743a1aa1e2623765f3e55885b8c28d SHA512 3e75f3005553cbc01e465882c3c8eeaafd8158a4c2c1f25803a2a1e1b51c871c48a1306935708c6d443090361cdc3cc38edfedf9ece86fa4af720f4b5133670d
+EBUILD wesnoth-1.14.9.ebuild 2638 BLAKE2B fcac93c5e7463383370c8e914347e38c40e6e5f7b1ac0050f71ffdba3984aae796d5f9cbfcb4d496385fddc84febbf8efa743a1aa1e2623765f3e55885b8c28d SHA512 3e75f3005553cbc01e465882c3c8eeaafd8158a4c2c1f25803a2a1e1b51c871c48a1306935708c6d443090361cdc3cc38edfedf9ece86fa4af720f4b5133670d
+EBUILD wesnoth-1.15.2.ebuild 2638 BLAKE2B fcac93c5e7463383370c8e914347e38c40e6e5f7b1ac0050f71ffdba3984aae796d5f9cbfcb4d496385fddc84febbf8efa743a1aa1e2623765f3e55885b8c28d SHA512 3e75f3005553cbc01e465882c3c8eeaafd8158a4c2c1f25803a2a1e1b51c871c48a1306935708c6d443090361cdc3cc38edfedf9ece86fa4af720f4b5133670d
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
index 807170165f0b..807170165f0b 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
diff --git a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
new file mode 100644
index 000000000000..807170165f0b
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils user xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="dbus dedicated doc fribidi libressl nls server"
+
+RDEPEND="
+	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		>=media-libs/sdl2-ttf-2.0.12
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+		fribidi? ( dev-libs/fribidi )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	# Work around eclass
+	append-flags -UNDEBUG
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_FRIBIDI="$(usex fribidi)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake-utils_src_install
+	if use dedicated || use server; then
+		rmdir "${ED}/run/wesnothd" || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}