| 1 |
commit: 3e2ca41ffacb5f43b59edfcb83e3aaa35d98963d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 21 18:18:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 21 22:31:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2ca41f |
| 7 |
|
| 8 |
games-arcade/slimevolley: EAPI-7 bump, drop insignificant USE |
| 9 |
|
| 10 |
sdl-net is nowhere else optional, it is super small, it does not warrant |
| 11 |
a patch just to fix a related cmake warning. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/678508 |
| 14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
games-arcade/slimevolley/metadata.xml | 11 +++----- |
| 18 |
.../slimevolley/slimevolley-2.4.2-r1.ebuild | 29 +++++++++++----------- |
| 19 |
2 files changed, 19 insertions(+), 21 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-arcade/slimevolley/metadata.xml b/games-arcade/slimevolley/metadata.xml |
| 22 |
index 668a9c26147..26079e608be 100644 |
| 23 |
--- a/games-arcade/slimevolley/metadata.xml |
| 24 |
+++ b/games-arcade/slimevolley/metadata.xml |
| 25 |
@@ -1,11 +1,8 @@ |
| 26 |
<?xml version="1.0" encoding="UTF-8"?> |
| 27 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 28 |
<pkgmetadata> |
| 29 |
-<maintainer type="project"> |
| 30 |
-<email>games@g.o</email> |
| 31 |
-<name>Gentoo Games Project</name> |
| 32 |
-</maintainer> |
| 33 |
-<use> |
| 34 |
-<flag name="net">Enable network support</flag> |
| 35 |
-</use> |
| 36 |
+ <maintainer type="project"> |
| 37 |
+ <email>games@g.o</email> |
| 38 |
+ <name>Gentoo Games Project</name> |
| 39 |
+ </maintainer> |
| 40 |
</pkgmetadata> |
| 41 |
|
| 42 |
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild |
| 43 |
index e4a8fe67dfa..8b9cc92724b 100644 |
| 44 |
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild |
| 45 |
+++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild |
| 46 |
@@ -1,7 +1,8 @@ |
| 47 |
-# Copyright 1999-2018 Gentoo Foundation |
| 48 |
+# Copyright 1999-2019 Gentoo Authors |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
-EAPI=6 |
| 52 |
+EAPI=7 |
| 53 |
+ |
| 54 |
inherit cmake-utils |
| 55 |
|
| 56 |
DESCRIPTION="A simple volleyball game" |
| 57 |
@@ -11,20 +12,21 @@ SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2" |
| 58 |
LICENSE="GPL-3" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~amd64 ~x86" |
| 61 |
-IUSE="net" |
| 62 |
+IUSE="" |
| 63 |
|
| 64 |
-RDEPEND=" |
| 65 |
+BDEPEND=" |
| 66 |
+ sys-devel/gettext |
| 67 |
+" |
| 68 |
+DEPEND=" |
| 69 |
media-libs/libsdl[X,sound,video] |
| 70 |
- media-libs/sdl-ttf |
| 71 |
media-libs/sdl-image[png] |
| 72 |
- net? ( media-libs/sdl-net ) |
| 73 |
+ media-libs/sdl-net |
| 74 |
+ media-libs/sdl-ttf |
| 75 |
virtual/libintl |
| 76 |
" |
| 77 |
-DEPEND="${RDEPEND} |
| 78 |
- sys-devel/gettext |
| 79 |
-" |
| 80 |
+RDEPEND="${DEPEND}" |
| 81 |
|
| 82 |
-DOCS="docs/README docs/TODO" |
| 83 |
+DOCS=( docs/{README,TODO} ) |
| 84 |
|
| 85 |
PATCHES=( |
| 86 |
"${FILESDIR}"/${P}-nodatalocal.patch |
| 87 |
@@ -35,10 +37,9 @@ S="${WORKDIR}/${PN}" |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
local mycmakeargs=( |
| 91 |
- "-DCMAKE_VERBOSE_MAKEFILE=TRUE" |
| 92 |
- "-DCMAKE_INSTALL_PREFIX=/usr" |
| 93 |
- "-DDATA_DIR=/usr/share/slimevolley" |
| 94 |
- $(use net && echo "-DNO_NET=0" || echo "-DNO_NET=1") |
| 95 |
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE |
| 96 |
+ -DCMAKE_INSTALL_PREFIX=/usr |
| 97 |
+ -DDATA_DIR=/usr/share/slimevolley |
| 98 |
) |
| 99 |
cmake-utils_src_configure |
| 100 |
} |
Archives