diff options
author | 2020-04-16 21:14:37 +0000 | |
---|---|---|
committer | 2020-04-16 21:14:37 +0000 | |
commit | 43283c17f759d3cad83d97ffedc73e64f3896ed2 (patch) | |
tree | 799df3c888f869314fb87bdc0e6c75baa35f93b0 | |
parent | 2020-04-16 20:38:28 UTC (diff) | |
parent | games-util/lgogdownloader: Bump to 3.6, drop old 3.7 (diff) | |
download | gentoo-43283c17f759d3cad83d97ffedc73e64f3896ed2.tar.gz gentoo-43283c17f759d3cad83d97ffedc73e64f3896ed2.tar.bz2 gentoo-43283c17f759d3cad83d97ffedc73e64f3896ed2.zip |
Merge updates from master
21 files changed, 72 insertions, 579 deletions
diff --git a/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch new file mode 100644 index 000000000000..71b9e26cd038 --- /dev/null +++ b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch @@ -0,0 +1,36 @@ +From 0e7ee937e01b764a6bde28875a3bf0169dbfafa6 Mon Sep 17 00:00:00 2001 +From: John Tsiombikas <nuclear@member.fsf.org> +Date: Sat, 8 Feb 2020 05:23:02 +0200 +Subject: [PATCH] dev.c should conditionally include proto_x11.h, only if + USE_X11 is defined. Closes github bug #22. + +--- + src/dev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dev.c b/src/dev.c +index 2074895..8a1b315 100644 +--- a/src/dev.c ++++ b/src/dev.c +@@ -1,6 +1,6 @@ + /* + spacenavd - a free software replacement driver for 6dof space-mice. +-Copyright (C) 2007-2019 John Tsiombikas <nuclear@member.fsf.org> ++Copyright (C) 2007-2020 John Tsiombikas <nuclear@member.fsf.org> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -25,7 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include "dev_serial.h" + #include "event.h" /* remove pending events upon device removal */ + #include "spnavd.h" ++ ++#ifdef USE_X11 + #include "proto_x11.h" ++#endif + + static struct device *add_device(void); + static struct device *dev_path_in_use(char const * dev_path); +-- +2.26.1 + diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild index e4ff48d27d98..c36104bb835d 100644 --- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild +++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild @@ -14,9 +14,18 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="X" -RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )" +RDEPEND="X? ( + x11-apps/xdpyinfo + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXi + )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-no-x11.patch # bug 717690 +) + pkg_setup() { CONFIG_CHECK="~INPUT_EVDEV" ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly" diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild index 314e0b54a40e..d4c68b526048 100644 --- a/dev-libs/libnl/libnl-3.5.0.ebuild +++ b/dev-libs/libnl/libnl-3.5.0.ebuild @@ -18,7 +18,7 @@ SRC_URI=" " LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+debug static-libs python +threads utils" RDEPEND=" diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild index 876f2e479102..457f63121118 100644 --- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild +++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild index 83e326207238..5328b454227d 100644 --- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild +++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-python/pytest[${PYTHON_USEDEP}] diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest index ccae1151a05d..09b2759175ff 100644 --- a/games-server/bedrock-server/Manifest +++ b/games-server/bedrock-server/Manifest @@ -1,2 +1,2 @@ DIST bedrock-server-1.14.1.4.zip 49395245 BLAKE2B 987de7d8e009dedb87e01b14e81ba857dd374f7d6621d3f13e137d7a51ad763d952452a1f8d34ff943add8ae3df8c7aff7fc5fe315d2ee29986fe967926a3969 SHA512 765d31aa3fd75c3e654ae65e5888ef3fc094fb12a49d9f0d5b0d94c58dfb508884218288dd4bb1cbda007305bff969219d6d438db4d9732295590678561bfcc3 -DIST bedrock-server-1.14.32.1.zip 49449540 BLAKE2B 293b366cd3455775b0cd4145cac474030c6eeb7df83397cc0f80c2f97515e2f2aaf256cc4ca7372e3795534d1ccefba515fbd054914c7e93b65ed5e8f1ef122a SHA512 e998565f04cd2703f125fb5627aeae8b1f010600e0880f0aee009dc26544f251c5555d2b503d27ecbc721ee62b7f07afaf357ae631042094d18884310b9518a8 +DIST bedrock-server-1.14.60.5.zip 288044278 BLAKE2B 11fa18f892b95eac8fa2108adce6af14b213f4a409c82d4a59b9cf17ce2d8921f1ef1d6e74cc53757f5453daa84298c36230884f15e56408b74e3a70ca50b74b SHA512 d295f7090fb26c87d8259cd5e7581699d59292425362139035929548e27055e78c3a8c64b02f99c3da24d8edf8657f3ca656253c7979d30b1495ebf6000b9308 diff --git a/games-server/bedrock-server/bedrock-server-1.14.32.1.ebuild b/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild index c7229a9f1d2e..c7229a9f1d2e 100644 --- a/games-server/bedrock-server/bedrock-server-1.14.32.1.ebuild +++ b/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 6ef4bdbbcee8..0fefa7f45e6d 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,4 +1 @@ -DIST openttd-1.10.0-source.tar.xz 6801228 BLAKE2B 7383cec42ece1b02fa9c783453ca2c54346138762b44d4338cd5f31577855cf0dc7af5744a3fc82354c463d81fc6ecde0ec3f9f660b6275cb58f85ecf43adbba SHA512 f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a -DIST openttd-1.9.1-source.tar.xz 6647548 BLAKE2B fd7d03221bea49345e2163ff700e62a12682f706c1dab3fc741136219b80094bf945dc0cefcd807a643d141841a307141bb760d4b06bf75fa18129c557b149c3 SHA512 44d907299a14fd09ebff980f7c212bbdbd5def880bc56bfe106c3efa8cb32472bbcafdbb145d3f4340a3bc96179418f78fe2ddc62dd067b464eca73313b477c1 -DIST openttd-1.9.2-source.tar.xz 6666860 BLAKE2B a28862b00f3ec5cd8f015445022746e08a298046de05a592a76f72ff72d76aae4584d48cfe021d3fe6920555b4848986b3e25b23998cac830da572c21f06e595 SHA512 a84a219c049147e9566967f96a01c84dde587e38da37b34ef756da99a2d14f1d418492030098f63c4ac60cb0db553f474aaf3b8a00c8abfd98f66adc14f523e4 -DIST openttd-1.9.3-source.tar.xz 6659508 BLAKE2B 653ddd14d257d25f6c51138765f310cb8166575375fb95227a9a2c06cd1b526d8af403cb736d17b98c49add26f668ab5c6f8ca7b5fcda5fea9093726b2fd4a21 SHA512 e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 +DIST openttd-1.10.1-source.tar.xz 6741548 BLAKE2B a9cf7681d4180a27f3b51ec9e4cdfdc8eae8a3e51f3ab70caa638d19211336c2067bdeefddb59a3638cbd25d89d83fb8ee4170584e861fefe84013ec5c6ff69c SHA512 9e391c2c18687ce9d6fb1094da5dac1166ec409b17f5f4745486b24185e01380cfd806157b7fb9298c58f790995b43bc8c93d993e6a7e36a5b7cf153b7a1de89 diff --git a/games-simulation/openttd/openttd-1.10.0.ebuild b/games-simulation/openttd/openttd-1.10.1.ebuild index c8b8fc022e85..07ee1c248208 100644 --- a/games-simulation/openttd/openttd-1.10.0.ebuild +++ b/games-simulation/openttd/openttd-1.10.1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit xdg + +inherit toolchain-funcs xdg MY_PV="${PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" @@ -20,11 +21,11 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" +IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] + media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb @@ -36,6 +37,7 @@ RDEPEND="!dedicated? ( sys-libs/zlib:= ) ) + lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( @@ -72,6 +74,7 @@ src_configure() { --prefix-dir="${EPREFIX}/usr" $(use_with cpu_flags_x86_sse sse) $(use_with iconv) + $(use_with lzma) $(use_with lzo liblzo2) $(use_with png) $(usex debug '--enable-debug=3' '') @@ -101,7 +104,7 @@ src_configure() { # configure is a hand-written bash-script, so econf will not work. # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die + CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die } src_compile() { diff --git a/games-simulation/openttd/openttd-1.9.1.ebuild b/games-simulation/openttd/openttd-1.9.1.ebuild deleted file mode 100644 index 49368f0e59a7..000000000000 --- a/games-simulation/openttd/openttd-1.9.1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git" -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0 - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-simulation/openttd/openttd-1.9.2.ebuild b/games-simulation/openttd/openttd-1.9.2.ebuild deleted file mode 100644 index 49368f0e59a7..000000000000 --- a/games-simulation/openttd/openttd-1.9.2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git" -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0 - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-simulation/openttd/openttd-1.9.3.ebuild b/games-simulation/openttd/openttd-1.9.3.ebuild deleted file mode 100644 index 49368f0e59a7..000000000000 --- a/games-simulation/openttd/openttd-1.9.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git" -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0 - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - --without-libtimidity - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild index c8b8fc022e85..07ee1c248208 100644 --- a/games-simulation/openttd/openttd-9999.ebuild +++ b/games-simulation/openttd/openttd-9999.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit xdg + +inherit toolchain-funcs xdg MY_PV="${PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" @@ -20,11 +21,11 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" +IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" RESTRICT="test" # needs a graphics set in order to test RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] + media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb @@ -36,6 +37,7 @@ RDEPEND="!dedicated? ( sys-libs/zlib:= ) ) + lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( @@ -72,6 +74,7 @@ src_configure() { --prefix-dir="${EPREFIX}/usr" $(use_with cpu_flags_x86_sse sse) $(use_with iconv) + $(use_with lzma) $(use_with lzo liblzo2) $(use_with png) $(usex debug '--enable-debug=3' '') @@ -101,7 +104,7 @@ src_configure() { # configure is a hand-written bash-script, so econf will not work. # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure ${myopts[@]} || die + CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die } src_compile() { diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest index 358481bab896..e11639e41e64 100644 --- a/games-util/lgogdownloader/Manifest +++ b/games-util/lgogdownloader/Manifest @@ -1 +1 @@ -DIST lgogdownloader-3.6.tar.gz 85470 BLAKE2B 8dafbbbc0653629f5fda2a54f7f0609924d02e4266a018ebdc04abbdfa0ad97e9bdb1f33f5a1e8cb24695cf9c45c2abbbc4857f7eb8650dbc73feef9c6dd9f54 SHA512 e03b1f50a227aa9295071a309eaac4110592b1f50b8379298605d4995e83cde27039e3b3f074c6cd47f6e6971aafe756d619619b7e24f5960b8f271fa1081793 +DIST lgogdownloader-3.7.tar.gz 85653 BLAKE2B bb6fe56be291ca726b97cfb7ce83e87e855584da911839a9bc6a923c027e7ea67e83e62a5e8bb1a0c62dd053a7d6728c1e82896d19ba48a310574dc8c6a647f5 SHA512 2085b9c64008d790a28dcb9d22009340acac164db316523919dcf797255fd57a36160950fb222e82b9ee6262ef8c0e86193e2d9a4488ea2105f9f4bbe7db727b diff --git a/games-util/lgogdownloader/lgogdownloader-3.6.ebuild b/games-util/lgogdownloader/lgogdownloader-3.7.ebuild index fa94c0f4adca..fa94c0f4adca 100644 --- a/games-util/lgogdownloader/lgogdownloader-3.6.ebuild +++ b/games-util/lgogdownloader/lgogdownloader-3.7.ebuild diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest index 63f880895ec0..f8ef5c0c5408 100644 --- a/media-libs/libopenmpt/Manifest +++ b/media-libs/libopenmpt/Manifest @@ -1 +1 @@ -DIST libopenmpt-0.4.11+release.autotools.tar.gz 1471760 BLAKE2B fa6fd53974e235c9efb01dd7498067be9eb90a06906785d05257557c4c7faafbd0136f63e46f76638b46362cad02849fee45a21ed1c65603134c387d1c064d12 SHA512 d720a0c04984f624f7ecd1ee8648045cd09ced2cc8b1cf3546404b9e73b2781493076391c1881e0d0eee72cf829a38365313efb9852448cd1cfe5f7b7f535e99 +DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a diff --git a/media-libs/libopenmpt/libopenmpt-0.4.11.ebuild b/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild index 091bc25c2d2b..093c6758739c 100644 --- a/media-libs/libopenmpt/libopenmpt-0.4.11.ebuild +++ b/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest index 63f880895ec0..f8ef5c0c5408 100644 --- a/media-sound/openmpt123/Manifest +++ b/media-sound/openmpt123/Manifest @@ -1 +1 @@ -DIST libopenmpt-0.4.11+release.autotools.tar.gz 1471760 BLAKE2B fa6fd53974e235c9efb01dd7498067be9eb90a06906785d05257557c4c7faafbd0136f63e46f76638b46362cad02849fee45a21ed1c65603134c387d1c064d12 SHA512 d720a0c04984f624f7ecd1ee8648045cd09ced2cc8b1cf3546404b9e73b2781493076391c1881e0d0eee72cf829a38365313efb9852448cd1cfe5f7b7f535e99 +DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a diff --git a/media-sound/openmpt123/openmpt123-0.4.11.ebuild b/media-sound/openmpt123/openmpt123-0.4.12.ebuild index e7c6d6f4b4b7..f015fab023a7 100644 --- a/media-sound/openmpt123/openmpt123-0.4.11.ebuild +++ b/media-sound/openmpt123/openmpt123-0.4.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.9.1.ebuild index 31a787b0af61..ed8e0d3d4887 100644 --- a/sys-apps/debianutils/debianutils-4.9.1.ebuild +++ b/sys-apps/debianutils/debianutils-4.9.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz" LICENSE="BSD GPL-2 SMAIL" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" IUSE="+installkernel static" PDEPEND=" diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild index 1d40ac000cdf..92efe3760555 100644 --- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild +++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" RDEPEND=" >=sys-apps/debianutils-4.9-r1 |