gentoo resync : 05.04.2018

33 files changed, 183 insertions, 890 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4e9f4779135d..6840ccf64bc0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 20e2bc54e496..4e041e3c9f0e 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -11,4 +11,4 @@ EBUILD cura-0.15.04.5_rc5.ebuild 1833 BLAKE2B 4fef821e5be9a9fe988822dec762dc7130
 EBUILD cura-2.1.0_beta.ebuild 1404 BLAKE2B 61d3335fc2b73e792bed2bb0e2a891440febe58e1b3bf2c9d5a94f30551ef46f842948f29243318ffc97b1d48da518c957b34ecefc0cade196da414a528b1fac SHA512 061231ebd90d9eafc0c625e137f48145971a44c71a8791b858d78bb2897b53052beece1fab6b306addea222135e5cff62fdfd95307569b8e6cb7655f86b3ebe9
 EBUILD cura-2.3.1.ebuild 1438 BLAKE2B 839702098c13f0e1e5a1ca93b6866bf4934ee5542ef52acc166d990d7e615eee6524c94a7b0b624341342471e2e571560616fb655ccab39137f7397ce3d90d13 SHA512 4f018a8141afe96380643f5c42e232c723fe24a436051d5ea2415cb5c9b3cfdb43a282a923240174cb7c16da4e1b11c719deda36b43727a5119e3a970d5a6dcf
 EBUILD cura-2.6.0.ebuild 1441 BLAKE2B c8ec71e1cff5575da07847fbda2963d623bb1a9ba0ef52ef1c95a9557ee0702a162680d348baa4ef46e9bf5db6995b4cfa98b1462f5d2a2b0bf5841d30c9a017 SHA512 b6323fb0e21608662600bd452413acc07cd8f6ade9c61e3a3e2cbeea675581a7e4a39071898518df846d46fa106753657789bdd2654941e1426a3e3b07f4e43a
-MISC metadata.xml 646 BLAKE2B 978b7cbc20d1c6b16fea58f6ba1e3b8f1db861121dcbd6e21c82f8b2dcdbafbdf5b43c77ce078edec3bc23bc277e6c0ca050d6d1ed4e16082deeb38883f2f2da SHA512 e7d2855f6e1afa0019ead78e63b7b94f7c262ceb26678c7621c9062d4ed986579ed06a3a255bae0f8f7588f26bb7923e9629d8ed82aab83bd682aa473b4bb238
+MISC metadata.xml 407 BLAKE2B 37e71adabc7e7f6abddda35afd1b9a2b5fafa1f7fce9c7fe4be4451e128f3e1fba1147bca67839d66a7195febb30d48a7a633f914ccdfeed2752607a9b34e00a SHA512 0c5d12d6a69ffb2d2f6e6ed0c1a02a3d8e793d1befd23fd2e51e8108f708787605489c9864e72ddc99389f2f05ccd33d5f9bf4367d3ee2a1f1781db1bb5c5393
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index e0588ff0d2ec..e3e65a7508d0 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tomboy64@sina.cn</email>
-		<name>Matthew Brewer</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<use>
 		<flag name="usb">Access 3D printers via USB</flag>
 	</use>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 8ff0bcff6700..93464d8decba 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -10,4 +10,4 @@ EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbd
 EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70
 EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623
-MISC metadata.xml 584 BLAKE2B de8f551ef73f75fde6a913a906ad9c8030d7567c1b19a21c85c64b2fd59bc9896bcd46aabd27177b09d22af3caefd6a5f8c897c9d75e0b7f0de44d89f57d87fb SHA512 d251db5b89731c9f3ab502140199261172e40ee224c34c0000ccafb121b4d5b4c80e67ea5eeacb3cfe5be97fbf01cf6d2a10916794482437b466d5b8bbc394e6
+MISC metadata.xml 345 BLAKE2B 511f54aad8cd73aed32473b360cbec2147162bcd2c43eb4ebd221c17da563d90949dd0008e9bd47bc7cbd97a4ff2837da4054870a4714d8b271f5d4d6082b318 SHA512 eea1693928c47dd36f6ca76c7a7f3a5fdf6c49edd978f24be42d812b354ac6a8544036a9ae384e849d47cbe43a02ef0e1a2cbaff0f3929c344c49dc45fd49742
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index befd642b942a..2b689686f817 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tomboy64@sina.cn</email>
-		<name>Matthew Brewer</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
 	</upstream>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a9d6a2574bb6..a1466667a390 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,10 +1,11 @@
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
-DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
 DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
+DIST darktable-2.4.2.tar.xz 3415724 BLAKE2B 2c7149ff14283f38208f223cab78c57d30cf0f50841484411bec64d8154b6c4f2213990d169da057d734b9ac792a549aa9c3a6137a0ebfcec6b4c7d6f3991817 SHA512 4ad698bbfbeb94ab8d25a5414e65a5e5d6d8edae0e77d1ac327dfed0e0519e1a8a6761f9efe653aa8c421cc37269efaef4da96c5bc3797f923b4a0df4ebdfa8b
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
+DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3865 BLAKE2B 840d9f1a6d2df0d2531bdf69909e15bc82253971a286159eb0e1d2e8e319ca39a2b5f69732191b852c7706c441e29f232c9a3f773205c34b2916e12dcb92051f SHA512 7f9f2e38f942c2eaa90f5d26269d0dfdf393b16b68454b717334b7736da09556287b5cff1eed2d61ae02e1fb36ae5b117e9d32cb84bd3762390ff10f7c795612
-EBUILD darktable-2.4.0.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088
 EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088
+EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B ab8c8bfa882b0047df0357316d130a85a810e5f6bd52d449825f2334c67d6780b0271ab0586590329aaf10315220e852345e4705604f8a2d9f10d5db93ce036f SHA512 c5fc75df91ca994b5444984620405faee418d72a9fd42268f5df20e942b80714cc5a3695038c037bbf64af5f704923e7be6b0b0083892fc695d3cdeacc821c12
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 3f4354c3815fdb84a0ff0b4362e1426d54cc8a9244cc39f3a760bcbc199044c1e8591ecdf8b581335f9e60a793f2519e39285ab50bfdd7542dc57f7a0601c913 SHA512 d814738b460f2e18847b52a2559ecd4479e45862209648badacab847b3dd0a002e4c168a69c69b1e416d5d68537f3fb19ae3f47006695572ea950e736d6c7bc7
 MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.2.ebuild
index 29265f5ebb36..2dd7f1c2d2cc 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
 
-DOC_PV="2.2.0"
+DOC_PV="2.4.0"
 MY_PV="${PV/_/}"
 MY_P="${P/_/.}"
 
diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
index a4c3faf1c8cb..f777eae514cb 100644
--- a/media-gfx/dawn/Manifest
+++ b/media-gfx/dawn/Manifest
@@ -1,4 +1,6 @@
-AUX dawn-3.90b-no-interactive.patch 5686 BLAKE2B 49631a9c141f218e1edd245305c6688893b507047876b98849746253c21041475a5267617373751f814ad95b9b762cd13294277dbb514c573ac1e3733886baea SHA512 9a2a86fca7d680569b2cba59354b56e89fc2cff6bd6cc8679744f5283a68d9f6e0ac74892529de632efbfa9834cc7743847520fcafd5e82ded1dc73e05a326d4
+AUX dawn-3.90b-gcc7.patch 513 BLAKE2B cf0e95894bbe85db5bfc45c1ef731dafd593c4531711bce931013b921a82b5306ca31e68dfd4f5a5b9fcf70b1bfc51f4b4c1a015725acaea6d7ac6703fb2cd8d SHA512 784659c383e1c240f5ea9def2bc39429fe726960356ca57ad07fc4e0415053f6bf9125a09ce54a1a1591b2ad9887dbc01619fa7f566d249d86767ed798f2345a
+AUX dawn-3.90b-no-interactive.patch 5467 BLAKE2B 2d7bfe6cc17143dcd2c33492eb45a77ecc44bcad9685f147c4a69ad0ec6aecced69c9e9de6d27b66c2a6db57971019ce2fa7014e1e9d0a1a5e338bc79027254e SHA512 fa9be36122f1c97226c7096657c7b3fd43f23c30c2e7d3ecb0673aa09fc1327f86afe92abf26a078165ee959ee5edcfe77b628c614f92e56cc8ca91e6b612265
 DIST dawn_3_90b.tgz 1334732 BLAKE2B 97f4e747b8f9d2eb60d9c8f0e7358fe549052e36a02127f02363c328775f33ae9fd36afd850ef06b365aaaa9723a541d89d7f2fccb37d1dd30f626054d7939b3 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea
-EBUILD dawn-3.90b.ebuild 1194 BLAKE2B 67ab0c0336f7b837c19e0fa27171d6c65fae5fbced75071309f3adca1434ea7b40efd840641920eafcce3a8f1e100f2dbf106588dfe46a8ecf724053827b1d8b SHA512 ad827620ac42b5fddeea20d3222b342f2a6481cade600ff1e5da5cffb29d5b62a383de5f8322a05c05a2c979fcf69503b70e4412ae96f0c8318582ba1988224e
+EBUILD dawn-3.90b-r1.ebuild 1072 BLAKE2B cd75223d58f1314132ac2c528862de1aba877a20fe00921c244c46bb43165583ec6f37987f331d5203e40567f8c65e6d9779decbf8d8b9e253e5c2c56b790ef1 SHA512 de9b8dc05426938bed5c65c17856559ab8296cf123ecd9095d89aa1546688c70fac0b1e81d19e676a3ee9f53491749f113170684df4784768e9c342a59d16210
+EBUILD dawn-3.90b.ebuild 1232 BLAKE2B f723d630092e5df1a4d37a5cddbfcea53123a5af42e7dd5e3634e27a1ca08a0677c0152cdac3173734a9c0791d534304c6cd52855b862c87637fd9336846a8fc SHA512 e7e40b06f1a6af969d985f22c79d6ecfa9006ac259a564dec9ec50471eca25dfc9bab6d042f7bc69554b684299a94f613541a97ee6eb88f46e7617a94aba5c74
 MISC metadata.xml 1190 BLAKE2B 1d73439a17d21cf023760353df3691121b9c563264a7df26c17a04b5d1f56977faefcb9d3e289f494d6cffaa0c97bd4b444c463ff93d2b7217e34acf452e7b70 SHA512 e89f54b6c40745ace97ed1aa0acd4e3d7d7f69ef68883e17f43e9425016b7d883fee48e4d229543d99be1c66c274184f49c091ecc71cdf835a2b64e9016611d6
diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild
new file mode 100644
index 000000000000..eb0d35f516dd
--- /dev/null
+++ b/media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver toolchain-funcs
+
+MY_P=${PN}_$(ver_rs 1 _)
+
+DESCRIPTION="3D geometrical postscript renderer"
+HOMEPAGE="http://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html"
+SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
+IUSE="doc opengl X"
+
+RDEPEND="dev-lang/tk:*
+	opengl? ( virtual/opengl )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	app-shells/tcsh
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-interactive.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+DOCS=( README.txt )
+
+src_prepare() {
+	default
+
+	sed -i -e "s/\$(LIB_DIR)/\$(LDFLAGS) &/" \
+		-e '/strip/d' Makefile*in || die
+
+	if use X; then
+		mv -f configure_xwin configure || die
+	fi
+
+	tc-export CXX
+}
+
+src_install() {
+	dodir /usr/bin
+
+	if use doc; then
+		pdflatex DOC/G4PRIM_FORMAT_24.tex || die "pdf generation failed"
+		DOCS+=( DOC/*.pdf )
+		HTML_DOCS=( DOC/*.html )
+	fi
+
+	default
+}
diff --git a/media-gfx/dawn/dawn-3.90b.ebuild b/media-gfx/dawn/dawn-3.90b.ebuild
index 9e9e200f5fd6..d3f9a78279fa 100644
--- a/media-gfx/dawn/dawn-3.90b.ebuild
+++ b/media-gfx/dawn/dawn-3.90b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MYP}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-interactive.patch
+	epatch "${FILESDIR}"/${P}-gcc7.patch
 	sed -i -e "s/\$(LIB_DIR)/\$(LDFLAGS) &/" \
 		-e '/strip/d' Makefile*in || die
 }
diff --git a/media-gfx/dawn/files/dawn-3.90b-gcc7.patch b/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
new file mode 100644
index 000000000000..e144a38df8f0
--- /dev/null
+++ b/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/638616
+
+--- a/FRString.h
++++ b/FRString.h
+@@ -137,13 +137,13 @@
+ 	char*  p = m_string ;
+ 	
+ 	// skip first blank if any
+-	while(  isspace(*p) && p != '\0' ) {p++;} 
++	while(  isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// skip one word
+-	while( !isspace(*p) && p != '\0' ) {p++;} 
++	while( !isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// skip second blank if any
+-	while(  isspace(*p) && p != '\0' ) {p++;} 
++	while(  isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// reset string
+ 	strcpy( tmp, p  );
diff --git a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch b/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
index 244948ec5262..ea8ac7e6a90e 100644
--- a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
+++ b/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
@@ -1,5 +1,5 @@
---- configure_xwin.orig	2008-04-02 22:58:44.973465484 +0100
-+++ configure_xwin	2008-04-03 00:02:15.950190359 +0100
+--- a/configure_xwin
++++ b/configure_xwin
 @@ -16,17 +16,17 @@
  #----- C++ compiler name
  echo "Input C++ compiler name (e.g. g++, no default)."
@@ -87,8 +87,8 @@
  echo ""                                                >> Makefile
  
  echo "### Socket libraries to be linked "              >> Makefile
---- FRSocketMacro.h.orig	2008-04-02 23:58:51.126518123 +0100
-+++ FRSocketMacro.h	2008-04-02 23:59:03.443220012 +0100
+--- a/FRSocketMacro.h
++++ b/FRSocketMacro.h
 @@ -14,8 +14,8 @@
  #elif defined SOCKET_REDHAT61
  	#define         CLIENT_ADDR_LENGTH    socklen_t
@@ -100,8 +100,8 @@
  #endif
  
  	//----- gethostname
---- configure.orig	2010-08-21 14:22:18.000000000 +0100
-+++ configure	2010-09-23 05:57:02.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -13,22 +13,22 @@
  #----- C++ compiler name
  echo "Input C++ compiler name (e.g. g++, no default)."
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 56841adc6b7b..d34135ad6b2d 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -2,8 +2,10 @@ DIST DisplayCAL-3.3.5.0.tar.gz 9913672 BLAKE2B de95217baf18a3b07b51a9db24e37cd96
 DIST DisplayCAL-3.4.0.0.tar.gz 10279645 BLAKE2B cf0b6d841c26d8ee4eec47fa58071e31e1ae4c8f1cd63f08216dbfd33caeb900d767988aa19f1738bdbe3c180954a13be22fdd96187b32edc8b0419b945670be SHA512 a63cda986a70cef844908c5809157af28473b564c97fa4c1b957102401b177b254cd215b1cb7c8192873e6d1b204dca66f5a08862f27e0d2f0c06b6ceeaae25e
 DIST DisplayCAL-3.5.0.0.tar.gz 10371665 BLAKE2B f3854d602857ed260ab5bee3d43f9dafc8b4a55115ea9746c75fa679026493f3d11fd79c68270390de2175639d14796ce2e4cf20e34324b0af037630d118d293 SHA512 968f14edc5fc821de692dfd200c06068c259153afa684fb639f2867a356b435a35b5c7f4120a90c7d3d5ec3b0200cf0c8593bed6c364fcd7130013ec97ac09af
 DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3 SHA512 7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
+DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af SHA512 607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
 EBUILD displaycal-3.3.5.0.ebuild 1518 BLAKE2B d6774180d9cbd3bb17572e96dfcf95b5d8e7f71efa038764dbf0012ad8f56965efb95c2c67e77a9dbf1a4bd07f7e6229a3f9fe9c35fa12417a0b8aada6fd9a18 SHA512 19671a35a80cbfb99d7f5fc2a36884990e791fc02b563efe00131b776320cac1e3c4307877152e07f972ba8aabde879ea3d7d6a4d498560f4cb96c7640459f58
 EBUILD displaycal-3.4.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
 EBUILD displaycal-3.5.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
 EBUILD displaycal-3.5.1.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
+EBUILD displaycal-3.5.2.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.5.2.0.ebuild b/media-gfx/displaycal/displaycal-3.5.2.0.ebuild
new file mode 100644
index 000000000000..d955f9b1fea5
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.5.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-proto/xineramaproto-1.2
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index defcdc76fb59..6b9e8dbcacbe 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,10 +1,7 @@
 AUX fotoxx-13.11.1.patch 1791 BLAKE2B 4630767fb8a348923a6f8b71b37ee05a1fa7230a75dd284329294aaa8ddd50e681a40ebb469049817ffa72fdf4d87d22cbb76b01a7d7521fe6bf5380e06a0711 SHA512 e3543c861fb8e5f5de547b8976d15d86fac20ffc83285d2d9c46d805eb6b0e3fe20de07c4644c9272c7cd44c1a6d43360cb82fc92abc15ca34997353e4cbdf2b
-AUX fotoxx-15.04.1.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 DIST fotoxx-13.11.1.tar.gz 2473330 BLAKE2B 838772cfd6939dafdc58e52a264f86027e9a5dc65ab9ffc82afc11c114ffa71c60e11f1eb54c182696c1ea9231acbd8eb293d1bba485960f26c0ffe8df5b0323 SHA512 c880f5f1a67f12ab081820d4a897912e20985dbad0096d2f4ef1f37d0b2b626dd66c69a593e57b31432a67f79eadd4ea8022dcde01bec865f71ecbfec456caa2
-DIST fotoxx-15.04.1.tar.gz 3491468 BLAKE2B 02d94f354c1a61e2249e6016a270a9d9b027f3327837958008e51f2b20e63e86dd2dfa7ef234b7cef44e42110fea740f2b1ae4ffd401a9057d5b89a4746170d0 SHA512 d70fb437a4aacc18754a7df90fe3b23287ed3d31cbc545ed75ab3eb20cba6c83b4394251553b795c87ab2ecffe551905f9a39d19fead82fabafd646a9691313f
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
 EBUILD fotoxx-13.11.1.ebuild 1164 BLAKE2B f08e5c31562fe3d86b21205a0f0b268227c2d97da587f1aa921084f1be8a2b3a47d407a470ffb1b9cbc54164727e127ff8df3a37f646b35117234db843217315 SHA512 4b33c9b0ab25e83ec19b099779c50a2f3748d1b0fbb5183c1ec700f26347809f3a82dac11ef0b8937567514a5fb2e41ac5079cce3b6f36245e2673f2e17557b1
-EBUILD fotoxx-15.04.1.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
-EBUILD fotoxx-15.05.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
+EBUILD fotoxx-15.05.ebuild 1148 BLAKE2B 7323dfa8337f28cc7dd55fe7d0eb8fdac3fd1d93ab9eb0779b2035d6fc0c8ade7eedc66f3e5f65e27c125e1f81b5f20c67c3c7af0d41c910224045b8c8541c8e SHA512 677e2151018f939e31882592b189d0173003520e16ce15c1ad9059831e3b2b53ff855338efa7a20fdff839838bad62b322b0e42606554eb9b3e9aea74e016656
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/files/fotoxx-15.04.1.patch b/media-gfx/fotoxx/files/fotoxx-15.04.1.patch
deleted file mode 100644
index 15fdaa9abacf..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.04.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
---- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
-+++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
-@@ -16,3 +16,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -90,4 +90,2 @@
- 	rm -f fotoxx.1.gz
--	# menu (desktop) file
--	cp -f desktop $(DESTDIR)$(MENUFILE)
- 
diff --git a/media-gfx/fotoxx/fotoxx-15.04.1.ebuild b/media-gfx/fotoxx/fotoxx-15.04.1.ebuild
deleted file mode 100644
index 5f911c91bb97..000000000000
--- a/media-gfx/fotoxx/fotoxx-15.04.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="http://www.kornelix.com/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/gtk+:3
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/lcms:2"
-RDEPEND="${DEPEND}
-	media-libs/exiftool
-	media-gfx/ufraw[gtk]
-	media-gfx/dcraw
-	x11-misc/xdg-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.patch
-}
-
-src_compile() {
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
-	emake DESTDIR="${D}" install
-	newmenu desktop ${PN}.desktop
-	rm -f "${D}"/usr/share/doc/${PF}/*.man
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index 5f911c91bb97..5ef117c20f77 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs fdo-mime
+inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="Program for improving image files made with a digital camera"
 HOMEPAGE="http://www.kornelix.com/fotoxx.html"
@@ -15,19 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	x11-libs/gtk+:3
 	media-libs/libpng
 	media-libs/tiff
-	media-libs/lcms:2"
+	media-libs/lcms:2
+	x11-libs/gtk+:3"
 RDEPEND="${DEPEND}
-	media-libs/exiftool
 	media-gfx/ufraw[gtk]
 	media-gfx/dcraw
+	media-libs/exiftool
 	x11-misc/xdg-utils"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.patch
-}
+PATCHES=( "${FILESDIR}"/${P}.patch )
 
 src_compile() {
 	tc-export CXX
@@ -39,16 +37,16 @@ src_install() {
 	# and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
 	emake DESTDIR="${D}" install
 	newmenu desktop ${PN}.desktop
-	rm -f "${D}"/usr/share/doc/${PF}/*.man
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
 	docompress -x /usr/share/doc
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index d076ac365893..85d44beab313 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -2,9 +2,6 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
 AUX graphviz-2.34.0-dot-pangocairo-link.patch 882 BLAKE2B 633760e2049f035eeb1b79aedc040da71ca9707acd1ccdba7531c894a1909ebb9e8483319871f2db5e6d4e0ff275449ce682badfa33de232177474111203a62d SHA512 8e40b35d8d1ec6a9e683e4f4f39fd5e6c253015727172ba0ed1cf6d9a3b4cc20e3d4169a11bbed29c3cf3dc8ff6d14508ea6459dd62e53e7d69b62ee39ef9f26
 AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c9ed759468b72c4394d1c96a0ef5f668bd9e8657ae09e54200149bb033845138eaa2587dc783f1e61c2496ccd926cc2aa6bc81aa SHA512 19327b3fbfecdad1990fd4d9668c3f318da5907c1a8c7e3abd1f1f5a0703c474975b7f08425eb2c0f5c32522ebea614d02b4db9e83cce7fb975458fb87cafc62
 AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
-DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
-EBUILD graphviz-2.38.0-r1.ebuild 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983
 EBUILD graphviz-2.40.1-r1.ebuild 7964 BLAKE2B 86ccdfe5320c4222eca9150e3db3fd1c9bcb5c47c51d9782aab637ade7fd07f28a5c8c701fd430848532fe03ed86680fbe3d2b1674779bbb202138981577b0a6 SHA512 d5327a4a2f8d659352fdcecbb4d9981d8181d3706a4098218b146b37706227006a2c687056ce49689ca12d24dd895fcdc6deb8cff6502a9c152d38b4162b620b
-EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874
-MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
+MISC metadata.xml 2154 BLAKE2B 6d4f465488af95c9b49dc6997bc1ea91f87ed83661eab81bf6287afde99ae75c0cdef1a0ee1b1d99269b7fa484aacdbed13e13bb4a79b196564e04872aea0832 SHA512 1063c868fd3d0b6ad636e24d5eb00be84b19ea23266e0cffdc8c1c8da86bfcf05d3f48f29540b6452a2d7485463108e0e91f8546c24e13f95da4ebfb3283cb43
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
deleted file mode 100644
index 4c02f369ce20..000000000000
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?	( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby:* )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/libtool
-	guile?	( dev-scheme/guile dev-lang/swig )
-	java?	( >=virtual/jdk-1.5 dev-lang/swig )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
-		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch \
-		"${FILESDIR}"/${PN}-2.38.0-ghostscript-9.18.patch
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -rf libltdl || die
-
-	# no nls, no gettext, no iconv macro, so disable it
-	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" configure.ac || die
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--without-included-ltdl --disable-ltdl-install"
-
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		$(use_enable gdk-pixbuf)
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio"
-
-	# Bindings:
-	myconf="${myconf}
-		$(use_enable guile)
-		--disable-io
-		$(use_enable java)
-		--disable-lua
-		--disable-ocaml
-		$(use_enable perl)
-		--disable-php
-		$(use_enable python)
-		--disable-r
-		$(use_enable ruby)
-		--disable-sharp
-		$(use_enable tcl)"
-
-	econf \
-		--enable-ltdl \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -f "${EROOT}usr/lib/graphviz/config{,6}"
-}
diff --git a/media-gfx/graphviz/graphviz-2.40.1.ebuild b/media-gfx/graphviz/graphviz-2.40.1.ebuild
deleted file mode 100644
index 955db7b461fb..000000000000
--- a/media-gfx/graphviz/graphviz-2.40.1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?	( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby:* )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/libtool
-	guile?	( dev-scheme/guile dev-lang/swig )
-	java?	( >=virtual/jdk-1.5 dev-lang/swig )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -r libltdl || die
-
-	# no nls, no gettext, no iconv macro, so disable it
-	if ! use nls ; then
-		sed -i -e '/^AM_ICONV/d' configure.ac || die
-	fi
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" configure.ac || die
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-ltdl
-		--disable-silent-rules
-		$(use_enable static-libs static)
-	)
-
-	# libtool file collision, bug 276609
-	myconf+=( --without-included-ltdl --disable-ltdl-install )
-
-	myconf+=(
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		$(use_enable gdk-pixbuf)
-		--without-ming
-	)
-
-	# new/experimental features, to be tested, disable for now
-	myconf+=(
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-	)
-
-	# Bindings:
-	myconf+=(
-		$(use_enable guile)
-		--disable-io
-		$(use_enable java)
-		--disable-lua
-		--disable-ocaml
-		$(use_enable perl)
-		--disable-php
-		$(use_enable python)
-		--disable-r
-		$(use_enable ruby)
-		--disable-sharp
-		$(use_enable tcl)
-	)
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -f "${EROOT}usr/lib/graphviz/config{,6}"
-}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index f76b39ca8a88..8d0090a0b02b 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -36,7 +36,6 @@
 		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
 		<flag name="gts">Enables support for gts</flag>
 		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
-		<flag name="qt4">Builds gvedit front-end</flag>
 		<flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/photivo/Manifest b/media-gfx/photivo/Manifest
deleted file mode 100644
index 519b5bb892aa..000000000000
--- a/media-gfx/photivo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST photivo-0_pre20131115.tar.gz 3145008 BLAKE2B 61051c1f1c49eb3e7ae3c350b27cc4336256a2a299bc84d621f290e4fca6f82c7008dc9f32d0472b2a6ac58c088cfcfa861d06d6a80b5435eeb107fe8f8043e9 SHA512 b98d2dced306325b5ab116c4ba170404a6956d081128095b5315f3b061797290b5a305da73ede9f496659b2b1cc8090cd2f300cfbd311c69db59c8425bd2e047
-EBUILD photivo-0_pre20131115.ebuild 1458 BLAKE2B 334b0db7649d6f3d5b50cc11a916fcf7744465d6e8895184a3ab1720519b6b0a762e90f5c5731da2b86bc1b190a3f26ad2f8a1a2fefbdc13342dd8c65fd698ce SHA512 be35da93ca2e06f4aabfc7eda8ba012bba55579d1c336c2fb9dc4d9cce087e66b6f180750a5efd6fa9398e1aba290426a97e01381bbc01553bcd141557211c06
-EBUILD photivo-9999.ebuild 1493 BLAKE2B a8debba86650cf90124d50680338658e108f6e1d437b819c041757fde57d52d127b51cb1a095cf895840c7bb9f01a3b5f0ffeb446d04fd065efb9ece0e5bf972 SHA512 2c387d172af3f30252d6f803932a7531555c39c1ae1ada20fa05a25b5d090c8254ae42bb9228cb20dfffecaabf3b9ddba2d5260e125bb6397c5342bc05a59a12
-MISC metadata.xml 520 BLAKE2B 2aef363f8e6abb47cd7b9b8431a3e8d37eedcff34b7172b4262cce44a01b6e5d16570d463fd840f02921b0b83baef07828e6c8a5fb12a6987456d8dea6d5ef6c SHA512 5512d1cd2cc680cd8931b5f54874a577ce17360d331a9e3a341274bf5cc6f09d1e036c04044ea2e8ebac65bb45920c09bd5eb742e76e57031f2e46d1a84d09e6
diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
deleted file mode 100644
index 3910c7f010a9..000000000000
--- a/media-gfx/photivo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>opensource@andmarios.com</email>
-		<name>Marios Andreopoulos</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">photivo</remote-id>
-		<bugs-to>https://code.google.com/p/photivo/issues/list</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/photivo/photivo-0_pre20131115.ebuild b/media-gfx/photivo/photivo-0_pre20131115.ebuild
deleted file mode 100644
index f258013d4bf7..000000000000
--- a/media-gfx/photivo/photivo-0_pre20131115.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="Photo processor for RAW and Bitmap images"
-HOMEPAGE="http://www.photivo.org"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gimp"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
-	media-gfx/exiv2
-	media-libs/tiff
-	media-libs/libpng
-	media-libs/cimg
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.8-r1
-	sci-libs/fftw:3.0
-	media-libs/liblqr
-	media-gfx/graphicsmagick[q16,-lcms]
-	gimp? ( media-gfx/gimp )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${PV/0_pre/}
-
-src_prepare() {
-	# remove ccache dependency and fix lensfun header path
-	local File
-	for File in $(find "${S}" -type f); do
-		if grep -sq ccache ${File}; then
-			sed -e 's/ccache//' -i "${File}"
-		fi
-		if grep -sq "lensfun.h" ${File}; then
-		   	sed -e 's/lensfun\.h/lensfun\/lensfun.h/' -i ${File}
-		fi
-	done
-
-	# useless check (no pkgconfig file is provided)
-	sed -e "/PKGCONFIG += CImg/d" \
-		-i photivoProject/photivoProject.pro || die
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local config="WithSystemCImg"
-	if use gimp ; then
-		config+=" WithGimp"
-	fi
-
-	eqmake4 "CONFIG+=${config}"
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	if use gimp; then
-		exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-		doexe ptGimp
-		doexe "mm extern photivo.py"
-	fi
-}
diff --git a/media-gfx/photivo/photivo-9999.ebuild b/media-gfx/photivo/photivo-9999.ebuild
deleted file mode 100644
index 8bfa2a2968b7..000000000000
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2 mercurial
-
-DESCRIPTION="Photo processor for RAW and Bitmap images"
-HOMEPAGE="http://www.photivo.org"
-EHG_REPO_URI="https://bitbucket.org/Photivo/photivo"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="gimp"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
-	media-gfx/exiv2
-	media-libs/cimg
-	media-libs/lcms:2
-	media-libs/lensfun
-	sci-libs/fftw:3.0
-	media-libs/liblqr
-	media-gfx/graphicsmagick[q16,-lcms]
-	gimp? ( media-gfx/gimp )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# remove ccache dependency
-	local File
-	for File in $(find "${S}" -type f); do
-		if grep -sq ccache ${File}; then
-			sed -e 's/ccache//' -i "${File}" || die
-		fi
-	done
-
-	# bug 560120 - fix includes for lensfun.h
-	sed -s -e 's:lensfun.h:lensfun\/lensfun.h:' \
-		-i ReferenceMaterial/LensFunSample.c \
-		-i Sources/ptConstants.h \
-		-i Sources/ptImage.h \
-		-i Sources/ptImage_Lensfun.cpp \
-		-i Sources/ptLensfun.h || die
-
-	# useless check (no pkgconfig file is provided)
-	sed -e "/PKGCONFIG += CImg/d" \
-		-i photivoProject/photivoProject.pro || die
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local config="WithSystemCImg"
-	if use gimp ; then
-		config+=" WithGimp"
-	fi
-
-	eqmake4 "CONFIG+=${config}"
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	if use gimp; then
-		exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-		doexe ptGimp
-		doexe "mm extern photivo.py"
-	fi
-}
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 00286547d8e0..79ffc0ca4c77 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,5 +1,4 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
-EBUILD sane-frontends-1.0.14-r3.ebuild 1383 BLAKE2B 7d052cc6d4a264882a6c9911da71ee72cb95d3d3c721ebc6cf22fbdfc14707c30022bc7e68aaa1fb4c4eddfd96ccd64ea841e898d30cc02456d089a8f8645a5b SHA512 5eb78a706d3b41f60365e17fbc9f0c1ad619e8bc815c1e8615ea1cccd7050fa564e98dd33991f4f8cf2d9e862606d8351c3a17449d561e43a3f2b20ca3a98de7
-EBUILD sane-frontends-1.0.14.ebuild 1430 BLAKE2B 9f579d1cc997961f304479a4070f2630fb0e34cfb128b64671ad4278b1fe4fd52ab227cbdb51941a04eb10051a19b1dc9ece6233e452b62f19e177afe4d79ec7 SHA512 0f433d8f9915d2ba644b3d76e04e9b3bd208a8c9f3c62067203e0e5b571deab87f2577114f846143d3ca860ecfca9b383a8a3d0f470047009754ae0853ca4e30
+EBUILD sane-frontends-1.0.14-r3.ebuild 1382 BLAKE2B ec2f7988fcd51ee8bdd99949393e59f1c7de97b27804e9bd835487ccb3a7858d64e2d70739ef49887cd79383524851104c8d772e65130e926350117b3dc40028 SHA512 9d2ffc16ebedeaf68b97eb7c6fdff50a0984636fb305e189979195dd2ff028188a7c577050b5869a2c6ed7af137c9d2378d762bfc9e4cd68d62ebeb72554723c
 MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
index 7a660c37865b..c0ce393bb43d 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="gimp gtk"
 
 RDEPEND="
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
deleted file mode 100644
index 536163b61125..000000000000
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="Scanner Access Now Easy"
-HOMEPAGE="http://www.sane-project.org"
-SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gimp"
-
-DEPEND="media-gfx/sane-backends
-	gimp? ( media-gfx/gimp )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/MissingCapsFlag.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use gimp || myconf="--disable-gimp"
-	use gimp && ! has_version ">=media-gfx/gimp-2" && myconf="--enable-gimp12"
-	econf \
-		--datadir=/usr/share/misc \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local gimpplugindir
-	local gimptool
-	emake DESTDIR="${D}" install || die
-	if use gimp; then
-		for gimptool in gimptool gimptool-2.0 gimptool-1.2; do
-			if [ -x /usr/bin/${gimptool} ]; then
-				einfo "Setting plugin link for GIMP version	$(/usr/bin/${gimptool} --version)"
-				gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins
-				break
-			fi
-		done
-		if [ "/plug-ins" != "${gimpplugindir}" ]; then
-			 dodir ${gimpplugindir}
-			dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage
-		else
-			ewarn "No idea where to find the gimp plugin directory"
-		fi
-	fi
-	dodoc AUTHORS Changelog NEWS PROBLEMS README
-}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 228a594c7be9..882b2e4f9b66 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,4 +7,4 @@ DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15
 EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
 EBUILD slic3r-1.2.9-r2.ebuild 2472 BLAKE2B 60a07b07348bec52717fa7476286030dd0ff9bda794c634e054386d67a46d3a640429eb8d301b356cf8e01d08f0b73777ae33944a2a65a7882618bca5ef16a95 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795
 EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
-MISC metadata.xml 1166 BLAKE2B c5ccfe10e50fef8d5729e4c5887a66a524ede1262acc8934e393dd0d3c4bae24cce2b34bd8cb5a1063bf5b8950ee6837e74a48caa6100bf7cbe25e41716914bb SHA512 8fa8adf81c468d72253218f1e5c4c42e8546a89166c3a3158db17b7504c13920abe7bc4ce3efadb4e6fa035d23d3a509c844699ac80b417dd16b570a6f6f213e
+MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index c0f39d3c0420..a21a04deb389 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>Proxy-Maintainer; please assign him to bugs.</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Gentoo Proxy Maintainers Project</name>
-    </maintainer>
     <maintainer type="project">
         <email>3dprint@gentoo.org</email>
         <name>Gentoo 3D Printer Project</name>
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index d6e83af1c72c..919565872c9d 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -6,6 +6,6 @@ AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 EBUILD ufraw-0.22-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d
-EBUILD ufraw-0.22-r2.ebuild 1969 BLAKE2B af42a710863a36e7dc7e7ba5a40dfde787a21af5023bfdb2d8d6bb2588498fbe04c3adfaa1f43cab90ab8d3272dc340d2cb3ab1c64c114bc551e9c16a5b36262 SHA512 c134d1dc3f46bb48712e223f00a36cd67d1f919f9e201b3c5e17dcb94bab17d2cab349b22139f6f8bf7acea5044aff1cd6e7adb061af4ab63d64162d9aebaa32
+EBUILD ufraw-0.22-r2.ebuild 1968 BLAKE2B 32eec969ce988629e5e0b3d8c54f200c866909a6b4556ec52dbdb3f7cf6b9712a74193b36afc9e35f465507be7a0a2c769979746d0a991092a254567173b1912 SHA512 aeb94e7987b34ee68a618b18129695ad7d9151803f18decc3dd1b20934109e4d3c1f1bb2d825981a37761f11ef099f42e86a2e82e26cde11fbb2cd514fb7199a
 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 0c33b6448d38..53994be42a82 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"