Version bump

Package-Manager: portage-2.1.2.4

6 files changed, 25 insertions, 48 deletions

diff --git a/app-emulation/vice/files/digest-vice-1.17 b/app-emulation/vice/files/digest-vice-1.17
deleted file mode 100644
index b9a25cfd21cc..000000000000
--- a/app-emulation/vice/files/digest-vice-1.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a3b70d5fcef0b345599b6d452401e18e vice-1.17.tar.gz 4412711
-RMD160 ec73b69ee9bad49d10f7b6047082d24cc4f37009 vice-1.17.tar.gz 4412711
-SHA256 cb7bed2e200ea53d207a627f7d758c6daffe0461edf7ceb9654d1f3363c53a1d vice-1.17.tar.gz 4412711
diff --git a/app-emulation/vice/files/digest-vice-1.19 b/app-emulation/vice/files/digest-vice-1.19
deleted file mode 100644
index 013680847651..000000000000
--- a/app-emulation/vice/files/digest-vice-1.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 92f828f29e05f57d7a498a861d3dab6a vice-1.19.tar.gz 4796181
-RMD160 d0a62750c30e3cf8645117a8e8536a8061c260ea vice-1.19.tar.gz 4796181
-SHA256 faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e vice-1.19.tar.gz 4796181
diff --git a/app-emulation/vice/files/digest-vice-1.20 b/app-emulation/vice/files/digest-vice-1.20
deleted file mode 100644
index 469a839e49f9..000000000000
--- a/app-emulation/vice/files/digest-vice-1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d02fe05f0f9e839820105cdf51da6b4e vice-1.20.tar.gz 5183757
-RMD160 b4f7a50257cbdd6338d4e685760e99c07ad14adb vice-1.20.tar.gz 5183757
-SHA256 be32aabeb9073c25532e6df796e782a2949c464dcccb1648ad0db27fef6fd177 vice-1.20.tar.gz 5183757
diff --git a/app-emulation/vice/files/digest-vice-1.21 b/app-emulation/vice/files/digest-vice-1.21
new file mode 100644
index 000000000000..0c87a06f1327
--- /dev/null
+++ b/app-emulation/vice/files/digest-vice-1.21
@@ -0,0 +1,3 @@
+MD5 913bdee9d59d154ed33ef4e037d8a12c vice-1.21.tar.gz 5725833
+RMD160 1384cb4d80be6801de603c0424b3a5e5dd18de15 vice-1.21.tar.gz 5725833
+SHA256 511ed35e6692f68e8b58ea3d040af6428239859e31eef9d99b6187a166373389 vice-1.21.tar.gz 5725833
diff --git a/app-emulation/vice/files/vice-1.19-64bitfix.patch b/app-emulation/vice/files/vice-1.19-64bitfix.patch
deleted file mode 100644
index 5961b8eea2ae..000000000000
--- a/app-emulation/vice/files/vice-1.19-64bitfix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- vice-1.18/src/gfxoutputdrv/ffmpeg/common.h.unpatched	2005-12-25 11:57:38.000000000 +0100
-+++ vice-1.18/src/gfxoutputdrv/ffmpeg/common.h	2005-12-25 12:01:47.000000000 +0100
-@@ -18,6 +18,10 @@
- //#define A32_BITSTREAM_READER
- #define LIBMPEG2_BITSTREAM_READER_HACK //add BERO
- 
-+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES)
-+#    define EMULATE_INTTYPES
-+#endif
-+
- #ifndef M_PI
- #define M_PI    3.14159265358979323846
- #endif
-@@ -93,7 +97,6 @@
- #endif
- #endif
- 
--#define EMULATE_INTTYPES
- #ifndef EMULATE_INTTYPES
- #   include <inttypes.h>
- #else
-@@ -255,7 +258,7 @@
- 
- extern const uint32_t inverse[256];
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- #    define FASTDIV(a,b) \
-     ({\
-         int ret,dmy;\
-@@ -1219,7 +1222,7 @@
- #define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
- 
- 
--#ifdef ARCH_X86
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- #define MASK_ABS(mask, level)\
-             asm volatile(\
- 		"cdq			\n\t"\
diff --git a/app-emulation/vice/files/vice-1.21-uicolor.patch b/app-emulation/vice/files/vice-1.21-uicolor.patch
new file mode 100644
index 000000000000..7eebf08d185a
--- /dev/null
+++ b/app-emulation/vice/files/vice-1.21-uicolor.patch
@@ -0,0 +1,22 @@
+--- src/arch/unix/x11/gnome/uicolor.c
++++ src/arch/unix/x11/gnome/uicolor.c
+@@ -166,7 +166,7 @@
+        way to do this? //tvr */
+     im = XCreateImage(display, GDK_VISUAL_XVISUAL(visual),
+                       x11ui_get_display_depth(),
+-                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
++                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
+     if (!im) {
+         log_error(LOG_DEFAULT, _("XCreateImage failed."));
+         free(data);
+--- src/arch/unix/x11/xaw/uicolor.c
++++ src/arch/unix/x11/xaw/uicolor.c
+@@ -121,7 +121,7 @@
+     /* This is a kludge to map pixels to zimage values. Is there a better
+        way to do this? //tvr */
+     im = XCreateImage(display, visual, x11ui_get_display_depth(),
+-                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
++                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
+     if (!im) {
+         log_error(LOG_DEFAULT, _("XCreateImage failed."));
+         free(data);