gentoo resync : 06.12.2017

10 files changed, 311 insertions, 1 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9b2b58f9ff5f..1a94d73c1b41 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index b9bc55e7c962..b3154aaac49e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,5 +1,7 @@
 AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4
+AUX exiv2-0.26-pentaxnikon-crash.patch 1712 BLAKE2B f67edf849e5f1674a81b8d33157788c946ba5eab2af3b9c6e216007131f152dda215112a82d2928f771a32558df540c0e730cc309365a0e3ff016365d62b745d SHA512 a6de44c1451e6277433223871d151b251a330799d204cb20b9bebf1a6005c683506183617647c8c218d16bc80e2cf58e732fd226223a128a1ddda2567b761bde
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
-DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09
+DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
+EBUILD exiv2-0.26_p20171104-r1.ebuild 3214 BLAKE2B dc9d0c55d82a465c9c1cad8755eda3152d5bac601da0093f2f9525c78a28b8cfe81b77e2fe0be3bbd6b66f46d6c1728612e3781ec73d98f16e26f252d2cfa546 SHA512 5445692367b27ef49db7b38735b3937497d28f8cd5d5ca8a98d10d2909ddbd781c26080e0caa43a855a462891387b84d820150ed0012f432828228073d396477
 EBUILD exiv2-0.26_p20171104.ebuild 3156 BLAKE2B 3aa14c51da678040d927f7137bd5d93b8b4dc72c2639d8aa6d416888a923e09c15f7f1adf8e327001ef821c4475251d61aed9df01a62655c098be0ccb8310977 SHA512 28faa24036404ccc8452ef3af5f793a634b0236697f9fb727f95778b0d5a2e0729410118f0ec15f157b0c32562fccadc5536d4afe9faeebbcd497664239a870b
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
new file mode 100644
index 000000000000..f7eb67dc5bf2
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	EGIT_BRANCH="0.26"
+	GIT_ECLASS=git-r3
+else
+	COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
+	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+inherit cmake-multilib python-any-r1 vcs-snapshot
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/26"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
+
+RDEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	webready? (
+		net-libs/libssh[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+	# TODO: Take to upstream
+	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
+	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
+	"${FILESDIR}"/${PN}-0.26-pentaxnikon-crash.patch
+)
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != *9999 ]] ; then
+		if [[ -d po ]] ; then
+			pushd po > /dev/null || die
+			local lang
+			for lang in *.po; do
+				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+					case ${lang} in
+						CMakeLists.txt | \
+						${PN}.pot)      ;;
+						*) rm -r ${lang} || die ;;
+					esac
+				fi
+			done
+			popd > /dev/null || die
+		else
+			die "Failed to prepare LINGUAS - po directory moved?"
+		fi
+	fi
+
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	if use doc; then
+		einfo "Updating doxygen config"
+		doxygen &>/dev/null -u config/Doxyfile || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
+		-DEXIV2_ENABLE_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_SSH=$(usex webready)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		-DEXIV2_ENABLE_LIBXMP=NO
+		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && emake -j1 doc
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
new file mode 100644
index 000000000000..a66af8d5dc96
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
@@ -0,0 +1,52 @@
+From 2dc166b04ca6152d01bff6627a332e89ddef24d1 Mon Sep 17 00:00:00 2001
+From: clanmills <robin@clanmills.com>
+Date: Tue, 12 Sep 2017 09:14:42 +0100
+Subject: [PATCH 1/2] Fix http://dev.exiv2.org/issues/1305
+
+---
+ src/pentaxmn.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
+index 4fc38be0..b22cb43b 100644
+--- a/src/pentaxmn.cpp
++++ b/src/pentaxmn.cpp
+@@ -1167,6 +1167,8 @@ namespace Exiv2 {
+ 
+     std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata)
+     {
++        if ( ! metadata ) return os << "undefined" ;
++
+         ExifData::const_iterator dateIt = metadata->findKey(
+                 ExifKey("Exif.PentaxDng.Date"));
+         if (dateIt == metadata->end()) {
+-- 
+2.13.6
+
+
+From 3bc0b91bcecefdad531129b1a934be1251021c95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= <mn@sungis.lv>
+Date: Mon, 18 Sep 2017 23:37:40 +0300
+Subject: [PATCH 2/2] Fix crash on undefined metadata on some Nikon images.
+ Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
+
+---
+ src/nikonmn.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
+index 571ab806..34bf601c 100644
+--- a/src/nikonmn.cpp
++++ b/src/nikonmn.cpp
+@@ -299,6 +299,8 @@ namespace Exiv2 {
+                                                const Value& value,
+                                                const ExifData* exifData)
+     {
++        if ( ! exifData ) return os << "undefined" ;
++
+         if ( value.count() >= 9 ) {
+             ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian;
+             byte      p[4];
+-- 
+2.13.6
+
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
new file mode 100644
index 000000000000..4ebf5e0a2872
--- /dev/null
+++ b/media-gfx/frogr/Manifest
@@ -0,0 +1,3 @@
+DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
+EBUILD frogr-1.3.ebuild 575 BLAKE2B edfe13f1030ffde5470fd0e4ac81b3d378b958063f454c4b29a221d2746bbc274c4f5eb389238ae290aa1efee643c39a82ddf02daf2b1b6c052b8a202917e07a SHA512 4bd2dd967ac60f2ed59fed80361249c5b90ef46144279b8b4734e6118a5522638ce44c3f8a5e2bd16e8569e2404669894aa3e827ccd33aca25e477a39fe8a36b
+MISC metadata.xml 471 BLAKE2B 98553d988349910ccfe0ef4130d85d7cfa800907b6ab4f7823368fccfbfdb2cf5ecc05bb1b567e7749f92e240f2e2ec8bd95cb3ced30e9d0f3c011f3e8ad4664 SHA512 4c254ca88582b48b89673a930d4bc1e4d051b828c4241a8fd30c28375099fb78b8691ea65c90ddd3b60305ec68d3db9986959ac899b8f2341f562c6d435442e1
diff --git a/media-gfx/frogr/frogr-1.3.ebuild b/media-gfx/frogr/frogr-1.3.ebuild
new file mode 100644
index 000000000000..f91b7a6a0516
--- /dev/null
+++ b/media-gfx/frogr/frogr-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="flickr applications for GNOME"
+HOMEPAGE="https://live.gnome.org/Frogr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44
+	>=dev-libs/json-glib-0.12
+	>=x11-libs/gtk+-3.10:3[introspection]
+	>=media-libs/libexif-0.6.14
+	>=dev-libs/libxml2-2.6.8
+	media-libs/gstreamer:1.0
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libgcrypt-1.5:*
+"
+DEPEND="${RDEPEND}
+"
+#video and header bar are enabled by default
diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml
new file mode 100644
index 000000000000..a75837990a74
--- /dev/null
+++ b/media-gfx/frogr/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sobhan@gentoo.org</email>
+		<name>Sobhan Mohammadpour</name>
+	</maintainer>
+	<longdescription>
+		Frogr is a small application for the GNOME desktop that allows users to
+		manage their accounts in the Flickr image hosting website. It supports all
+		the basic Flickr features.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 695741872358..61735d3898e6 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,5 +1,7 @@
 AUX optipng-0.7.5-estonian.patch 1014 BLAKE2B 3c973120185be858a89c02b1f452e47da5f51866ec9ad59653d2f27cea9ea2b7d318d33b00c3eb14b6e87e629f63062d63f2ffd523e62b9927b0b75e4d781af1 SHA512 535e869c42df6181f0bd30287adb9175c18e8a9730c997a6466e64870b968d9575e6952889353be5ac4232b2087b004cde953e151da4c75b8048b3cdccb8f27d
 AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b478838633e43536caa6bca54a7b48ad4290af3aa452b37d3bacbb194bec11aeed47e84b60cab4fd71281d554e72309e376ceb4 SHA512 2bf259c59121e735a6c65137d5819c07057b3b1e43e14793cc4f739b607f6ea4e4788ddf1dee521bd8b623796c901f974e7c925f36ff13adec669dfc6fbf449e
+AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 EBUILD optipng-0.7.6-r1.ebuild 1335 BLAKE2B 9d40e9ec7e7d8cd7f96cf82676c48bb32f4eac2eca8c7a7d67eb2419994827ae0dc2b28b02a12265034b98de08100e849d0fba2ba414237165dca3fc096a4f65 SHA512 fde34b5fcd172711ee57f55cd93c8d60eb44086a09974aac5cea7b104a3a7c961a1840a38934aaa0a6182fdc2d8be01372d420af5f30054f298ebd565c0c09f5
+EBUILD optipng-0.7.6-r2.ebuild 1422 BLAKE2B 69f122a162614400ff1c7dee8d2ef71292eee7eece93a9f799a449a07a7c8b5d5b25d87b748e2175a5803ed4ce39cc109b54c60e637fb089194d1c61be50e156 SHA512 b0c5826d47d89fcddd3fdfc6400efc1cd9467a3e2adb18a34dbd18a31574c000e6e4fb57eb4b71509b50c581652a3f7aa46c4b63bebe25b887987b8584c7ed43
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
new file mode 100644
index 000000000000..71edf20cfefe
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
@@ -0,0 +1,22 @@
+From e05fb81a20541833a2d62ce08552b18c0920b9a1 Mon Sep 17 00:00:00 2001
+From: Cosmin Truta <ctruta@gmail.com>
+Date: Sat, 25 Nov 2017 23:17:46 -0500
+Subject: [PATCH] gifread: Detect indirect circular dependencies in LZW tables
+
+---
+ src/gifread/gifread.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gifread/gifread.c b/src/gifread/gifread.c
+index 0123456789abcdef..0123456789abcdef 100644
+--- a/src/gifread/gifread.c
++++ b/src/gifread/gifread.c
+@@ -499,6 +499,8 @@ static int LZWReadByte(int init_flag, int input_code_size, FILE *stream)
+             *sp++ = table[1][code];
+             if (code == table[0][code])
+                 GIFError("GIF/LZW error: circular table entry");
++            if ((size_t)(sp - stack) >= sizeof(stack) / sizeof(stack[0]))
++                GIFError("GIF/LZW error: circular table");
+             code = table[0][code];
+         }
+ 
diff --git a/media-gfx/optipng/optipng-0.7.6-r2.ebuild b/media-gfx/optipng/optipng-0.7.6-r2.ebuild
new file mode 100644
index 000000000000..b5096a87c8f6
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.7.6-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	media-libs/libpng:0"
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.5-estonian.patch
+	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-1000229.patch  # bug 637936
+	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-16938.patch  # bug 639690
+
+	rm -R src/{libpng,zlib} || die
+	find . -type d -name build -exec rm -R {} + || die
+
+	# next release is almost a complete rewrite, so plug this compilation
+	# problem in anticipation of the much (c)leaner(?) rewrite
+	sed -i \
+		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
+		src/optipng/osys.c || die
+
+	tc-export CC AR RANLIB
+	export LD=$(tc-getCC)
+
+	eapply_user
+}
+
+src_configure() {
+	./configure \
+		-with-system-libpng \
+		-with-system-zlib \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake -C src/optipng
+}
+
+src_install() {
+	dodoc README.txt doc/*.txt
+	dohtml doc/*.html
+	doman src/${PN}/man/${PN}.1
+
+	dobin src/${PN}/${PN}
+}