| 1 |
commit: 32c743a4df5a0b11915e3dfd92f55dd4850ef89e |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 29 22:07:10 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 29 22:13:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c743a4 |
| 7 |
|
| 8 |
games-arcade/xbill: add missing dependency; EAPI=7 |
| 9 |
|
| 10 |
- Add media-fonts/font-misc-misc and acct-group/gamestat to RDEPEND. |
| 11 |
- mv configure.in configure.ac (see bug 426262). |
| 12 |
- QA issues (permissions of /var/lib/xbill/scores). |
| 13 |
|
| 14 |
Reported-by: Haelwenn Monnier <contact <AT> hacktivis.me> |
| 15 |
Closes: https://bugs.gentoo.org/692318 |
| 16 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 17 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 18 |
|
| 19 |
games-arcade/xbill/files/xbill-2.1-gtk2.patch | 4 +-- |
| 20 |
.../{xbill-2.1-r2.ebuild => xbill-2.1-r3.ebuild} | 30 ++++++++++++++-------- |
| 21 |
2 files changed, 21 insertions(+), 13 deletions(-) |
| 22 |
|
| 23 |
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch |
| 24 |
index 70817b09c7a..829475badd7 100644 |
| 25 |
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch |
| 26 |
+++ b/games-arcade/xbill/files/xbill-2.1-gtk2.patch |
| 27 |
@@ -1,5 +1,5 @@ |
| 28 |
---- configure.in.old 2007-12-05 22:37:57.000000000 +0100 |
| 29 |
-+++ configure.in 2007-12-05 22:54:57.000000000 +0100 |
| 30 |
+--- a/configure.in 2007-12-05 22:37:57.000000000 +0100 |
| 31 |
++++ b/configure.in 2007-12-05 22:54:57.000000000 +0100 |
| 32 |
@@ -88,12 +88,11 @@ |
| 33 |
[ --enable-gtk build with the GTK widget set]) |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild |
| 37 |
similarity index 56% |
| 38 |
rename from games-arcade/xbill/xbill-2.1-r2.ebuild |
| 39 |
rename to games-arcade/xbill/xbill-2.1-r3.ebuild |
| 40 |
index 1152f2caca3..70378b00ceb 100644 |
| 41 |
--- a/games-arcade/xbill/xbill-2.1-r2.ebuild |
| 42 |
+++ b/games-arcade/xbill/xbill-2.1-r3.ebuild |
| 43 |
@@ -1,8 +1,9 @@ |
| 44 |
-# Copyright 1999-2015 Gentoo Foundation |
| 45 |
+# Copyright 1999-2019 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
-EAPI=5 |
| 49 |
-inherit eutils autotools games |
| 50 |
+EAPI=7 |
| 51 |
+ |
| 52 |
+inherit autotools desktop |
| 53 |
|
| 54 |
DESCRIPTION="A game about an evil hacker called Bill!" |
| 55 |
HOMEPAGE="http://www.xbill.org/" |
| 56 |
@@ -13,20 +14,26 @@ SLOT="0" |
| 57 |
KEYWORDS="~alpha ~amd64 ~x86" |
| 58 |
IUSE="gtk" |
| 59 |
|
| 60 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 61 |
+RDEPEND="acct-group/gamestat |
| 62 |
+ media-fonts/font-misc-misc |
| 63 |
+ gtk? ( x11-libs/gtk+:2 ) |
| 64 |
!gtk? ( x11-libs/libXaw )" |
| 65 |
-DEPEND="${RDEPEND} |
| 66 |
- virtual/pkgconfig" |
| 67 |
+DEPEND="${RDEPEND}" |
| 68 |
+BDEPEND="virtual/pkgconfig" |
| 69 |
+ |
| 70 |
+PATCHES=( |
| 71 |
+ "${FILESDIR}"/${P}-gtk2.patch |
| 72 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 73 |
+) |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- epatch \ |
| 77 |
- "${FILESDIR}"/${P}-gtk2.patch \ |
| 78 |
- "${FILESDIR}"/${P}-gentoo.patch |
| 79 |
+ default |
| 80 |
+ mv configure.in configure.ac || die |
| 81 |
eautoreconf |
| 82 |
} |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
- egamesconf \ |
| 86 |
+ econf \ |
| 87 |
--disable-motif \ |
| 88 |
$(use_enable gtk) \ |
| 89 |
$(use_enable !gtk athena) |
| 90 |
@@ -36,5 +43,6 @@ src_install() { |
| 91 |
default |
| 92 |
newicon pixmaps/icon.xpm ${PN}.xpm |
| 93 |
make_desktop_entry ${PN} XBill ${PN} |
| 94 |
- prepgamesdirs |
| 95 |
+ fowners :gamestat /var/lib/xbill/scores |
| 96 |
+ fperms 664 /var/lib/xbill/scores |
| 97 |
} |
Archives