commit: 3e2ca41ffacb5f43b59edfcb83e3aaa35d98963d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 21 18:18:59 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 21 22:31:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2ca41f
games-arcade/slimevolley: EAPI-7 bump, drop insignificant USE sdl-net is nowhere else optional, it is super small, it does not warrant a patch just to fix a related cmake warning. Closes: https://bugs.gentoo.org/678508 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-arcade/slimevolley/metadata.xml | 11 +++----- .../slimevolley/slimevolley-2.4.2-r1.ebuild | 29 +++++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/games-arcade/slimevolley/metadata.xml b/games-arcade/slimevolley/metadata.xml index 668a9c26147..26079e608be 100644 --- a/games-arcade/slimevolley/metadata.xml +++ b/games-arcade/slimevolley/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> -<email>[email protected]</email> -<name>Gentoo Games Project</name> -</maintainer> -<use> -<flag name="net">Enable network support</flag> -</use> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Games Project</name> + </maintainer> </pkgmetadata> diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild index e4a8fe67dfa..8b9cc92724b 100644 --- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild +++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild @@ -1,7 +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 +EAPI=7 + inherit cmake-utils DESCRIPTION="A simple volleyball game" @@ -11,20 +12,21 @@ SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"; LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="net" +IUSE="" -RDEPEND=" +BDEPEND=" + sys-devel/gettext +" +DEPEND=" media-libs/libsdl[X,sound,video] - media-libs/sdl-ttf media-libs/sdl-image[png] - net? ( media-libs/sdl-net ) + media-libs/sdl-net + media-libs/sdl-ttf virtual/libintl " -DEPEND="${RDEPEND} - sys-devel/gettext -" +RDEPEND="${DEPEND}" -DOCS="docs/README docs/TODO" +DOCS=( docs/{README,TODO} ) PATCHES=( "${FILESDIR}"/${P}-nodatalocal.patch @@ -35,10 +37,9 @@ S="${WORKDIR}/${PN}" src_configure() { local mycmakeargs=( - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DCMAKE_INSTALL_PREFIX=/usr" - "-DDATA_DIR=/usr/share/slimevolley" - $(use net && echo "-DNO_NET=0" || echo "-DNO_NET=1") + -DCMAKE_VERBOSE_MAKEFILE=TRUE + -DCMAKE_INSTALL_PREFIX=/usr + -DDATA_DIR=/usr/share/slimevolley ) cmake-utils_src_configure }
