gentoo resync : 06.12.2017

6 files changed, 3 insertions, 224 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 64812bb4acbf..104fdaa0aa57 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index 232de99b0a48..bf4482dc3466 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,4 +1,4 @@
 AUX mixer_app-1.8.0-build.patch 1018 BLAKE2B 612ba11eea272c120dfb499a9324c427612463c057ef4593010aa9bdd9799dab05d9052c6a4add45b780b423f0123b62c4c76bbd4721d495425b08b6652e6c8a SHA512 3d0146efd88070b803b14434c93baaa635f54f10324155cdfcf08555cac11f655d40b257bde6e25f83f04d96a63da66895d8460d4bc6b9211c1cb9956b199602
-DIST Mixer.app-1.8.0.tar.gz 37884 SHA256 223c08d91fd7930d6a97cea376b99fb0118cdea12406c7d62d17d38276b4dd15 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1 WHIRLPOOL 7e2002e276b89a530be595c1b84dadd7af3c4dce234c799bc8faa0d9d2d9447d86307fd5b963227e050abfc2849d4584eb258e6795877545130bd0e23be6158f
-EBUILD mixer_app-1.8.0.ebuild 686 BLAKE2B 8c65a71d3fcaef20ab3f2db78339df7781c2a67ad49903d3ba68b2b198294fea19faeecb4269e21dd53ccfeb9cc2b3c53b88aba7f72172e9655bfad1f5a6260b SHA512 ea53132616dbae214411afe7b830dddca09d2a60bbae5afba737aa840934b17d98ce849daff2bef8ff55617cce2196d14c808e6bd583b27aa13c35b8fa5bd853
+DIST Mixer.app-1.8.0.tar.gz 37884 BLAKE2B 53c44947e59fa2b4f975a70a33cae76c1f721f3408021ffdbaa37750f26b67e2dc71457b5b08e7b29ea60dbafe34ed3a6ba0c22d7414c8f3bd0c5186207f62f0 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1
+EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B c83d8bbdac2e17ccb52067d4b88b252c953d230cbf6831200b1265bfa54c51842bd01d5f36baf13c43bf3ae2c99aef750a74ca19980395afae62c07806010971 SHA512 5ffc5d61fb5086e97a7cac5abb42125961a6e9256bee86675f205a896d58da3ef4c6337b37c5816665b2dfb2d883cf9a520767e80f5d7f9616cfdc957fd0938d
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 256f6968c369..293a46855a05 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
@@ -8,7 +8,7 @@ MY_P=Mixer.app-${PV}
 
 DESCRIPTION="mixer_app has volume controllers that can be configured to handle sound sources"
 HOMEPAGE="http://www.fukt.bsnet.se/~per/mixer/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+SRC_URI="http://www.fukt.bsnet.se/~per/mixer/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index cb8975ae2730..9dbbb44c2b9e 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,8 +1,6 @@
 AUX xaos-3.4-include.patch 216 BLAKE2B c5ca3147c1ba7a6a45ee46673666d48aff359cd9a15f037534411c4420302d18dd037bae9c25927ac0f885148401a8afebecf465d706b3073d520946c18408f8 SHA512 d3ce4cc8a792ca22e63043d89a427cf46be2dd7e3427aefd364dacb7e721782ed8aefa7eee338fb658d5a2f13704eafbcd03e18ae589186d1c1718ff808337c3
 AUX xaos-3.4-png.patch 328 BLAKE2B 372470e5b7f7cc3bdf7975487088729476163b10e2dc9f57b78802bb4032affeab64c0634011067d8b1f3ded559ae68248c00a953f2d903365401181a546aeee SHA512 90ab707e2a6ad6fec1467afe7ed0f6cb44e5ac965eece94642966010b871fb7b7ef71745485869c7a94c4ddd73b176284a3b6a66866e9539f1dfe9b1934ef26b
 AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311aa357fc59e280632d85ccfdf803ff3a232ab878fcef638506030077561406ed1d1152c8b960cd4528e1a5e1b098b39f SHA512 f1732cc5116f92893fc9e560e293e86df10901655dd12a2e6e81a90b13c216a613c5be60bce7adfc99ee21f5a6208c4f30a6730d1d5d3963e5efcba6d728c481
-AUX xaos-3.5-gettext.patch 3853 BLAKE2B d4b48b6e91c3af9faa869aef6220b97b47cb846a339ffe95e0a11c9a756a3d5569741d4e831763df50d30c91ce8fdafd1e1e0b4a66fa42b67fb30bf3b2daafca SHA512 bd62bfe5c686a8baaf93aeaee96ad916c299168c19e061c9d50696fb6b34054fef9c34b980df57c373fcdba65ac93ce92cb17520443dccd048b0d59b3c319091
-AUX xaos-3.5-libpng15.patch 4260 BLAKE2B 3133332c2e49c533cde3f3bf93bec826c03baf190fb436d7a976a6d97b1b52de00c27243235cc861004f69855e7a0e9a3206fabf001dacb8a7b468570f4241d7 SHA512 38881e3fa2f03832db271988dcb0a6a1249bb8e99e1c1ed986686207e17bea56a99ee12b9d794c307fb6bb30c375252fe872957f427610d6df86c9414e1518e7
 AUX xaos-3.6-locale-dir.patch 346 BLAKE2B 9a025116efe60d643748e020bf0cc8801ccec96b46fb458b72fb1699cd37018f43645af311476c9dad5d91ff66acd8ca9df2407492436e814b7eb5708a3ba9af SHA512 c62b6c2b77bdb11bbd970f8f3d6ddc6844a86059918c7a54207a0e57bcd31e2f3feeb3c86f8ce58a3c9ee36939dbbe89ec5359d7fa0d5015dc6ad6cd8de24d6f
 AUX xaos-3.6-no-auto-strip.patch 1025 BLAKE2B 87256eb029905c6c9aed7080452c15677e0b98535252b1a6ddf344b7866980c27039c721ab711f462383ed4ecd7d07e55e122b34728822c289958ff0e812a9eb SHA512 6a89bb992e2e503576f18a069c6f67b42a92a3f88b958f4b8b54d6ffc309ff30914cbf36b73400449306cd2ce1f646e9745820206c0be5ca39d26bbc4e469c8c
 DIST xaos-3.6.tar.gz 2040707 SHA256 989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 WHIRLPOOL c860b2b16150ffd285a0617ba5f1fcd87d6840df47152258cb54c2ea78171574c96427a8ac2ad05cbe7c80c9dde36b290fe3d2681679bd0135df430873dd2d14
diff --git a/x11-misc/xaos/files/xaos-3.5-gettext.patch b/x11-misc/xaos/files/xaos-3.5-gettext.patch
deleted file mode 100644
index b83b24346cd8..000000000000
--- a/x11-misc/xaos/files/xaos-3.5-gettext.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ur xaos-3.5.orig/src/i18n/cs.po xaos-3.5/src/i18n/cs.po
---- xaos-3.5.orig/src/i18n/cs.po	2014-06-08 15:19:23.313803520 +0200
-+++ xaos-3.5/src/i18n/cs.po	2014-06-08 15:20:35.071009379 +0200
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2002-08-17 21:44+0200\n"
- "Last-Translator: MadSoft <madsoft@centrum.cz>\n"
- "Language-Team: Czech\n"
-+"Language: cs\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8-bit\n"
-diff -ur xaos-3.5.orig/src/i18n/de.po xaos-3.5/src/i18n/de.po
---- xaos-3.5.orig/src/i18n/de.po	2014-06-08 15:19:23.314803662 +0200
-+++ xaos-3.5/src/i18n/de.po	2014-06-08 15:20:59.684508120 +0200
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2008-04-27 21:48+0200\n"
- "Last-Translator: \n"
- "Language-Team:  <de@li.org>\n"
-+"Language: de\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff -ur xaos-3.5.orig/src/i18n/es.po xaos-3.5/src/i18n/es.po
---- xaos-3.5.orig/src/i18n/es.po	2014-06-08 15:19:23.314803662 +0200
-+++ xaos-3.5/src/i18n/es.po	2014-06-08 15:21:10.917104552 +0200
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2002-10-04 15:22+0200\n"
- "Last-Translator: César Pérez <oroz@users.sourceforge.net>\n"
- "Language-Team: Spanish <es@li.org>\n"
-+"Language: es\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8-bit\n"
-diff -ur xaos-3.5.orig/src/i18n/fr.po xaos-3.5/src/i18n/fr.po
---- xaos-3.5.orig/src/i18n/fr.po	2014-06-08 15:19:23.315803804 +0200
-+++ xaos-3.5/src/i18n/fr.po	2014-06-08 15:21:24.653056586 +0200
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2006-02-05 17:35+0200\n"
- "Last-Translator: Philippe Wautelet <traduc _at_ fractalzone _dot_ be>\n"
- "Language-Team: French\n"
-+"Language: fr\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8-bit\n"
-diff -ur xaos-3.5.orig/src/i18n/hu.po xaos-3.5/src/i18n/hu.po
---- xaos-3.5.orig/src/i18n/hu.po	2014-06-08 15:19:23.315803804 +0200
-+++ xaos-3.5/src/i18n/hu.po	2014-06-08 15:21:49.950651185 +0200
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2002-08-17 21:44+0200\n"
- "Last-Translator: Zoltan Kovacs <kovzol@math.u-szeged.hu>\n"
- "Language-Team: Hungarian\n"
-+"Language: hu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8-bit\n"
-diff -ur xaos-3.5.orig/src/i18n/it.po xaos-3.5/src/i18n/it.po
---- xaos-3.5.orig/src/i18n/it.po	2014-06-08 15:19:23.316803947 +0200
-+++ xaos-3.5/src/i18n/it.po	2014-06-08 15:22:00.324125022 +0200
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2008-04-08 10:10+0000\n"
- "Last-Translator: Sergio Zanchetta <Unknown>\n"
- "Language-Team: Italian <it@li.org>\n"
-+"Language: it\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff -ur xaos-3.5.orig/src/i18n/pt.po xaos-3.5/src/i18n/pt.po
---- xaos-3.5.orig/src/i18n/pt.po	2014-06-08 15:19:23.316803947 +0200
-+++ xaos-3.5/src/i18n/pt.po	2014-06-08 15:22:12.961920461 +0200
-@@ -9,6 +9,7 @@
- "PO-Revision-Date: 2009-06-01 14:07-0300\n"
- "Last-Translator: Lucio de Araujo <lucio.matema@gmail.com>\n"
- "Language-Team: Portuguese <zeliagarcia@seed.pr.gov.br>\n"
-+"Language: pt\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff -ur xaos-3.5.orig/src/i18n/ro.po xaos-3.5/src/i18n/ro.po
---- xaos-3.5.orig/src/i18n/ro.po	2014-06-08 15:19:23.317804089 +0200
-+++ xaos-3.5/src/i18n/ro.po	2014-06-08 15:22:21.969200049 +0200
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2008-04-28 11:21+0100\n"
- "Last-Translator: Zoltan Kovacs <kovzol@matek.hu>\n"
- "Language-Team: The XaoS Development Team <xaos-devel@lists.sf.net>\n"
-+"Language: ro\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/x11-misc/xaos/files/xaos-3.5-libpng15.patch b/x11-misc/xaos/files/xaos-3.5-libpng15.patch
deleted file mode 100644
index beece8339e31..000000000000
--- a/x11-misc/xaos/files/xaos-3.5-libpng15.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- src/util/png.c
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@
-     png_structp png_ptr;
-     png_infop info_ptr;
-     png_color palette[256];
-+    png_color_8 sig_bit;
-+    int color_type;
-+    int bit_depth;
-     volatile unsigned short a = 255;
-     volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	return "No memory to create png info structure";
-     }
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(file);
- 	return strerror(errno);
-@@ -78,57 +82,70 @@
-     png_set_compression_window_bits(png_ptr, 15);
-     png_set_compression_method(png_ptr, 8);
- 
--    info_ptr->width = image->width;
--    info_ptr->height = image->height;
--    /*info_ptr->gamma=1.0; */
--    info_ptr->gamma = 0.5;
--    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
--    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
--    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
-+    switch (image->palette->type)
-+    {
-+    case C256:
-+	color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case SMALLITER:
-+    case LARGEITER:
-+    case GRAYSCALE:
-+	color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case TRUECOLOR:
-+    case TRUECOLOR24:
-+    case TRUECOLOR16:
-+	color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth = 8;
-+	break;
-+    }
- 
-+    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+		  color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+		  PNG_FILTER_TYPE_BASE);
- 
-     switch (image->palette->type) {
-     case C256:
- 	{
- 	    int i;
--	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--	    info_ptr->bit_depth = image->bytesperpixel * 8;
--	    info_ptr->palette = palette;
--	    info_ptr->valid |= PNG_INFO_PLTE;
-+	    png_color png_palette[257];
-+	    int png_num_palette;
- 	    for (i = 0; i < image->palette->end; i++)
--		info_ptr->palette[i].red = image->palette->rgb[i][0],
--		    info_ptr->palette[i].green = image->palette->rgb[i][1],
--		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
--		    info_ptr->num_palette = image->palette->end;
-+		png_palette[i].red = image->palette->rgb[i][0],
-+		    png_palette[i].green = image->palette->rgb[i][1],
-+		    png_palette[i].blue = image->palette->rgb[i][2],
-+		    png_num_palette = image->palette->end;
-+	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- 	}
- 	break;
--    case SMALLITER:
--    case LARGEITER:
--    case GRAYSCALE:
--	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--	info_ptr->bit_depth = image->bytesperpixel * 8;
--	break;
-     case TRUECOLOR:
-     case TRUECOLOR24:
-     case TRUECOLOR16:
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->bit_depth = 8;
--	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
--	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
--	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	sig_bit.red = 8 - image->palette->info.truec.rprec;
-+	sig_bit.green = 8 - image->palette->info.truec.gprec;
-+	sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 	break;
-     }
--    info_ptr->interlace_type = 0;
-+
-+    png_write_info (png_ptr, info_ptr);
-+
- #ifdef _undefined_
-     png_set_text(png_ptr, info_ptr, comments,
- 		 sizeof(comments) / sizeof(png_text));
- #endif
- 
--    png_write_info(png_ptr, info_ptr);
-+    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+		 (png_uint_32) (100 / image->pixelheight),
-+		 PNG_RESOLUTION_UNKNOWN);
-+
-     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
-     png_set_packing(png_ptr);
-     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
--	png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+	png_set_shift (png_ptr, &sig_bit);
-     if (*b == 255)
- 	png_set_swap(png_ptr);
-     png_set_bgr(png_ptr);