* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/files/, games-arcade/xbill/
@ 2019-08-29 22:15 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2019-08-29 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 32c743a4df5a0b11915e3dfd92f55dd4850ef89e
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 22:07:10 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 22:13:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c743a4
games-arcade/xbill: add missing dependency; EAPI=7
- Add media-fonts/font-misc-misc and acct-group/gamestat to RDEPEND.
- mv configure.in configure.ac (see bug 426262).
- QA issues (permissions of /var/lib/xbill/scores).
Reported-by: Haelwenn Monnier <contact <AT> hacktivis.me>
Closes: https://bugs.gentoo.org/692318
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-arcade/xbill/files/xbill-2.1-gtk2.patch | 4 +--
.../{xbill-2.1-r2.ebuild => xbill-2.1-r3.ebuild} | 30 ++++++++++++++--------
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
index 70817b09c7a..829475badd7 100644
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch
+++ b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
@@ -1,5 +1,5 @@
---- configure.in.old 2007-12-05 22:37:57.000000000 +0100
-+++ configure.in 2007-12-05 22:54:57.000000000 +0100
+--- a/configure.in 2007-12-05 22:37:57.000000000 +0100
++++ b/configure.in 2007-12-05 22:54:57.000000000 +0100
@@ -88,12 +88,11 @@
[ --enable-gtk build with the GTK widget set])
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild
similarity index 56%
rename from games-arcade/xbill/xbill-2.1-r2.ebuild
rename to games-arcade/xbill/xbill-2.1-r3.ebuild
index 1152f2caca3..70378b00ceb 100644
--- a/games-arcade/xbill/xbill-2.1-r2.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils autotools games
+EAPI=7
+
+inherit autotools desktop
DESCRIPTION="A game about an evil hacker called Bill!"
HOMEPAGE="http://www.xbill.org/"
@@ -13,20 +14,26 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
IUSE="gtk"
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+RDEPEND="acct-group/gamestat
+ media-fonts/font-misc-misc
+ gtk? ( x11-libs/gtk+:2 )
!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gtk2.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gtk2.patch \
- "${FILESDIR}"/${P}-gentoo.patch
+ default
+ mv configure.in configure.ac || die
eautoreconf
}
src_configure() {
- egamesconf \
+ econf \
--disable-motif \
$(use_enable gtk) \
$(use_enable !gtk athena)
@@ -36,5 +43,6 @@ src_install() {
default
newicon pixmaps/icon.xpm ${PN}.xpm
make_desktop_entry ${PN} XBill ${PN}
- prepgamesdirs
+ fowners :gamestat /var/lib/xbill/scores
+ fperms 664 /var/lib/xbill/scores
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/files/, games-arcade/xbill/
@ 2022-12-19 7:23 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-12-19 7:23 UTC (permalink / raw
To: gentoo-commits
commit: a5df7a6bd538972de65e8c1332bab7b11a27909d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 06:45:50 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 07:11:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5df7a6b
games-arcade/xbill: drop 2.1-r5
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-arcade/xbill/files/xbill-2.1-clang16.patch | 17 --------
games-arcade/xbill/files/xbill-2.1-gtk2.patch | 18 ---------
games-arcade/xbill/xbill-2.1-r5.ebuild | 50 ------------------------
3 files changed, 85 deletions(-)
diff --git a/games-arcade/xbill/files/xbill-2.1-clang16.patch b/games-arcade/xbill/files/xbill-2.1-clang16.patch
index ee31ec657e4e..524fdde63ae4 100644
--- a/games-arcade/xbill/files/xbill-2.1-clang16.patch
+++ b/games-arcade/xbill/files/xbill-2.1-clang16.patch
@@ -25,20 +25,3 @@ https://bugs.gentoo.org/874624
#include <string.h>
+#include <strings.h>
---- a/gtk.c
-+++ b/gtk.c
-@@ -370,3 +370,3 @@
- gtk_signal_connect_object(GTK_OBJECT(menu_item), "activate",
-- gtk_ui_popup_dialog, (gpointer) dialog);
-+ GTK_SIGNAL_FUNC(gtk_ui_popup_dialog), (gpointer) dialog);
- return (menu_item);
-@@ -592,3 +592,3 @@
- CreateDialog(DIALOG_PAUSEGAME, 0, icon, "Continue", NULL);
-- CreateEnterText(DIALOG_WARPLEVEL, warp_apply);
-+ CreateEnterText(DIALOG_WARPLEVEL, GTK_SIGNAL_FUNC(warp_apply));
- CreateDialog(DIALOG_HIGHSCORE, 0, NULL, NULL, NULL);
-@@ -602,3 +602,3 @@
- CreateDialog(DIALOG_ENDGAME, 0, NULL, "Nuts!", NULL);
-- CreateEnterText(DIALOG_ENTERNAME, enter_name);
-+ CreateEnterText(DIALOG_ENTERNAME, GTK_SIGNAL_FUNC(enter_name));
- }
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
deleted file mode 100644
index 829475badd72..000000000000
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.in 2007-12-05 22:37:57.000000000 +0100
-+++ b/configure.in 2007-12-05 22:54:57.000000000 +0100
-@@ -88,12 +88,11 @@
- [ --enable-gtk build with the GTK widget set])
-
- if test "$enable_gtk" != "no"; then
-- AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
-+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
-
-- if test "X$GTKCONFIG" = X"yes"; then
-+ if test $pkg_failed = no; then
- AC_DEFINE(USE_GTK)
-- GTK_CFLAGS="`gtk-config --cflags`"
-- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
-+ WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
- WIDGET_OBJS="$WIDGET_OBJS gtk.o"
- fi
- fi
diff --git a/games-arcade/xbill/xbill-2.1-r5.ebuild b/games-arcade/xbill/xbill-2.1-r5.ebuild
deleted file mode 100644
index 2f21efed00bd..000000000000
--- a/games-arcade/xbill/xbill-2.1-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="acct-group/gamestat
- media-fonts/font-misc-misc
- gtk? ( x11-libs/gtk+:2 )
- !gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gtk2.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-clang16.patch
-)
-
-src_prepare() {
- default
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-motif \
- $(use_enable gtk) \
- $(use_enable !gtk athena)
-}
-
-src_install() {
- default
- newicon pixmaps/icon.xpm ${PN}.xpm
- make_desktop_entry ${PN} XBill ${PN}
-
- fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
- fperms 664 /var/lib/xbill/scores
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-19 7:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-29 22:15 [gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/files/, games-arcade/xbill/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 7:23 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox