gentoo resync : 12.01.2019

3 files changed, 3 insertions, 120 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 58b5c4121663..0f56991204c0 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,4 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7 SHA512 d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885
 DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e SHA512 115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
-EBUILD wesnoth-1.14.4.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
-EBUILD wesnoth-1.14.5.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
+EBUILD wesnoth-1.14.5.ebuild 2652 BLAKE2B af84f260e5b35f7c575958b3ded2e139085ed9fd07f58fb93cf0d827abe5729a00f30aea85084878ec2a222651e18bd88e80d4fec2de9a9ba263b07ec8a2e144 SHA512 a3a503cf306139b69f0c912cf73a9d6f32e7089c0e2e44b6c9f06a13ed8df5eeb7889c9d3885884a4112a4121c1176c4e26f6d3756f48ce20e0e0ba455383d41
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
deleted file mode 100644
index 9ce29bd54b01..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-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"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp 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}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	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 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_OMP="$(usex openmp)"
-		-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
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
index 9ce29bd54b01..4cd3506d2b9c 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ RDEPEND="
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
+		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
 		fribidi? ( dev-libs/fribidi )
 	)"