commit: e6b14dd3d154e5ff05ac29e4d71e55a6ed0b1b60 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 12:18:16 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 12:20:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b14dd3
games-simulation/openttd: Bump live ebuild to EAPI-7 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../openttd/files/openttd-1.9.0-cflags.patch | 56 ++++++++++++++++++++++ .../openttd-1.9.0-dont_compress_manpages.patch | 34 +++++++++++++ games-simulation/openttd/openttd-9999.ebuild | 51 ++++++++++---------- 3 files changed, 117 insertions(+), 24 deletions(-) diff --git a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch new file mode 100644 index 00000000000..86eb16168db --- /dev/null +++ b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch @@ -0,0 +1,56 @@ +From 6d72f33efe9f911d1427795a06c13d9dcd6fa222 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Wed, 3 Apr 2019 14:11:42 +0200 +Subject: [PATCH] Don't mess with our CFLAGS + +Signed-off-by: Lars Wendler <[email protected]> +--- + config.lib | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/config.lib b/config.lib +index f65aaa535..7789c0bea 100644 +--- a/config.lib ++++ b/config.lib +@@ -1499,11 +1499,6 @@ make_cflags_and_ldflags() { + # No debug, add default stuff + OBJS_SUBDIR="release" + +- if [ "$enable_profiling" = "0" ]; then +- # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) +- CFLAGS="-fomit-frame-pointer $CFLAGS" +- fi +- CFLAGS="-O2 $CFLAGS" + else + OBJS_SUBDIR="debug" + +@@ -1511,14 +1506,6 @@ make_cflags_and_ldflags() { + if [ $enable_debug -ge 1 ]; then + CFLAGS="$CFLAGS -g -D_DEBUG" + fi +- if [ $enable_debug -ge 2 ]; then +- CFLAGS="$CFLAGS -fno-inline" +- fi +- if [ $enable_debug -ge 3 ]; then +- CFLAGS="$CFLAGS -O0" +- else +- CFLAGS="$CFLAGS -O2" +- fi + fi + + if [ $enable_debug -le 2 ]; then +@@ -1543,11 +1530,6 @@ make_cflags_and_ldflags() { + CFLAGS="$CFLAGS -fno-expensive-optimizations" + fi + +- if [ "$enable_profiling" != "0" ]; then +- CFLAGS="$CFLAGS -pg" +- LDFLAGS="$LDFLAGS -pg" +- fi +- + if [ "$with_threads" = "0" ]; then + CFLAGS="$CFLAGS -DNO_THREADS" + fi +-- +2.21.0 + diff --git a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch new file mode 100644 index 00000000000..d151dbf3693 --- /dev/null +++ b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch @@ -0,0 +1,34 @@ +From da54b0365997181979d5c7131e99957424d4a167 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Wed, 3 Apr 2019 13:53:50 +0200 +Subject: [PATCH] Do not compress man-pages by default + +Signed-off-by: Lars Wendler <[email protected]> +--- + Makefile.bundle.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.bundle.in b/Makefile.bundle.in +index eaf7134dd..1c2523181 100644 +--- a/Makefile.bundle.in ++++ b/Makefile.bundle.in +@@ -77,7 +77,6 @@ endif + ifdef MAN_DIR + $(Q)mkdir -p "$(BUNDLE_DIR)/man/" + $(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/" +- $(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6" + endif + $(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/" + $(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/" +@@ -219,7 +218,7 @@ endif + ifdef MAN_DIR + ifndef DO_NOT_INSTALL_MAN + $(Q)install -d "$(INSTALL_MAN_DIR)" +- $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz" ++ $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6" + endif + endif + ifdef MENU_DIR +-- +2.21.0 + diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild index 8289f42f6d0..0299cc25d76 100644 --- a/games-simulation/openttd/openttd-9999.ebuild +++ b/games-simulation/openttd/openttd-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome2-utils +EAPI=7 +inherit xdg MY_PV="${PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" @@ -13,8 +13,9 @@ if [[ "${PV}" == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"; else - SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.xz"; + 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" @@ -32,14 +33,18 @@ RDEPEND="!dedicated? ( truetype? ( media-libs/fontconfig media-libs/freetype:2 - sys-libs/zlib + sys-libs/zlib:= ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) - png? ( media-libs/libpng:0 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} + png? ( + media-libs/libpng:0 + sys-libs/zlib:= + ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig" PDEPEND=" !dedicated? ( @@ -52,32 +57,30 @@ PDEPEND=" ) openmedia? ( >=games-misc/opengfx-0.4.7 )" -S="${WORKDIR}/${MY_P}" - PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-cflags.patch + "${FILESDIR}"/${PN}-1.9.0-cflags.patch + "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch ) src_configure() { local myopts=( - --disable-strip - --prefix-dir="${EPREFIX%/}/usr" --binary-dir="bin" + --disable-strip + --doc-dir="share/doc/${PF}" --install-dir="${D}" --menu-group="Game;Simulation;" - $(use_with iconv) - $(use_with png) + --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 @@ -109,17 +112,17 @@ src_install() { default if use dedicated ; then newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED%/}"/usr/share/{applications,icons,pixmaps} + rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} fi - rm -f "${ED%/}"/usr/share/doc/${PF}/COPYING + rm -f "${ED}"/usr/share/doc/${PF}/COPYING } pkg_preinst() { - gnome2_icon_savelist + xdg_pkg_preinst } pkg_postinst() { - gnome2_icon_cache_update + xdg_pkg_postinst if ! use lzo ; then elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" @@ -173,5 +176,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update + xdg_pkg_postrm }
