summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-10-14 20:27:19 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-10-14 20:35:12 +0200
commit542e520bfe8cfc266b8899f50502fdb527ac4508 (patch)
treea067e9a372ecb7f8150a6c6cb497c94f1df2ff9a
parentgames-arcade/performous: EAPI-6 bump, QA: don't compress man (diff)
downloadgentoo-542e520bfe8cfc266b8899f50502fdb527ac4508.tar.gz
gentoo-542e520bfe8cfc266b8899f50502fdb527ac4508.tar.bz2
gentoo-542e520bfe8cfc266b8899f50502fdb527ac4508.zip
games-engines/odamex: EAPI-6 bump, sort stuff
Drop superfluous pkg_pretend, pkg_preinst. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
-rw-r--r--games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch4
-rw-r--r--games-engines/odamex/odamex-0.7.0-r1.ebuild51
2 files changed, 24 insertions, 31 deletions
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
index 716a07fe628..377286220b1 100644
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -1,7 +1,7 @@
Index: common/i_net.cpp
===================================================================
---- common/i_net.cpp (revision 5459)
-+++ common/i_net.cpp (working copy)
+--- a/common/i_net.cpp (revision 5459)
++++ b/common/i_net.cpp (working copy)
@@ -151,7 +151,11 @@
Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
index 0d2e515d29d..78af4a724d7 100644
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 wxwidgets
MY_P=${PN}-src-${PV}
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="http://odamex.net/"
+DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
+HOMEPAGE="https://odamex.net/"
SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +odalaunch master portmidi server"
+IUSE="dedicated master +odalaunch portmidi server"
RDEPEND="
dedicated? ( >=net-libs/miniupnpc-1.8:0= )
@@ -35,23 +36,19 @@ DOC_CONTENTS="
S="${WORKDIR}/src-${PV:2:3}"
-pkg_pretend() {
- if ! test-flag-CXX -std=c++11; then
- die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
- fi
-}
+PATCHES=(
+ "${FILESDIR}"/1-${P}-install-rules.patch
+ "${FILESDIR}"/2-${P}-cmake-options.patch
+ "${FILESDIR}"/3-${P}-wad-search-path.patch
+ "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch
+ "${FILESDIR}"/${P}-miniupnpc.patch
+ "${FILESDIR}"/${P}-miniupnpc20.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/1-${P}-install-rules.patch \
- "${FILESDIR}"/2-${P}-cmake-options.patch \
- "${FILESDIR}"/3-${P}-wad-search-path.patch \
- "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \
- "${FILESDIR}"/${P}-miniupnpc.patch \
- "${FILESDIR}"/${P}-miniupnpc20.patch \
- "${FILESDIR}"/${P}-gcc6.patch
-
- rm -r libraries/libminiupnpc || die
cmake-utils_src_prepare
+ rm -r libraries/libminiupnpc || die
}
src_configure() {
@@ -59,22 +56,22 @@ src_configure() {
-DUSE_INTREE_PORTMIDI=OFF
-DCMAKE_INSTALL_BINDIR="/usr/bin"
-DCMAKE_INSTALL_DATADIR="/usr/share"
- $(cmake-utils_use_build master MASTER)
+ -DBUILD_MASTER=$(usex master)
)
if use dedicated ; then
mycmakeargs+=(
-DBUILD_CLIENT=OFF
-DBUILD_ODALAUNCH=OFF
- -DBUILD_SERVER=ON
-DENABLE_PORTMIDI=OFF
+ -DBUILD_SERVER=ON
)
else
mycmakeargs+=(
-DBUILD_CLIENT=ON
- $(cmake-utils_use_build odalaunch ODALAUNCH)
- $(cmake-utils_use_build server SERVER)
- $(cmake-utils_use_enable portmidi PORTMIDI)
+ -DBUILD_ODALAUNCH=$(usex odalaunch)
+ -DENABLE_PORTMIDI=$(usex portmidi)
+ -DBUILD_SERVER=$(usex server)
)
fi
@@ -102,10 +99,6 @@ src_install() {
fi
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
gnome2_icon_cache_update
readme.gentoo_print_elog