[gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/

[Lars Wendler]

commit:     4d73088292ea6ff6b1329c93fff0546eee2825ff
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 09:21:38 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 11:22:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d730882

games-simulation/openttd: ebuild adjustments

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-simulation/openttd/openttd-1.10.3.ebuild | 13 +++----------
 games-simulation/openttd/openttd-9999.ebuild   | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild 
b/games-simulation/openttd/openttd-1.10.3.ebuild
index 8bad288e564..bd35f84f89b 100644
--- a/games-simulation/openttd/openttd-1.10.3.ebuild
+++ b/games-simulation/openttd/openttd-1.10.3.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
        lzo? ( dev-libs/lzo:2 )
        iconv? ( virtual/libiconv )
        png? (
-               media-libs/libpng:0
+               media-libs/libpng:0=
                sys-libs/zlib:=
        )
        zlib? ( sys-libs/zlib:= )"
@@ -105,7 +105,8 @@ src_configure() {
 
        # configure is a hand-written bash-script, so econf will not work.
        # It's all built as C++, upstream uses CFLAGS internally.
-       CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || 
die
+       CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+       ./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -121,10 +122,6 @@ src_install() {
        rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-       xdg_pkg_preinst
-}
-
 pkg_postinst() {
        xdg_pkg_postinst
 
@@ -178,7 +175,3 @@ pkg_postinst() {
                fi
        fi
 }
-
-pkg_postrm() {
-       xdg_pkg_postrm
-}

diff --git a/games-simulation/openttd/openttd-9999.ebuild 
b/games-simulation/openttd/openttd-9999.ebuild
index acf83d2f955..d3e0bdea701 100644
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
        lzo? ( dev-libs/lzo:2 )
        iconv? ( virtual/libiconv )
        png? (
-               media-libs/libpng:0
+               media-libs/libpng:0=
                sys-libs/zlib:=
        )
        zlib? ( sys-libs/zlib:= )"
@@ -104,7 +104,8 @@ src_configure() {
 
        # configure is a hand-written bash-script, so econf will not work.
        # It's all built as C++, upstream uses CFLAGS internally.
-       CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || 
die
+       CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+       ./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -120,10 +121,6 @@ src_install() {
        rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-       xdg_pkg_preinst
-}
-
 pkg_postinst() {
        xdg_pkg_postinst
 
@@ -177,7 +174,3 @@ pkg_postinst() {
                fi
        fi
 }
-
-pkg_postrm() {
-       xdg_pkg_postrm
-}