gentoo resync : 05.01.2018

6 files changed, 62 insertions, 4 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index eae43e50e71a..542a31135628 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e00c4756c9da..a04984ecc653 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -5,10 +5,12 @@ DIST feh-2.20.tar.bz2 2129466 BLAKE2B 4b0ff29b8c5859f18f01337409290e85f46dd7f924
 DIST feh-2.21.tar.bz2 2129718 BLAKE2B 6d0e60ba5f51aef6dec6df59ce3cff24f9947e2359e839f8f3c49dadc51ee6dae15db8fbfd60e63a0bdf6df4482f88c8b3bb4d5a8a37725ca0b07030251eb1ac SHA512 f869d6588976973fca55714829478293bbd89fe03c7575c48847d23caec09353dc54eddf6fa41dc7f560c92eaee49ee23008258d72f4d55a49a5166625560a43
 DIST feh-2.22.2.tar.bz2 2129840 BLAKE2B a770c535746f7e9c2163cedc1a540c7a2c691c94d6ac77f70e4054aff42eef2d45bf870cdbcf7997872fb399e5b0e0d9e74971a872ae6714521c7f59e72a5ed2 SHA512 85c5f779fecb2be7457fed0675f25860ed4f41db9ecd1fdb8d4b1e553a7a337d5af243aafbd3fae4ac42fc943d207a264756d92cd15c62e95cec1f28fde46219
 DIST feh-2.22.tar.bz2 2129914 BLAKE2B 592b26a4874bbaebe4826b53c6957ee25a95baca19da3ddeeafba81627538d53dcfbe9f54c932e1319fc9160680caf599e965976e733a7d07fa0dc0bd046ba3a SHA512 403b1e760e2b3e177768b47de5bb7bd45c11152f04a21f6788afcaec12357a085f7c9944000f78a8df41a3d60a67985622d36effd543216153ab04e539b5b85f
+DIST feh-2.23.tar.bz2 2130344 BLAKE2B 730670fa38b909c26412b24d076732c9f8ec0a91c52e836dfd9a764fed35489085537073ece869e664cd8baeb1ee2fff47cc0bc69a6138e641b0a6a2be57331c SHA512 4b75f0053c3a4b1fb51251536896fd48470117ca3d59de1ac5a87f8071f37f886542e7d82730eec4579a1ebf507e4bc8a00fc45cf1364d2445b1aa82c5664ee7
 EBUILD feh-2.18.3.ebuild 1191 BLAKE2B 65a725d14fe77144ff3cc9c545e46b3a7a8df4ec71c981422a8029f9e7f61a83629a11ce687fc0d98045e935521dd59677be43b8649231c16008c11ca604028c SHA512 cfdb2067a02a31747129abe3833a2999c15e02abbabb7a389380b6351f0d87aaa0b74b29e4253a33dcf12ede43f8964fb5b099a80c438cbe7523e91de45b172a
 EBUILD feh-2.19.3.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.20.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.21.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.2.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
+EBUILD feh-2.23.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.23.ebuild b/media-gfx/feh/feh-2.23.ebuild
new file mode 100644
index 000000000000..73ad8e804e44
--- /dev/null
+++ b/media-gfx/feh/feh-2.23.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index cf1f719d4329..c447c18db152 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,7 +1,7 @@
 AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51ce439ac21acb269648df647ddf3abc5ee6f01de44ffbc62bd1274aec1a167cf3f449c8498768af2af50fc0b9e3a5963f1857a46 SHA512 12181e4b48e4fb6284b574cb9872af713323d8f229a6c1746424968b0d22300bd6ada6437854a730dd4c5310eb36ebb06a35375ab012d36e9d3af4fb4271d884
 AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c
 DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 98b678240e09ef85204719b6d4e9bbeafec358ba8657a8e92d45f3dd9cea20779d4b8b07ae084b0e06e2a02bd13662e6b735e164d867da50f4d7f28ade30ec22 SHA512 659baff3d7cf8c7773ae6be253bdd18d8051d9f995e2333d74db4e3e744c719e2caed901264af457570c72fc7505decaf77639ca0834e01feb68c9793ed86cf5
+DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375 SHA512 a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142
 EBUILD freecad-0.16.6712.ebuild 3512 BLAKE2B c82cbfa92ea9fef06dacc261614f603c82b757ff27f31cd44618b2443d2073a012740c54c3ce3045f2ab1a56edf782b87b695c1635ae0fea5bc3c25c0479234f SHA512 69dd661a78298c4c0ada44662cac74e94e6f444c392374b73026638baddfb7a0dd565873c2c5fccd6184db2dee9c08c8d780ffdf1b0efa3bd4249a4fa62ffe1b
 EBUILD freecad-0.17_pre.ebuild 3512 BLAKE2B c82cbfa92ea9fef06dacc261614f603c82b757ff27f31cd44618b2443d2073a012740c54c3ce3045f2ab1a56edf782b87b695c1635ae0fea5bc3c25c0479234f SHA512 69dd661a78298c4c0ada44662cac74e94e6f444c392374b73026638baddfb7a0dd565873c2c5fccd6184db2dee9c08c8d780ffdf1b0efa3bd4249a4fa62ffe1b
 EBUILD freecad-9999.ebuild 3658 BLAKE2B b8fb3a076bc64144f2f15c0134cf3f047245081a233bf0b9d8bb1d717d9e061f91e029d6a1c21fda29df0967307377432edd952eeb7f0e82f9a94b7cc2487d4a SHA512 f0def47258f9a1886566ff0e38f54b87b57657381b22a1b9dd8db051503af37dfac9cf7313257787f2b4df6c517476b9b8482e0a940b69bca75c2daf77c86919
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 2da80d746936..051d713bad5a 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -5,5 +5,5 @@ DIST ristretto-0.8.2.tar.bz2 559444 BLAKE2B a44cb653fca2452d787b2d69b556fddc9f6f
 DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
 EBUILD ristretto-0.8.0-r1.ebuild 959 BLAKE2B 546b009d37ebf39e984bd0b81deefd55e66c0f6336328a79d785d866e1468483aab6eba1cfe1fbbea993b2baf1876d925342e25c8e46fd11bc5d4791d3bb6b8a SHA512 6a0829f14ac72ce3e7860412e09ea9148d39d00fd21d9cd52f2dac30c4bdc0cf10ebe8f471f519886f7d85530eced1d518cbe9eca090eb741e7b0a555f9edd38
 EBUILD ristretto-0.8.2.ebuild 853 BLAKE2B 17ad3b252cfc8b1c07e3e7c65873d0c85b69eb56e64b148efc7012ba6ce210f9443089a13aa4259ddd9c473242a15a0773f56c2f199a6c4312ed214bd772d193 SHA512 ab24be0f6c395ba7c3fae4fa1a17ca3dfb785814f05fb1ae788a2b76331647138c0c99db760656d89acb44b945f260ad061d26c79527023b09f21a95489c0ecd
-EBUILD ristretto-0.8.2_p20170821.ebuild 946 BLAKE2B 27219a84965d513752d5aabd01b3036d6b0b334a06ed28d06ed8cc1ccb78e0bc6bb1b8215a2d37e92af26e1cabad43a0071acba13ae7a9ebb2a3449293b93ba3 SHA512 cc8e1d72806a99cb07b21f8070eb730025fd788aa3a893a98c78b185f5c0a38a85d95aab5903838591d794b71a75f17de97d7cc079fa224ee0f4f8930696387e
+EBUILD ristretto-0.8.2_p20170821.ebuild 945 BLAKE2B 2eb1698351fdcc1f5ca96d34458b8c2575b83ff8be0b6f2a6466c180d2fd131ff9ec13a6b55ca83ee531f26d95a253d34bc457d284ca76e6abdab27824903733 SHA512 1778c675409ac056910146d5b4c89d055c8dc526019566132194ec2f93c43aaa5a122bd63dd438d9badf0de48ccaed44e21dbdb7b01b5e6a4386288b9f316821
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
index bce668dc9152..8aac8c33c382 100644
--- a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
+++ b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/dbus-glib-0.98:0=