gentoo resync : 29.05.2018

29 files changed, 725 insertions, 508 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9ac5b8f32478..386b1c6d0b26 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index dad66575e4d1..1314067f0b5b 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -7,8 +7,8 @@ DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10
 DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2411 BLAKE2B 5a9add557477f4eeb8c238abe1bdc920459c2a31eac3ee0c8590177fcfe8c1b0b0d9b9ff4f0d3a4b67d9ec74be0ff771b2b52c459faccf99e615e0189e41ea68 SHA512 9f5751e6235c647dc201051d2474139f2818b0859d8e68affd956798f1ad808b5774ee429af79a6f4c7e7e43d950a002ab47613457c381a8ab03c49008dfae06
-EBUILD fbida-2.13-r1.ebuild 2394 BLAKE2B a547b694e6b673d80d5b4d310fc961ad2e1f934adb2755ff8c4be7983ec65b2b1a033aa7968f8c6b3b6a393ba6e455bbfacfb83ef856903a82990a6cdc6ce14f SHA512 e8742e6e4066528e34de84acb77793cf16f6d7e15ed73f67900996edd89627bfd0481050b3415e0def12842afdd5d3f62fc649a9b465b9972b5769b4dcec5800
-EBUILD fbida-2.14.ebuild 2347 BLAKE2B 85cba0bded39065c035ec211e9ba6eec061f2002c8c14b44bf85a4e293d8172167a90153938f0633f1cfc865fca07d69e29eaea23dfe60e436323e286283e1a8 SHA512 0fc2739e69188e78810ad03d63bf30befa60f4b844fddeb317147969dc1827046faed6ee47b2408ec1db2f04749dd07f1df95605c494fa6cc5e66979d559b404
-EBUILD fbida-9999.ebuild 2437 BLAKE2B d0484c989733beb14fe4c405ec1b866360b2b99c82c5bd60345b7ce38267e3436e18a5b3924b84c0872e6df0c6f4b3c21b258193c0f1cdd9158afffc73a00239 SHA512 931810acfdaf13bbb51c5aaf2c6fcfd56ef67b7e073d0e15c430d8c2fcc314cdcc9d256aa18c2798f80deec4c2e42f91e9f4a16df01973120750e56f13766c2f
+EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58f44226bb33a6a0b5fbbcb8fdd3508e49714043ae95d02c7e52ac9a5a93d3403aadcd50aaaae69f3674ecaf SHA512 a90449e66ffb678b4eee8013dc634db4e3cb1a933405aa6c6ba0dbe1ff5cbe4df49ebab421ce3e175160fe2f9617a2dc6a7ec3f5f213f38082f9727e47fa53e0
+EBUILD fbida-2.13-r1.ebuild 2396 BLAKE2B 426cfd4ba38a58edb391a4985f37d4e58d018e575b0a128c3506cc7835e5f2a7ca967482e53a9c71139d929ba80bc5d407c55d5ab3f2cd221e489ec3555dfb08 SHA512 163007a96ada9fbbc6937e82a53de1c7dc7d07b20faf68e3b2bfd94baef32541ecf6fa4deb8dc213200e767823950f0625da03c0c058a282e31246481b9ed71c
+EBUILD fbida-2.14.ebuild 2349 BLAKE2B be5d3538f93d23fd806f9a6488e13156907341cb93dad8a180d02bedf1986d6093d76ec55d4fc7a06fe0e60cb14f0638941b893edc592e2d7680f27c537d7e1e SHA512 18228be236b992885dbf5b9d04289cc36a2d8b348319b24735f9868cb0038cafeee508d87fa5a50c33c433a8c3b8c68ac1ebf28b0a8727336ec023762a38cd18
+EBUILD fbida-9999.ebuild 2438 BLAKE2B 4d7d861cb734cc18a4e14c4fa20c57ce423f014e787fed9c3a64af1414bfead1f574650c2f081d675bd9fe34bf8e35b9af37101a457182fec894c77ba2997c9d SHA512 79f044737d5f3f3b1214dab5a8c142cc4138a421bdd9a3d68167469a03f4401c582923309400bb3690551b0d580fb878bca9d8d6233c813ab9234fc341d172ac
 MISC metadata.xml 505 BLAKE2B 2493a8f25224980e0ac358b104a248d522e7b1ab3846dd9d97b722c1a0b8b4a6f131677893092755c31670a162afde5662467d3a7fd660c7af28e39cc2dbca35 SHA512 cbd85cfd39d20a07c679f9f98d487795136ee1611fa69712d0539bc94d354a5a76fa59ea9c1da8b4ea7764e705ed16a4f3f77e0783525001c0ee5467a1af6a2f
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index 21c9c5498dc4..60d4488e76c1 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -5,9 +5,9 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
 SRC_URI="
-	http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+	https://www.kraxel.org/releases/${PN}/${P}.tar.gz
 	mirror://gentoo/ida.png.bz2
 "
 LICENSE="GPL-2 IJG"
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index ca112ea82bfb..d61d08b86254 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -5,9 +5,9 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
 SRC_URI="
-	http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+	https://www.kraxel.org/releases/${PN}/${P}.tar.gz
 	mirror://gentoo/ida.png.bz2
 "
 LICENSE="GPL-2 IJG"
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 0df94d361425..2783b914577e 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -5,9 +5,9 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
 SRC_URI="
-	http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+	https://www.kraxel.org/releases/${PN}/${P}.tar.gz
 	mirror://gentoo/ida.png.bz2
 "
 LICENSE="GPL-2 IJG"
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index ff4be7c5c7ab..d2f3b8d0b085 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils git-r3 toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
 EGIT_REPO_URI="
 	git://git.kraxel.org/fbida
 "
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index ea96432302ac..67e7b048f26f 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,8 @@
+AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c621d9b47f087397d417d854f593576229fac3d0ec17c5ba95bd4d44b75b270ceb754d50bd5388c96f542af7d21fb SHA512 fff7b217002d4f270ba20bdce9dcec44b4d1a68f4ea5df45880f5766b897ae8dcf051612416aac28e80d6063c9a461acbac998bd51eef1878bf590a8d75d0963
 AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
 AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
 EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89
+EBUILD fontforge-20170731-r4.ebuild 2844 BLAKE2B 2b42a9048d545839af49d9ffa42956f0bcfefce27d2fafab9465e8c4009d65ee558ed2d49e47a6f42998552cba3711e1c0f309d3b0c12b8e57ed753a1fe6123e SHA512 06f8e05ca9b5bc02f98bcd370283ace4ae1486edaab33ce9803effb404fcfb97fa13355c98a0ed9a0e9c9787cbf39681148e9ebebbbce6679419571ca3fffd7b
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch
new file mode 100644
index 000000000000..48301dabb2f1
--- /dev/null
+++ b/media-gfx/fontforge/files/20170731-PyMem_Free.patch
@@ -0,0 +1,197 @@
+From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Wed, 13 Sep 2017 17:22:18 +0800
+Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used
+
+https://docs.python.org/2.0/ext/parseTuple.html
+
+diff --git a/fontforge/python.c b/fontforge/python.c
+index 5d6820c40..c6d7aca2b 100644
+--- a/fontforge/python.c
++++ b/fontforge/python.c
+@@ -607,7 +607,13 @@ return( NULL );
+ 	}
+     }
+ 
+-    if ( !SetPrefs((char *) prefname,&val,NULL)) {
++    bool succeeded = SetPrefs((char *) prefname,&val,NULL);
++    if (val.type == v_str && val.u.sval) {
++        PyMem_Free(val.u.sval);
++        val.u.sval = NULL;
++    }
++
++    if (!succeeded) {
+ 	PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname );
+ return( NULL );
+     }
+@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) {
+ return( NULL );
+ 
+     ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom));
+-    free(name);
++    PyMem_Free(name);
+ return( ret );
+ }
+ 
+@@ -1361,12 +1367,14 @@ Py_RETURN_NONE;			/* Well, that was pointless */
+     if ( import==Py_None )
+ 	import=NULL;
+     else if ( !PyCallable_Check(import) ) {
++	PyMem_Free(name);
+ 	PyErr_Format(PyExc_TypeError, "First argument is not callable" );
+ return( NULL );
+     }
+     if ( export==Py_None )
+ 	export=NULL;
+     else if ( !PyCallable_Check(export) ) {
++	PyMem_Free(name);
+ 	PyErr_Format(PyExc_TypeError, "Second argument is not callable" );
+ return( NULL );
+     }
+@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) {
+     if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) )
+ return( NULL );
+     LogError(msg);
+-    free(msg);
++    PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+ 
+@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) {
+ return( NULL );
+     if( showPythonErrors )
+         ff_post_error(title,msg);		/* Prints to stderr if no ui */
++    PyMem_Free(title);
++    PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+ 
+@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) {
+     if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) )
+ return( NULL );
+     ff_post_notice(title,msg);		/* Prints to stderr if no ui */
++    PyMem_Free(title);
++    PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+ 
+@@ -1511,8 +1523,8 @@ return( NULL );
+ return( NULL );
+ 
+     ret = ff_open_filename(title,def,filter);
+-    free(title);
+-    free(def);
++    PyMem_Free(title);
++    PyMem_Free(def);
+     if ( ret==NULL )
+ Py_RETURN_NONE;
+     reto = DECODE_UTF8(ret,strlen(ret),NULL);
+@@ -1534,8 +1546,8 @@ return( NULL );
+ return( NULL );
+ 
+     ret = ff_save_filename(title,def,filter);
+-    free(title);
+-    free(def);
++    PyMem_Free(title);
++    PyMem_Free(def);
+     if ( ret==NULL )
+ Py_RETURN_NONE;
+     reto = DECODE_UTF8(ret,strlen(ret),NULL);
+@@ -1558,8 +1570,8 @@ return( NULL );
+ return( NULL );
+     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
+ 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
+-	free(title);
+-	free(quest);
++	PyMem_Free(title);
++	PyMem_Free(quest);
+ return( NULL );
+     }
+     cnt = PySequence_Size(answero);
+@@ -1568,16 +1580,16 @@ return( NULL );
+ 	cancel = cnt-1;
+     if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) {
+ 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument");
+-	free(title);
+-	free(quest);
++	PyMem_Free(title);
++	PyMem_Free(quest);
+ 	free(answers);
+ return( NULL );
+     }
+     for ( i=0; i<cnt; ++i ) {
+         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
+ 	if ( utf8_name==NULL ) {
+-	    free(title);
+-	    free(quest);
++	    PyMem_Free(title);
++	    PyMem_Free(quest);
+ 	    FreeStringArray( i, answers );
+ return( NULL );
+ 	}
+@@ -1587,8 +1599,8 @@ return( NULL );
+     answers[cnt] = NULL;
+ 
+     ret = ff_ask(title,(const char **) answers,def,cancel,quest);
+-    free(title);
+-    free(quest);
++    PyMem_Free(title);
++    PyMem_Free(quest);
+     FreeStringArray( cnt, answers );
+ return( Py_BuildValue("i",ret));
+ }
+@@ -1608,23 +1620,23 @@ return( NULL );
+ return( NULL );
+     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
+ 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
+-	free(title);
+-	free(quest);
++	PyMem_Free(title);
++	PyMem_Free(quest);
+ return( NULL );
+     }
+     cnt = PySequence_Size(answero);
+     answers = calloc(cnt+1, sizeof(char *));
+     if ( def<0 || def>=cnt ) {
+ 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument");
+-	free(title);
+-	free(quest);
++	PyMem_Free(title);
++	PyMem_Free(quest);
+ return( NULL );
+     }
+     for ( i=0; i<cnt; ++i ) {
+         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
+         if ( utf8_name==NULL ) {
+-	    free(title);
+-	    free(quest);
++	    PyMem_Free(title);
++	    PyMem_Free(quest);
+ 	    FreeStringArray( i, answers );
+ return( NULL );
+ 	}
+@@ -1634,8 +1646,8 @@ return( NULL );
+     answers[cnt] = NULL;
+ 
+     ret = ff_choose(title,(const char **) answers,cnt,def,quest);
+-    free(title);
+-    free(quest);
++    PyMem_Free(title);
++    PyMem_Free(quest);
+     FreeStringArray( cnt, answers );
+ return( Py_BuildValue("i",ret));
+ }
+@@ -1654,8 +1666,8 @@ return( NULL );
+ return( NULL );
+ 
+     ret = ff_ask_string(title,def,quest);
+-    free(title);
+-    free(quest);
++    PyMem_Free(title);
++    PyMem_Free(quest);
+     free(def);
+     if ( ret==NULL )
+ Py_RETURN_NONE;
+-- 
+2.17.0
+
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
new file mode 100644
index 000000000000..046325111fab
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( png python )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+S="${WORKDIR}/fontforge-2.0.${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch
+	"${FILESDIR}"/20170731-tilepath.patch
+	"${FILESDIR}"/20170731-gethex-unaligned.patch
+	"${FILESDIR}"/20170731-PyMem_Free.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
index d56c08b06cce..8f4638a3fc63 100644
--- a/media-gfx/gliv/Manifest
+++ b/media-gfx/gliv/Manifest
@@ -1,8 +1,6 @@
 AUX gliv-1.9.6-as-needed.patch 2864 BLAKE2B c0d8ceb61fc961d6a8a3e4ac9eeb7dc5b9d5f1a4d67909a8dcf809632260a389089ea245b52a097db2eedf66caf184132aee7627ef3c8a269533e5b0029669a0 SHA512 594614f5190f9401d7759c26676a43d6a60cc81ca73e79536f5b4969252189d6a45293069f8426ed5e5ffb5d5c8a3f7e103a6243de6d6f182a20331802d16d01
 AUX gliv-1.9.7-as-needed.patch 2374 BLAKE2B 2b8ee4ddd7c9c587ca7b592a8797dde3eea655e88367aadb03d4bcf0407a4d14008a09d79026d75d26d75c0eb079c786f1cdc7fd9e3511fb7b8561e05290eff0 SHA512 8923b579d87079cffec3db5e5f00cc35c3bd516f1a878bc4d0e916150617a4f06d5ba3604d44dd128110e4398de5ab26ee8eef1d85dac74b4122e589eb6ad19d
 AUX gliv-1.9.7-destdir.patch 914 BLAKE2B 78f14a26e60282c2afa7e768affe442c9123c2b5860690b427067d732b46aed745a3ebb51ecf5bd424b3ff7c9dd186666843a88a0330fa10c57d58890a3aade7 SHA512 1d83c62b470889260365a5ac24de591a8e817dd9d0d10d68cbf1a7ca27b544f44940b37f316956b5a4d79ce33eafb7c41a8c6cd6d943e35fba8e9fbfd1f0c9ed
-DIST gliv-1.9.6.tar.bz2 518971 BLAKE2B 4ea035489ed9d4e14380f32818221b30c9e4b52cf612e3d903c925400915ce7ac4dabc6eac47d2bc7a0d981dbf5b24ad27de1ee11b106bf0786a8117885567cb SHA512 bf6e7108308884d50dc47faec7d65ed27c2ea1521cfc526fb8929675d52b3437276da904c8240c5c227d7bca2d0c268311f4fdc9b2d936fecda33318ad6bce6c
 DIST gliv-1.9.7.tar.bz2 644305 BLAKE2B 9f31c9fbedff833966bf16366fc3ef73aae0dc190146fc42f67d9abfc426ebc0c496931f3c9ca14df0e9c4e18310d7d54603c13e4d4cc6d1cae93b84b8737235 SHA512 c2276bde4b13d0dc910062e8cdec8836d751ce25e5120f4fd7987c9ba5bd62844a71a5e92c1ccf766393b47f2ff95fc3298051d3729e38696fccc024be388c4e
-EBUILD gliv-1.9.6.ebuild 908 BLAKE2B d41fdb6efd147db08733c038c1413cf3509704ce4a4aea2656bf98907e678e51893834f067fabaa42231ce4e1e143dc5ab9f985a4780e15e3ff1f6decb5fb8dc SHA512 471c74c5c7210176e82e4d9f006957a670800e83774788af0d27889b178cf2b85978e1c92dc41357d4e306d1ff6e8ab6c1a1c8287da3217f7c85fb80e3d8280e
 EBUILD gliv-1.9.7.ebuild 972 BLAKE2B 7bf0a69a25b47ce9e727c5f8e1f1514adb02c0233c4c5729dba90da64b7f81d88c2beb8321c4fcef65f520dd1fd9d31113ddf7d8017aaa34fa7880402b817cce SHA512 b3bfad666ab3aeb0abc354ce92a0f733e4618e5a8bf74b9e5de1b79b0c14e0087222150f3eb9c2d73f49f037b0ca4cedd89ecd020334b7de9cb141765dc7df5f
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gliv/gliv-1.9.6.ebuild b/media-gfx/gliv/gliv-1.9.6.ebuild
deleted file mode 100644
index d68de9e05556..000000000000
--- a/media-gfx/gliv/gliv-1.9.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="An image viewer that uses OpenGL"
-HOMEPAGE="http://guichaz.free.fr/gliv/"
-SRC_URI="http://guichaz.free.fr/gliv/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-		virtual/opengl
-		>x11-libs/gtkglext-1.0.6
-		nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		>=sys-devel/bison-1.875"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls)
-}
-
-src_install() {
-	# Needed if desktop-file-install is present, else we get
-	# sandbox violations.
-	export DESKTOP_FILE_INSTALL_DIR="${D}/usr/share/applications"
-
-	einstall || die "make install failed"
-	dodoc README NEWS THANKS
-}
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index fef44a3cf59e..6d4e3c5b1c1d 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3.ebuild 636 BLAKE2B b0d886ba9fde77b05a3128a9ef0dc86f106ce4734e1b0b41715ea9cab902906c4a1d40551452e3deb73e9ae872a3fa3f04945d6d3c4542cfc8c411ea9fd8da04 SHA512 94d11d743fbb7004c6d40612d1df7d498175f939ef7893399d0cd8c05a3b8bdf74b3815267e82f9854b9e150752050e815a21c67bcb2b9fb91fd245995d47f43
+EBUILD icon-slicer-0.3.ebuild 519 BLAKE2B 5478e53d8e1426b40dd8d4317f30767a26cf27c32b8e739ebbfc8b61be9743379a94990de7502df6189e35bb1179fb0cc891e249d5b8005f0c9fa8026fefe1dc SHA512 e06f52423d741b22e6904aa4f6c2289eb96dc616a27ab210bfdf56e5989e4dbb5abc8c8598d3a0dbee15831ff0cb3955be143ad9752b2b1a18b76342d1f1466c
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
index 6673de8de85b..65d61ae11ded 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="utility for generating icon themes and libXcursor cursor themes"
 HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
@@ -17,8 +17,3 @@ RDEPEND="x11-apps/xcursorgen
 	dev-libs/popt"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4288f4b7aca4..0e48d8da1a53 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,17 @@
 DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
 DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
 DIST ImageMagick-6.9.9-43.tar.xz 8912476 BLAKE2B e6106b321c68c05f048eeaa0beaaa87fe724556d9b16842bd0643d806f3a2cfae3016bc835dd9fe1f9842e8fd61ee52c6ddceea6ce44d9c265387cfd35b57d89 SHA512 ff5b7daf521b6e0ae8cc123a56eca72e2abafd08101f0134866745ddafe21c9a08a1f6c73218bc3d95d8afc79dd0f66926d514b2c6083468391efead5afac6e7
+DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
 DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
 DIST ImageMagick-7.0.7-31.tar.xz 8613064 BLAKE2B 6d4f731002cf099b5fc007e645fbfec32fb87b5f9b77f1c8a15897fed44c5fe55f8d356775675c709cf3ea600a2cbf67b8b9c7d7a0cec5c55647714d5d0ade27 SHA512 6575c009b021eb759e2129908e8deafcfa766758aae0b8f51d8b0c555444440c404bf20df63671259315b7e33476322217e3239aa2ba1c8b938996d54e988ee5
+DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
 EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
 EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
 EBUILD imagemagick-6.9.9.43.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
+EBUILD imagemagick-6.9.9.47.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
 EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
 EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
 EBUILD imagemagick-7.0.7.31.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
+EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
new file mode 100644
index 000000000000..52e77059cb1d
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
new file mode 100644
index 000000000000..1db0353011d7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index ddf4b828251d..b704ef190265 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,3 +1,3 @@
 DIST jp2a-1.0.6.tar.bz2 306975 BLAKE2B 284925e791423a1871347f8dfc9574c209192c8a583a0b3221142adb35ad32c2d00a47412c85df038237f4e1adf604324fb15440c33ca06290ee382fd90930ff SHA512 00c7f7b62a3d1f4238d7513167eebd6ead9447ac90b66fd3f9529f6e99dd1a021385ff970aabd005a88db1614636be57547494dfe00c7e687a11953066a6ecce
-EBUILD jp2a-1.0.6-r1.ebuild 626 BLAKE2B fa816faef5b3c656a8e34fa54f7e3cacdf88bfe38ce16ed6a7054939055d2cfc69fe7b45961ec5082136919186adb8ae58f179e4f749a22d594dbbd818d6ae72 SHA512 173fe4cbae8933db42cfd77c29cb259ff862c7c46231c2fdf21edf8c6aa6def687e71c050cdf4116b4b76dae01defea1531149d2d5273b38a4f15edb23dd457e
+EBUILD jp2a-1.0.6-r1.ebuild 540 BLAKE2B 1c6da03a53ce91dc755f47808cf35f42bf1ff5c2c4b1d060258bf990b91ff3cac52fafbbc44637adf83ed70e00e577997ad00ab0534ade1e14a60ba437db2413 SHA512 6df072f5657e8503fb2078200a26320af7e48a0ac80201545e23753041d1d6c44c2324c669dc52cf34a728809a6a1c1cb4a8f87f92011ac7241fd4a7e633dc0a
 MISC metadata.xml 329 BLAKE2B e3d5c2031cac3a1017505e8298894dad149c0e00e63e2c50876c2ab5d1ab5817232971d107356ecd54ced58c1321d743f4eabbba3be412e0f048128aa41e6314 SHA512 c86c3d7a051e7b1b89fbaa8315f073490e5fbfaeac9cbef1551d453d485f52cc4f1a664e5ec14be9b751d7771780e4a8a891bc0d6558c3154e9d3b04835a63b0
diff --git a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
index 921a7338c888..92bd292af749 100644
--- a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
+++ b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="JPEG image to ASCII art converter"
 HOMEPAGE="http://csl.sublevel3.org/jp2a/"
@@ -17,13 +17,9 @@ RDEPEND="sys-libs/ncurses
 	curl? ( net-misc/curl )"
 DEPEND="${RDEPEND}"
 
+HTML_DOCS=( man/jp2a.html )
+
 src_configure() {
 	econf \
 		$(use_enable curl)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml man/jp2a.html
-}
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 55d87e122cfb..a945198e8cee 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
-DIST maim-5.5.tar.gz 39571 BLAKE2B 82235f4c90c32e26a4a6e3ef7cf544ae8958204383af1160bf3c8bfca9df19d0d92a4aec8acd2232afc8ae72eb6850c0cd09e2554e3affbf625b19b0beee1c50 SHA512 e98c5dfbc41c8948e9acb219e78adbc69d61caaa100bc69cc70c446dc895fb4d93d6d42cbd2da8096af9e6769f13e9af13bd4b66249eca6dd8a0eadfb11622ac
-EBUILD maim-5.5.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
+DIST maim-5.5.1.tar.gz 39601 BLAKE2B f87daf54bad43ba92d57878cd2f368eb071aa43f1258125895e676fec1bb407308d72807cb200f8887d376b8c3b81885fc0cb31ba15115ce8f670aa3ad458425 SHA512 72bbf945df21403f51ccd8d2e5775e1a229ad6b362c4a1eb29d92d1b2fb679a48703bc195476e7ec9e661be7a6f1c076199a7d881a40b82fa99c1ded7d2be118
+EBUILD maim-5.5.1.ebuild 884 BLAKE2B 07480cf8d249dadb6379146d114506e34300eb5afb4c4080a564321288d1329164238aa325c2f355bb58f22bf8873e7fb400be53cfa83a6e02a346d3da58f4c1 SHA512 b9e93ed46bfb17b12c5f346b8ea8dc7f07a4aa77915f10243c96d2db33c1d33607dfda2c5ef323c2f7155dacd3b3e7afbea7260071cab5ea04364075410dc118
 EBUILD maim-9999.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.5.ebuild b/media-gfx/maim/maim-5.5.1.ebuild
index 60cae2903780..cb8869b7b809 100644
--- a/media-gfx/maim/maim-5.5.ebuild
+++ b/media-gfx/maim/maim-5.5.1.ebuild
@@ -31,7 +31,8 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-misc/slop:=
-	unicode? ( dev-libs/icu:= )"
+	unicode? ( dev-libs/icu:= )
+"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index fe428d56be28..89fb34dc12a3 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -3,11 +3,9 @@ AUX openexr_viewers-1.0.1-gcc44.patch 1064 BLAKE2B 6142b8195a0ee03e1e8f7c0f711cf
 AUX openexr_viewers-1.0.2-nvidia-automagic.patch 472 BLAKE2B 52a9adbbf2c809433009b20e4ca6655eb837dedb368a7eced8d38f52941278355d8385a8c185feecb138a239fcd33373e3b0dd866c85e59f3410b96c26a15980 SHA512 777b8635b4454ea9c8c9bcd1b707012218ba16c523a105e987e897a17b126a2e11d986bc566cfe1a87a1af2df3336ec53e5ff8cc54cdc01ea7752947dac140f4
 AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
 AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
-DIST openexr_viewers-1.0.2.tar.gz 482009 BLAKE2B 3a7a5590cee85828d427b38029228b76f2515e3781fc49b24b0ef7798d6ebbc34b073cae42ec8df3d4e67a1e23ffd3dbf496e72218892c7c06b06b1e9d4ec2a5 SHA512 06e01be3310a05c5709cdb4641f230522a5d91d50b08b6736a5541d20a03decfd80a9f5b65af383659a3d19407f932317c04eba73d199c03fa0ff9e24cc7ad07
 DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
 DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
 DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
-EBUILD openexr_viewers-1.0.2.ebuild 1344 BLAKE2B 759ada29ee11d72a7e4eec696c78a0568f4cc6417c6aeb3de485fe96cae8a611ff42225676f6a183de316f702dae0bd31a70ef29e40ea624dc440e84cfb29855 SHA512 63b0ea14ad2d03ff80c387218eaaebf9ed9d482488489f186592f73ce1cd87638abbec4674cc1049c23fa976b705cc521b267cd6cea424cb0079298aedbdb7b0
 EBUILD openexr_viewers-2.0.1.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
 EBUILD openexr_viewers-2.1.0.ebuild 1220 BLAKE2B d3eece43d3c4c80570fe7a385e5f353d91414d5bfb2573a0f155c7d842e7da23c67633f6d967af1a5b2f2b4486ba8d6491f3ce5bc80f27b6a7da87369f67067b SHA512 f2132a37c732990c3043fdbbc2db64ef46e4fc4b87938233c6c96d95224665c28b6e6171a98eff1b80852717850224a0c042600cbb63beb0054c3a0d49287fce
 EBUILD openexr_viewers-2.2.0-r1.ebuild 1228 BLAKE2B 6406bb6f15b05d1ae4b0a4aeba3eeb149a0860fd371673fbb2ddb8a597b071fb93274aaf361e067ce4c037d7c4d017c4dbfc232b6d0791688832596bfc52e6ff SHA512 5a2f7c5b8978e32e766cf5da6f089db8cdedc5522e44a619faca728d73398fefa11924ab34e3dd7a5eb0b4f6d0595b442d6dcca9e3fc66491bf58cce134cd6ce
diff --git a/media-gfx/openexr_viewers/openexr_viewers-1.0.2.ebuild b/media-gfx/openexr_viewers/openexr_viewers-1.0.2.ebuild
deleted file mode 100644
index 0e0a93ad8c14..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-1.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-SRC_URI="https://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-HOMEPAGE="https://openexr.com"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="opengl video_cards_nvidia"
-
-RDEPEND=">=media-libs/ilmbase-1.0.2
-	>=media-libs/openexr-1.7.0
-	media-libs/ctl
-	media-libs/openexr_ctl
-	opengl? ( virtual/opengl
-		x11-libs/fltk:1[opengl]
-		video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) )
-	!<media-libs/openexr-1.5.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nvidia-automagic.patch \
-		"${FILESDIR}"/${PN}-1.0.1-gcc43.patch \
-		"${FILESDIR}"/${PN}-1.0.1-gcc44.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use video_cards_nvidia; then
-		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
-		append-flags $(no-as-needed) # binary-only libCg is not properly linked
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable video_cards_nvidia nvidia) \
-		$(use_with opengl fltk-config /usr/bin/fltk-config) \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}/pdf" \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/pqstego/Manifest b/media-gfx/pqstego/Manifest
index 156b7cc599c4..8213466935e9 100644
--- a/media-gfx/pqstego/Manifest
+++ b/media-gfx/pqstego/Manifest
@@ -1,3 +1,3 @@
 DIST pqstego-0.0.1.tar.gz 156170 BLAKE2B 1d86b421c81189a63ec95b6aefdeb9e92189059e8638f118c3918ea0ae9e4fd8800e4b64cccb1a4f8d92fc8e6f2853c4e7d81fb1787f061e2665525b6aa7d53f SHA512 cc29f745ed6f4af27f491a2b97cc614b4bddd88bbfda9d2a2737c8c6a4a013e0ea6cb125cf579b3a792c060f8ed4c176af61a2ea0a309108176b463dd002f999
-EBUILD pqstego-0.0.1.ebuild 532 BLAKE2B 5acf7e3679925c04a06971f385741821c5bf610aa85ee7634e7afa299d263787be4294a41561030b475236f210904d060ae3bdeb7a333d473d5f8fbdf3ed6fd1 SHA512 4ea2f1280a8f6ccff07d6528b980f7bebc96e67b12c3e89ba86251ed6c6035da9d2452d2a4d4fe52e428e6b1794fb02ac0165cce191d6d4ab2135402154abecb
+EBUILD pqstego-0.0.1.ebuild 384 BLAKE2B 27a1fddebcdb54d8a05e79761c7944a9d2bd151093050887f45eed9d810f36e6550af79baa5afc6c6da2d894643deb913b05b534bb51fc07c8445bd05d25f2cf SHA512 eb6f734a0bb2733171f2417a9270d0220f1582bf2167d0dec9fff01e77c8d8ceab2cd4bec79b095fa76f7a4986cb7e0b2b631758a7dd0325d7adbee2e9b543d4
 MISC metadata.xml 346 BLAKE2B 69416f47156576f7e842d6452198ac2715d5c4ee8fc215cdb7104d071331a767f2b053981e6cc63ba754d769e5f71322d357cc783158bb97ac2329268a66c735 SHA512 f49877aff2dc6429963ac5d9bce07797df793bbd89ef82cbb745d13fa2aed484a0758b6209f554fe3f21b3bde84827c6125cdca6fdaa5d6b6b1a4764c5d34d8e
diff --git a/media-gfx/pqstego/pqstego-0.0.1.ebuild b/media-gfx/pqstego/pqstego-0.0.1.ebuild
index f36a1ae72c7f..61c82756ef45 100644
--- a/media-gfx/pqstego/pqstego-0.0.1.ebuild
+++ b/media-gfx/pqstego/pqstego-0.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 DESCRIPTION="Tools for Perturbed Quantization Steganography"
 HOMEPAGE="https://sourceforge.net/projects/pqstego/"
@@ -14,13 +14,3 @@ IUSE=""
 
 DEPEND="media-libs/libpqstego
 	virtual/jpeg:0"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGES README
-}
diff --git a/media-gfx/rotoscope/Manifest b/media-gfx/rotoscope/Manifest
index 40a3cee184d6..db934ba94034 100644
--- a/media-gfx/rotoscope/Manifest
+++ b/media-gfx/rotoscope/Manifest
@@ -1,3 +1,3 @@
 DIST rotoscope_0.2.orig.tar.gz 108147 BLAKE2B 2f860ec531ac0f4011e078465762e383d175c87a025ac74b5029f4dfa4e25efbb733a5c245ab3a34d6e9a71b6f11aa98afbc683f8cd28c1e174d84282ce7f3fd SHA512 106dedbfb5eb378da3e2082935f2127a84f194437e95cf331081fa45284066f00028c26f09b66848530d76138b6b55e9da46cf62b98a8e9af7e628806559cabe
-EBUILD rotoscope-0.2.ebuild 552 BLAKE2B 23fa3a754bfa3e3198302e3053974919027dfa5af6e64fca98502bc4a7cc108e66efedea9dffa53e96c4e1d1018356fdf9eb0ab405db0c51783800749d72b0ca SHA512 d7d3e9daa2a8da64c39f6868f5d12c7ff391c7434f5962b92e175fc1ace93ae5b69a7478721048bcb1d8670cfa2a1ddbcf3c4151e299453ebf45b62d5a3da3d0
+EBUILD rotoscope-0.2.ebuild 450 BLAKE2B 03d5ebc819efdbd2651004980f4e2a7fed8f1cfe59d34f4b893f9956f2a1a6b1a97f89a6555fab61e3bc27a34b04324034a59bd9a10824641c73982384dd9bc6 SHA512 1dd0c2c8151651c331de3e4bf6af82c3cd965815be6a6b69c8cb5cd51f2a64589ebb252d2b902f144819f06c92c8b3650d3c2ff7a9f710660b48738769460a2f
 MISC metadata.xml 338 BLAKE2B fbe76d686fc1eac90fa4d29189722970a703277ebb0e0fd26ed13c20d6793e73e3a4871fe3f0c68730e315aa6d733710ffbda74faf5bee67f7856351bacb5940 SHA512 b4f2d1c6ec05bcd5db895bdb3a7427f0aefc5f1cbb2b83b138309fd8bd5a1082209063e4e78bdd3ae811d2bfba6b587f4e13cf1c2d0698ce0508fa94d39d3e5c
diff --git a/media-gfx/rotoscope/rotoscope-0.2.ebuild b/media-gfx/rotoscope/rotoscope-0.2.ebuild
index 050a4fcc7539..545f535924d6 100644
--- a/media-gfx/rotoscope/rotoscope-0.2.ebuild
+++ b/media-gfx/rotoscope/rotoscope-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="Graphics program that can be used to give photos a cartoon-like appearance"
 HOMEPAGE="http://www.toonyphotos.com"
@@ -16,8 +16,3 @@ RDEPEND="x11-libs/gtk+:2
 	>=gnome-base/libglade-2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 623f9a4f1a86..f05e02fe9715 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -8,6 +8,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r1.ebuild 7730 BLAKE2B 72361a40c1847b224b8b312599df9fafd0b5f2ffc4e79452e5d611938afc9b023a7302ffbff244e14b6c5d64bc034b9aa9e9f68ec77e3c62e86fb88905c9f0f7 SHA512 7cad2582d018e7c551d3b8cc86c72083d73ba99da7140c1a6cde11e7afcb036a9e80fb654511540b1a3a0cf71fb7b9f091ca137cd97449935a1481f4f8ddb921
-EBUILD sane-backends-1.0.27.ebuild 7913 BLAKE2B f6cdfc03d373fbad3872fdc6f7686d3b006e365860851f821eded0f0cbc661f8ed1d176f6032ca2abfd706afc2846185f09a134ace637e896f3c2e067b748385 SHA512 c228f459e1e62095aa57f75018cd63773cf6c55ef6e24ff28123476f43d8a9798d27d6cc2b6f4d85a79736d824ebc5ca4216199e527158781cf698bcc62b2620
+EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
index b96f4e903a75..d69b29324a20 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
deleted file mode 100644
index 8092d5aac7b1..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic ltprune multilib-minimal systemd toolchain-funcs udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
-	case ${backend} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm)
-		IUSE+=" -sane_backends_${backend}"
-		;;
-	mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${backend}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${backend}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_mustek_usb2? ( threads )
-	sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git"
-	inherit git-r3 autotools
-	;;
-*_pre*)
-	MY_P="${PN}-git${PV#*_pre}"
-	SRC_URI="http://www.sane-project.org/snapshots/${MY_P}.tar.gz
-		mirror://gentoo/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-	;;
-*)
-	MY_P=${P}
-	FRS_ID="4224"
-	SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
-	;;
-esac
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-if [[ ${PV} != "9999" ]] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	snmp? ( net-analyzer/net-snmp )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	>=sys-devel/gettext-0.18.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-pkg_setup() {
-	enewgroup scanner
-	enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
-	default
-
-	cat >> backend/dll.conf.in <<-EOF
-	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
-	hpaio
-	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
-	epkowa
-	EOF
-
-	eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		mv configure.{in,ac} || die
-		AT_NOELIBTOOLIZE=yes eautoreconf
-	fi
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # bug?????
-
-	# if LINGUAS is set, just use the listed and supported localizations.
-	if [[ ${LINGUAS+set} == "set" ]]; then
-		mkdir -p po || die
-		strip-linguas -u po
-		printf '%s\n' ${LINGUAS} > po/LINGUAS
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local BACKENDS=" "
-
-	use gphoto2 && BACKENDS="gphoto2"
-	use v4l && BACKENDS="${BACKENDS} v4l"
-	for backend in ${IUSE_SANE_BACKENDS}; do
-		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
-			BACKENDS="${BACKENDS} ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-	)
-
-	# you can only enable this backend, not disable it...
-	if use sane_backends_pnm; then
-		myconf+=( --enable-pnm-backend )
-	fi
-	if use sane_backends_mustek_pp; then
-		myconf+=( --enable-parport-directio )
-	fi
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	ECONF_SOURCE=${S} \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${BACKENDS}" \
-	econf \
-		$(use_with gphoto2) \
-		$(multilib_native_use_with systemd) \
-		$(use_with v4l) \
-		$(use_enable ipv6) \
-		$(use_enable threads pthread) \
-		$(use_enable zeroconf avahi) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null
-	fi
-
-	if use usb; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi; then
-		if use usb; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
-	prune_libtool_files --modules
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	elog "If you are using a USB scanner, add all users who want"
-	elog "to access your scanner to the \"scanner\" group."
-}