version bump; clean old

Package-Manager: portage-2.2.20.1

6 files changed, 10 insertions, 49 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index bb31cd05de86..7c68c7487007 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,2 @@
-DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
+DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823
diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch b/app-emulation/vice/files/vice-2.4.20-format.patch
deleted file mode 100644
index 1c782fd61e5d..000000000000
--- a/app-emulation/vice/files/vice-2.4.20-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c.old	2015-10-19 17:25:07.549164652 +0200
-+++ src/main.c	2015-10-19 17:25:33.106694706 +0200
-@@ -227,7 +227,7 @@
-     for (i = 0; core_team[i].name; i++) {

-         n += strlen(core_team[i].name);

-         if (n > 74) {

--            log_message(LOG_DEFAULT, tmp);

-+            log_message(LOG_DEFAULT, "%s", tmp);

-             n = 0; *tmp = 0;

-         }

-         strcat(tmp, core_team[i].name);

-@@ -235,7 +235,7 @@
-             strcat(tmp, ", ");

-         } else {

-             strcat(tmp, ".");

--            log_message(LOG_DEFAULT, tmp);

-+            log_message(LOG_DEFAULT, "%s", tmp);

-         }

-     }

-     lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
deleted file mode 100644
index 357d68666511..000000000000
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-@@ -102,9 +102,10 @@
- #include "ui-threads.h"
- #endif
- 
--#ifdef USE_XF86_EXTENSIONS
-+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
- #include <gdk/gdkx.h>
- #endif
-+
- #include "x11ui.h"
- 
- #ifdef DEBUG_X11UI
-
diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.22-autotools.patch
index 7bebd2800ef6..7bebd2800ef6 100644
--- a/app-emulation/vice/files/vice-2.4.20-autotools.patch
+++ b/app-emulation/vice/files/vice-2.4.22-autotools.patch
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 9364cf9ad61e..242aab2676de 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,7 +5,6 @@
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
 		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
-		<flag name="gtk2">Use GTK+2 for GUI instead of GTK+3</flag>
 		<flag name="memmap">Enable extra monitor features</flag>
 		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
 		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.22.ebuild
index 1ee7dc6d33dd..407949c7522a 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.
 #REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk2 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
 
 GTK_COMMON="
 	x11-libs/pango
@@ -53,13 +53,13 @@ RDEPEND="
 		x11-libs/libXext
 		sys-libs/readline
 	)
-	gtk2? (
+	gtk? (
 		x11-libs/gtk+:2
 		vte? ( x11-libs/vte:0 )
 		x11-libs/gtkglext
 		${GTK_COMMON}
 	)
-	!sdl? ( !gtk2? (
+	!sdl? ( !gtk? (
 		x11-libs/libXmu
 		x11-libs/libXpm
 		x11-libs/libXt
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sdl? (
 		fullscreen? ( x11-proto/xf86vidmodeproto )
-		!gtk2? (
+		!gtk? (
 			x11-libs/libICE
 			x11-libs/libSM
 		)
@@ -86,10 +86,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-xf86extensions.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
 	sed -i \
 		-e 's/building//' \
 		doc/Makefile.am || die
@@ -132,10 +129,10 @@ src_configure() {
 	# The gtk UI code has raw calls to XOpenDisplay and
 	# is missing -lX11 if vte doesn't pull it in.
 	#if use gtk2 || use gtk3 ; then
-	if use gtk2 ; then
+	if use gtk ; then
 		use vte || append-libs -lX11
 	fi
-	gui_arg+=" $(use_enable gtk2 gnomeui)"
+	gui_arg+=" $(use_enable gtk gnomeui)"
 	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
 	gui_arg+=" $(use_enable Xaw3d xaw3d)"