gentoo auto-resync : 19:12:2022 - 13:48:25

5 files changed, 14 insertions, 98 deletions

diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index d7219128052c..c26658f2c075 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,8 +1,6 @@
-AUX xbill-2.1-clang16.patch 1226 BLAKE2B cd2a7d2d341dee132ac0628bf3f4cb8f18101eba0b2f719f35827529cfa867e292e0315d920ad2d219c88b926dfa0ca2a35b3d1adb35a06fbba6b21319903c71 SHA512 f6fe72bb933927b95efa9c45ebf46819c8aa4cc9c495b869fd48eba08e30218d90814fa3598e3ca1ede9d015def39ce8401c784ca82e834d0546e12069c8b36b
+AUX xbill-2.1-clang16.patch 539 BLAKE2B 4ebf521d807af14c1d3f64484eea237b9e2e46d19cc4bfc267439ead1e891983694b2611c6828438e91a668261d11b941a098d7f01c70de70ef83a510aaa568e SHA512 744aafb0ee88ba0cc96da189ea7e6f77f9908e54a107699cda51f13063e7c81e412ba2f1a2d5a7e684a488831b524a0544fbc0dedd546f9ade1ce2f6bbb4561f
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
-AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
 DIST xbill.png 49325 BLAKE2B a2b5cacee2f5aaf62bcea941dbde26c4cf17ef29c0018ecbd66aefb64e6d1240ac756a32b84d631e4675774b7a06d7c56756debe80df8252684181e0e638a9a0 SHA512 cb41e8603f400cf7b4f8fde2739e798872cefd6e45ff0ff17ddf1f02958f572195022adcdc7ac308cb4236fb79ff68433673cfbaefaf5ccdb426d6070f39e854
-EBUILD xbill-2.1-r5.ebuild 989 BLAKE2B 3b7ca5f87211d0d496f9e3eba719cf418dd012fe41a0388ddab1b8f2b4a2e09f5605cd8ef67e16af6b5f300c5effc286387be2b152378e164df3aaf2633020d8 SHA512 51f4a438867fab2b3f0f72520e73fbfbc171a088c166592644408d2cf5335a721f4da502abd3469a59782911468e69d8bc9caf4823fdc2c2f24d289ac38f941b
-EBUILD xbill-2.1-r6.ebuild 973 BLAKE2B 77dc37bc8c683e4f1c548ca6d9b18b0db9a94efd237faebb25ba8cd97429e62ca97eb907f4607157e7455153de92f46426b9f89620adf54ba593a51155b47bd1 SHA512 076f153fa5fc387cb149eb9c8b3e6bf3e62ea1aee67aeebec04e8a6963e3852aa5c92e98c6e9d479ccb3298ae4173872f1716347728fb746cf7776328c11f305
+EBUILD xbill-2.1-r6.ebuild 964 BLAKE2B 253819ff8492a9a434c5d6739bce0029f95f1285c809a65349f4d8f091ef3c8476582639133c87ec9ed93718c4b1bc8c6c4b020bcd24159ed8b7c55d03d58b89 SHA512 8d50f1fcd380c3f6748daf13fe0b31cf526080515491485b23039e1026a3df0fc1b7e14bcdc5fae71b8209040a6e1dd87ae0276951997192b2bbeeb710df5897
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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
-}
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}