[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/files/, games-arcade/xbill/
commit: a5df7a6bd538972de65e8c1332bab7b11a27909d
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Dec 19 06:45:50 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Dec 19 07:11:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5df7a6b
games-arcade/xbill: drop 2.1-r5
Signed-off-by: Ionen Wolkens 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
+#include
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..
--- 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.0 +0100
-+++ b/configure.in 2007-12-05 22:54:57.0 +0100
-@@ -88,12 +88,11 @@
- [ --enable-gtkbuild 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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/
commit: fc57dad5a13a2bc2d5c7d6e08a5e0adc207982ff
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Dec 19 06:47:14 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Dec 19 07:11:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc57dad5
games-arcade/xbill: minor ebuild tidying
Notably in->ac, unnecessary since this was bumped
to EAPI=8 (the rest is just style).
Signed-off-by: Ionen Wolkens gentoo.org>
games-arcade/xbill/xbill-2.1-r6.ebuild | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild
b/games-arcade/xbill/xbill-2.1-r6.ebuild
index fdff9e03b315..edeebb7b82a1 100644
--- a/games-arcade/xbill/xbill-2.1-r6.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r6.ebuild
@@ -5,21 +5,20 @@ EAPI=8
inherit autotools desktop
-DESCRIPTION="A game about an evil hacker called Bill!"
+DESCRIPTION="Game about an evil hacker called Bill!"
HOMEPAGE="http://www.xbill.org/;
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz
+SRC_URI="
+ http://www.xbill.org/download/${P}.tar.gz
https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png;
LICENSE="GPL-1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
RDEPEND="
acct-group/gamestat
media-fonts/font-misc-misc
- x11-libs/libXaw
-"
+ x11-libs/libXaw"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
@@ -30,19 +29,23 @@ PATCHES=(
src_prepare() {
default
- mv configure.in configure.ac || die
+
eautoreconf
}
src_configure() {
- econf \
- --disable-motif \
- --disable-gtk \
+ local econfargs=(
+ --disable-motif
+ --disable-gtk
--enable-athena
+ )
+
+ econf "${econfargs[@]}"
}
src_install() {
default
+
doicon "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN} XBill ${PN}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/
commit: 86efe7371ca63fc4655a1dc9caa4bccdbbec1d83
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Nov 20 11:03:15 2022 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Nov 20 11:08:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86efe737
games-arcade/xbill: Disable gtk2 gui
As it is EOL for a long time, use Athena as most distros are doing. Also use
an icon with higher resolution.
Signed-off-by: Pacho Ramos gentoo.org>
games-arcade/xbill/Manifest| 1 +
games-arcade/xbill/xbill-2.1-r6.ebuild | 51 ++
2 files changed, 52 insertions(+)
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index b1b8dba1c1fb..2de057050fc8 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1 +1,2 @@
DIST xbill-2.1.tar.gz 77610 BLAKE2B
aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9
SHA512
127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
+DIST xbill.png 49325 BLAKE2B
a2b5cacee2f5aaf62bcea941dbde26c4cf17ef29c0018ecbd66aefb64e6d1240ac756a32b84d631e4675774b7a06d7c56756debe80df8252684181e0e638a9a0
SHA512
cb41e8603f400cf7b4f8fde2739e798872cefd6e45ff0ff17ddf1f02958f572195022adcdc7ac308cb4236fb79ff68433673cfbaefaf5ccdb426d6070f39e854
diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild
b/games-arcade/xbill/xbill-2.1-r6.ebuild
new file mode 100644
index ..e17560bf50eb
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+ https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png;
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ acct-group/gamestat
+ media-fonts/font-misc-misc
+ x11-libs/libXaw
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-motif \
+ --disable-gtk \
+ --enable-athena
+}
+
+src_install() {
+ default
+ doicon ${DISTDIR}/${PN}.png
+ make_desktop_entry ${PN} XBill ${PN}
+
+ fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
+ fperms 664 /var/lib/xbill/scores
+}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/
commit: 503f91f1a20cf2ac4c4f16f875cd07d8080cbfff
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Nov 20 11:07:17 2022 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Nov 20 11:08:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503f91f1
games-arcade/xbill: fix quotes
Signed-off-by: Pacho Ramos gentoo.org>
games-arcade/xbill/xbill-2.1-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild
b/games-arcade/xbill/xbill-2.1-r6.ebuild
index e17560bf50eb..fdff9e03b315 100644
--- a/games-arcade/xbill/xbill-2.1-r6.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r6.ebuild
@@ -43,7 +43,7 @@ src_configure() {
src_install() {
default
- doicon ${DISTDIR}/${PN}.png
+ doicon "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN} XBill ${PN}
fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/, games-arcade/xbill/files/
commit: 97005ea03343f6c8f21db00712f8fe7f9288a53d
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Nov 4 01:38:12 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Nov 4 01:46:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97005ea0
games-arcade/xbill: fix build w/ upcoming clang16
Closes: https://bugs.gentoo.org/874624
Signed-off-by: Ionen Wolkens gentoo.org>
games-arcade/xbill/files/xbill-2.1-clang16.patch | 44 ++
.../{xbill-2.1-r4.ebuild => xbill-2.1-r5.ebuild} | 3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/games-arcade/xbill/files/xbill-2.1-clang16.patch
b/games-arcade/xbill/files/xbill-2.1-clang16.patch
new file mode 100644
index ..ee31ec657e4e
--- /dev/null
+++ b/games-arcade/xbill/files/xbill-2.1-clang16.patch
@@ -0,0 +1,44 @@
+Drop -I. to prevent from including ./strings.h
+https://bugs.gentoo.org/874624
+--- a/Bucket.c
b/Bucket.c
+@@ -1,2 +1,2 @@
+-#include
++#include "util.h"
+
+--- a/Game.c
b/Game.c
+@@ -4,2 +4,3 @@
+ #include
++#include
+ #include
+--- a/Makefile.in
b/Makefile.in
+@@ -22,3 +22,3 @@
+
+-ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(srcdir)
++ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS)
+ ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS)
+--- a/UI.c
b/UI.c
+@@ -3,2 +3,3 @@
+ #include
++#include
+
+--- 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/xbill-2.1-r4.ebuild
b/games-arcade/xbill/xbill-2.1-r5.ebuild
similarity index 92%
rename from games-arcade/xbill/xbill-2.1-r4.ebuild
rename to games-arcade/xbill/xbill-2.1-r5.ebuild
index cbd5ae78dd07..2f21efed00bd 100644
--- a/games-arcade/xbill/xbill-2.1-r4.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gtk2.patch
"${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/
commit: 2c81abb29b6dd6d708c4d568cad2146da3422d5a
Author: Sam James gentoo org>
AuthorDate: Mon Aug 23 04:14:06 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 23 05:05:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c81abb2
games-arcade/xbill: fix group of binary
Closes: https://bugs.gentoo.org/809353
Signed-off-by: Sam James gentoo.org>
games-arcade/xbill/{xbill-2.1-r3.ebuild => xbill-2.1-r4.ebuild} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-arcade/xbill/xbill-2.1-r3.ebuild
b/games-arcade/xbill/xbill-2.1-r4.ebuild
similarity index 90%
rename from games-arcade/xbill/xbill-2.1-r3.ebuild
rename to games-arcade/xbill/xbill-2.1-r4.ebuild
index 70378b00ceb..cbd5ae78dd0 100644
--- a/games-arcade/xbill/xbill-2.1-r3.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -43,6 +43,7 @@ src_install() {
default
newicon pixmaps/icon.xpm ${PN}.xpm
make_desktop_entry ${PN} XBill ${PN}
- fowners :gamestat /var/lib/xbill/scores
+
+ fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
fperms 664 /var/lib/xbill/scores
}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbill/files/, games-arcade/xbill/
commit: 32c743a4df5a0b11915e3dfd92f55dd4850ef89e
Author: Stefan Strogin gentoo org>
AuthorDate: Thu Aug 29 22:07:10 2019 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu Aug 29 22:13:34 2019 +
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 hacktivis.me>
Closes: https://bugs.gentoo.org/692318
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin 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.0 +0100
-+++ configure.in 2007-12-05 22:54:57.0 +0100
+--- a/configure.in 2007-12-05 22:37:57.0 +0100
b/configure.in 2007-12-05 22:54:57.0 +0100
@@ -88,12 +88,11 @@
[ --enable-gtkbuild 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
}
