gentoo resync : 09.06.2018

4 files changed, 2 insertions, 146 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7cce06a5dc8a..733d5525023b 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +1,6 @@
-AUX wesnothd.rc 502 BLAKE2B 70803edb2084abfee5382624adba4a31e0bd1d5e9e2a7d800f7732fb262bacc80eb39550f2c15d19b7be9bc626d07aa5eafca04ea07abfda92a1778681a51428 SHA512 5e0a4680a35f81e749b8e0d56e3cf372c4a13b19578deda072560d0c63460426d7bde3e0e955287c8fbc939c700dc487283373ff9bc72bbcd9cf633ddaeafc96
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6 SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
-EBUILD wesnoth-1.12.6.ebuild 3106 BLAKE2B 20d3d1069778f17dde09d92b734ca4aa1a9f6c20cf0cf65339a418c686e83e9a7b1d40e39aa823f467b50c62cf4cc7ec71a110ce390213189008940c0cfe3ef8 SHA512 3220f1581f8f4561d2c179267d47fd8c8c1eeb0a296467e6d07311635e01f2981b64b747377e229f0e3cd575accab4b66be99be36994b81400db20f56f795f5d
 EBUILD wesnoth-1.14.1-r1.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f
-EBUILD wesnoth-1.14.2.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f
+EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnothd.rc b/games-strategy/wesnoth/files/wesnothd.rc
deleted file mode 100644
index f8662b0981fc..000000000000
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting wesnothd"
-	start-stop-daemon --start --quiet -b -m \
-		--pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \
-		-c GAMES_USER_DED:GAMES_GROUP \
-		--exec "GAMES_BINDIR"/wesnothd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping wesnothd"
-	start-stop-daemon --stop --quiet --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid
-	eend $?
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
deleted file mode 100644
index 3c5d8cf3cf08..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/"
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-	media-libs/sdl-net
-	!dedicated? (
-		>=media-libs/sdl-ttf-2.0.8
-		>=media-libs/sdl-mixer-1.2[vorbis]
-		>=media-libs/sdl-image-1.2[jpeg,png]
-		fribidi? ( dev-libs/fribidi )
-		dbus? ( sys-apps/dbus )
-		sys-libs/zlib
-		x11-libs/pango
-		dev-lang/lua:0
-		media-libs/fontconfig
-	)
-	>=dev-libs/boost-1.48:=[nls,threads]
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use dedicated || use server ; then
-		sed \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
-			> "${T}"/wesnothd || die
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-	# bug #472994
-	mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-	mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local 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=TRUE"
-			"-DENABLE_SERVER=TRUE"
-			"-DSERVER_UID=${GAMES_USER_DED}"
-			"-DSERVER_GID=${GAMES_GROUP}"
-			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			$(cmake-utils_use_enable fribidi FRIBIDI)
-			"-DENABLE_CAMPAIGN_SERVER=FALSE"
-			"-DENABLE_SERVER=FALSE"
-			)
-	fi
-	mycmakeargs+=(
-		$(cmake-utils_use_enable !dedicated GAME)
-		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable dbus NOTIFICATIONS)
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DDATAROOTDIR=${GAMES_DATADIR}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DLOCALEDIR=/usr/share/locale"
-		"-DMANDIR=/usr/share/man"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="README.md changelog players_changelog" cmake-utils_src_install
-	if use dedicated || use server; then
-		keepdir "${GAMES_STATEDIR}/run/wesnothd"
-		doinitd "${T}"/wesnothd
-	fi
-	prepgamesdirs
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
index 5a1f6c5af2e9..27cde05f1ad0 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
@@ -100,7 +100,7 @@ src_configure() {
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_OMP="$(usex openmp)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
 	cmake-utils_src_configure
 }