From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- games-strategy/wesnoth/Manifest | 6 +- games-strategy/wesnoth/wesnoth-1.14.6.ebuild | 116 --------------------------- games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 5 +- games-strategy/wesnoth/wesnoth-1.15.1.ebuild | 115 ++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 120 deletions(-) delete mode 100644 games-strategy/wesnoth/wesnoth-1.14.6.ebuild create mode 100644 games-strategy/wesnoth/wesnoth-1.15.1.ebuild (limited to 'games-strategy/wesnoth') diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index d0f7b724a36c..6328ad8d970d 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,7 +1,7 @@ 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.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b -EBUILD wesnoth-1.14.6.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de -EBUILD wesnoth-1.14.7.ebuild 2731 BLAKE2B dbb292c86d40fe75acb4668ad1a4afa8794b338a59de45c7c44efc296ea9c7982d178f1e943629d9a4e14038ef19503a24b394956e25a6a079488fefafb4919f SHA512 104d6de80ffd977b0591999dc089e200242969ebbc15c373a4cde8d5209ace402969f174a928f8ac123ee9c2cfb5ecae426f19bb9e05760acf31dff5a9a5d0c4 +DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c SHA512 abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2 +EBUILD wesnoth-1.14.7.ebuild 2829 BLAKE2B d3ee24ef0b04a246b5ff79fd54e8186f220c97789c81f18a2f901d7c89c5ea79622d121c0b79a9c787f341fcb9a88bea7d15bf0e0931d271d15acaea0527bc2c SHA512 2482c67554292f868c25f498ccd570bd3c8c1bc2722d99eb655b8c7fe6487bde535119795df934306cbcadd29d6de374de07ec0c3a27e45ebd72fbf0a633dcd4 +EBUILD wesnoth-1.15.1.ebuild 2648 BLAKE2B 4332f4ae7797f9db6b399291017c2f0dcb8bdf8eb6230e890cc2ae3ba3a43cc65824a66820a3973dec1f5e390e01c29f0bb1094801655623d3e1ca1fd777e2e5 SHA512 b6a50672a0e1854cfb5df8f51051c947a9ab28c446261303a1ceb1eb90396149c0dccfe372d776fac0eee1d9d9a6477b323ac53acf5bece1f7988d8264d77618 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 diff --git a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild b/games-strategy/wesnoth/wesnoth-1.14.6.ebuild deleted file mode 100644 index 971ba1f87a94..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -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 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_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.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild index e0b1b37602ec..e4bfda3bc803 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild @@ -11,7 +11,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +# uneven minor versions are development versions +if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then + KEYWORDS="~amd64 ~x86 ~x86-fbsd" +fi IUSE="dbus dedicated doc fribidi libressl nls openmp server" RDEPEND=" diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild new file mode 100644 index 000000000000..24ae216df067 --- /dev/null +++ b/games-strategy/wesnoth/wesnoth-1.15.1.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 ~x86-fbsd" +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 +} -- cgit v1.2.3