gentoo resync : 27.01.2018

7 files changed, 4 insertions, 239 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3e1c00631a7f..435692019f34 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 4f035caeddd8..0ebf023881fc 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,3 @@
-AUX 3.22.1-CVE-2017-1000083.patch 5157 BLAKE2B b3ad8e49ba4dde21b7f3a198297443b24637592b7abefc1521a3ef226bc884dbe87a5a268a93939ffb95ea3db807d7cf8215175861a4530b70ac98e77965bec5 SHA512 f7bf0a0015191d4994d7e6a40a8a3bc4b8b2ec18ad04ca8fc46cca455709955d9f13d7ab2a0f419faca55a85064c4fe9c9f57ac4d9683f0c3fb61331996eb921
-DIST evince-3.22.1.tar.xz 3365004 BLAKE2B 89d909d6ce4bf5c370ca1777993855b70e924108aab4f1f467601165545ae74647ce77c9ba9cb7145e30d1dff00749f41df5fd461be84e51db5f01a293c68294 SHA512 c36a90bf98f25b4f9f05536f1a09c38be30b814529e17a4ab159ba7c1e952402a211f335d4cdf1928ace8a5b46d6d019fbbd457ce11c2ffa264d8bb7c32d5a18
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
-EBUILD evince-3.22.1-r1.ebuild 2874 BLAKE2B 29b8d97ac57f0b97bf12d8dde902a8bdf8f06a3a16d4179054c57bde113f3bdff70c6073d1e7b5515588ef063d266f1483c715b423f8e6e4aede7650ec9a309b SHA512 0b41b16686f158123aebc9cd939186524c6c0c84bb2e8dd043620538f2d283ebdf98fcdedadb713adc8f969403bf29b42b0c4854ad7ee043ac68e721d6aab075
-EBUILD evince-3.24.2.ebuild 2818 BLAKE2B ae723379376aaf03fe7d74e0f32db1154e4bba04a4990cd3c1b156827089b2ea8b6dfbcd3b441a0266a75d4ad5a52adbfa08c569de279e57ff52f11546369041 SHA512 3c49964d69701e110c069d2fff8a67fc634b57280be4c073c5a7a83e604a69962452927abcb8798f50a143260ced9b34f61bb007e35ac8eca5605617955eff0c
+EBUILD evince-3.24.2.ebuild 2817 BLAKE2B de7e0a0d79c45ec1c49c81c3c2a15dc3f26c3e2bcdc8d5d9c50112ed5ae6ef97140f846ce417d493c3249bcab11772cc3b702512f4a2efd0cecc1ef352d8912c SHA512 fc749377496ba1e0a22cd50960ddd15f111db660ccdf7ae06893a437c3b6b128321dd465846f47ca92811160e88e8f9b3fa9cae83da2adba101ee22e166d435b
 MISC metadata.xml 612 BLAKE2B 2736a02dc43835f7db7b02a3ffcd2c2e25a81971a61a008f67497612ce8f9c78b6641e110a00dacf5f158cf5a87104171c5aea7f82be241ee0b966bb802e78eb SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c
diff --git a/app-text/evince/evince-3.22.1-r1.ebuild b/app-text/evince/evince-3.22.1-r1.ebuild
deleted file mode 100644
index 7ce30ec41a4e..000000000000
--- a/app-text/evince/evince-3.22.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# gdk-pixbuf used all over the place
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-CVE-2017-1000083.patch
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.24.2.ebuild b/app-text/evince/evince-3.24.2.ebuild
index 584a95adcec8..376adc725d22 100644
--- a/app-text/evince/evince-3.24.2.ebuild
+++ b/app-text/evince/evince-3.24.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # gdk-pixbuf used all over the place
diff --git a/app-text/evince/files/3.22.1-CVE-2017-1000083.patch b/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
deleted file mode 100644
index 9164c618145a..000000000000
--- a/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: Bastien Nocera
-Date: Thu, 6 Jul 2017 20:02:00 +0200
-Subject: comics: Remove support for tar and tar-like commands
-
-When handling tar files, or using a command with tar-compatible syntax,
-to open comic-book archives, both the archive name (the name of the
-comics file) and the filename (the name of a page within the archive)
-are quoted to not be interpreted by the shell.
-
-But the filename is completely with the attacker's control and can start
-with "--" which leads to tar interpreting it as a command line flag.
-
-This can be exploited by creating a CBT file (a tar archive with the
-.cbt suffix) with an embedded file named something like this:
-"--checkpoint-action=exec=bash -c 'touch ~/hacked;'.jpg"
-
-CBT files are infinitely rare (CBZ is usually used for DRM-free
-commercial releases, CBR for those from more dubious provenance), so
-removing support is the easiest way to avoid the bug triggering. All
-this code was rewritten in the development release for GNOME 3.26 to not
-shell out to any command, closing off this particular attack vector.
-
-This also removes the ability to use libarchive's bsdtar-compatible
-binary for CBZ (ZIP), CB7 (7zip), and CBR (RAR) formats. The first two
-are already supported by unzip and 7zip respectively. libarchive's RAR
-support is limited, so unrar is a requirement anyway.
-
-Discovered by Felix Wilhelm from the Google Security Team.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784630
----
- backend/comics/comics-document.c | 40 +---------------------------------------
- configure.ac                     |  2 +-
- 2 files changed, 2 insertions(+), 40 deletions(-)
-
-diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
-index 96ed26e..3af119a 100644
---- a/backend/comics/comics-document.c
-+++ b/backend/comics/comics-document.c
-@@ -56,8 +56,7 @@ typedef enum
- 	RARLABS,
- 	GNAUNRAR,
- 	UNZIP,
--	P7ZIP,
--	TAR
-+	P7ZIP
- } ComicBookDecompressType;
- 
- typedef struct _ComicsDocumentClass ComicsDocumentClass;
-@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand command_usage_def[] = {
- 
-         /* 7zip */
- 	{NULL               , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
--
--        /* tar */
--	{"%s -xOf"          , "%s -tf %s"      , NULL             , FALSE, NO_OFFSET}
- };
- 
- static GSList*    get_supported_image_extensions (void);
-@@ -364,13 +360,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = GNAUNRAR;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--
- 	} else if (g_content_type_is_a (mime_type, "application/x-cbz") ||
- 		   g_content_type_is_a (mime_type, "application/zip")) {
- 		/* InfoZIP's unzip program */
-@@ -396,12 +385,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = P7ZIP;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
- 
- 	} else if (g_content_type_is_a (mime_type, "application/x-cb7") ||
- 		   g_content_type_is_a (mime_type, "application/x-7z-compressed")) {
-@@ -425,27 +408,6 @@ comics_check_decompress_command	(gchar          *mime_type,
- 			comics_document->command_usage = P7ZIP;
- 			return TRUE;
- 		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--	} else if (g_content_type_is_a (mime_type, "application/x-cbt") ||
--		   g_content_type_is_a (mime_type, "application/x-tar")) {
--		/* tar utility (Tape ARchive) */
--		comics_document->selected_command =
--				g_find_program_in_path ("tar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
--		comics_document->selected_command =
--				g_find_program_in_path ("bsdtar");
--		if (comics_document->selected_command) {
--			comics_document->command_usage = TAR;
--			return TRUE;
--		}
- 	} else {
- 		g_set_error (error,
- 			     EV_DOCUMENT_ERROR,
-diff --git a/configure.ac b/configure.ac
-index 36e866a..26a1a7d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -795,7 +795,7 @@ AC_SUBST(TIFF_MIME_TYPES)
- AC_SUBST(APPDATA_TIFF_MIME_TYPES)
- AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
- if test "x$enable_comics" = "xyes"; then
--        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;application/x-ext-cbt"
-+        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;"
-         APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-         if test -z "$EVINCE_MIME_TYPES"; then
-            EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
--- 
-cgit v0.12
-
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index cb3e6b790704..f3d78f03c391 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2433 BLAKE2B 6220a709b5a2d3d9ce9ef04d86a43a6bf3b1a9ba228b6917ecd32847e839314be587ba3e0bcc810817f092036d46b00da35797b2147f79ac6c2ea1578aecc8b1 SHA512 5be4c86f67c99ad852ae9247afcfa4df8a7c904716fc63cfa22ca28b023571cf4f02758393eab9344854c05b750ba9fe504bfeadd96876f2193dcd421b630b3d
+EBUILD iso-codes-3.76.ebuild 2432 BLAKE2B f600e4b4e9c6e7599ce95a7d04574be2f222287993437b7e8a1ff3dcc0ea534e63c3480be2cb587f9808640abcc66d676ff7c4777e7225642bd271e5defd2e40 SHA512 56a2772a4ec75bcd97845dd7dc31602178053119eec74d3734cd36ccae66f6e79da66ca624c2ceccc1587ae8ccbb335b3cfbed5b655cc83e994ec4143b0bbecd
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 637b939ba5fa..f1abe31cefff 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""