gentoo resync : 02.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
commit: 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree: bac2a67fb24ac0836147fe370d30e1610ae1845d /media-gfx
parent: 2f8db31405fac68eea6f7257d58529243815033b (diff)
73 files changed, 142 insertions, 105 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b4076bb5a4f3..5ecaedfd7eac 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aoi/Manifest b/media-gfx/aoi/Manifest
index d7ee35c4a22a..e15b063a63e2 100644
--- a/media-gfx/aoi/Manifest
+++ b/media-gfx/aoi/Manifest
@@ -2,6 +2,6 @@ DIST aoi25.zip 4529346 BLAKE2B 8de066ab70d2223d7721c3f7b0454e1873a96479d7bb7b957
 DIST aoi272.zip 4733701 BLAKE2B 781479fbc2778b25c35158f11d7f3eac7af29ab6014e976b431d871916bc18f6de4dd6d07557d3d5b25c8b12ce6537764d89bc6a12540339e1cf7b76f9b34143 SHA512 8dadbc23e795700b625d83f00bf15b79a923ed083de63e0f18579706baa8af9c3cbad3c08e0e7e5156190e257941f2499a3a49259295a52c586a54f19e4af182
 DIST manual2.3.zip 11511867 BLAKE2B 1b670bbe889c9425804e897cd27c0b57ba9a342926090db33c91da84ce355cb53baf22d56d7212bf74324d6fae3fc24aa931922cc4895609d94616488febf8bc SHA512 b8d11eba570f854d621622a6ef30e26194913b2069c4cd5bc00090521120dc9d1c20d4dae4ef8cf900dbaf9ef94f7afc2d88dc88c4dc6e2e0064db08e2567366
 DIST manual2.6.zip 13402007 BLAKE2B 69b5a0c7259add32849db3cbefdb083810389626459211f23de0bab4820db49a291438ecf2bf2bc28197465f0bc110a02aeddebba2000b0efb796da9ba85faa3 SHA512 ef8d1bce3cbd1f8f5a7f55f5d296f4cd3694af8aafc88579f3c514104ae2ded4f0c1bbe8379dfc91a865042ce459b336b4630718f6b293216d9577b3eb5765f1
-EBUILD aoi-2.5.ebuild 1081 BLAKE2B 0d63278ee385cfac606e6d90610c26291b0ebb9bb92e0e8cff8f32374f0a04b7f8ee41570573965999d807f8d660f58bed1d27e9f4f1aa29e1782f005e4d0566 SHA512 b465d9439331e3df57004153816a39e8ffeb8b6f9f589d4307d7e4e160c27dd267aa5724ff7fcc6c0b4c4970993f535266c9053d7f91a2e8f04989d16d9c101b
-EBUILD aoi-2.7.2.ebuild 1142 BLAKE2B bb8107423aff9499cfd9544eab457b7b49025d2c5d7351a06a6d71fa93f078fbedae30a478d06b90fae69f2eb3563205f31dfba7051336c2a02ac5a3787f47ff SHA512 6d6e94c97d17d27f604649c33856ae56d12e16f8f1ad014094fe74d8a122b88a38de69760d0db9c74c110ce3e470b9ce552f0983b3efded024f97090b34a08e3
+EBUILD aoi-2.5.ebuild 1089 BLAKE2B e7b68e30f086e913af76a46fcc7b5c7a2542a91039a7bc6402534ab5a7c1201f712610f2342bb3301cec50bc695a01b6d0cf870d61be45b1f87f2c56e16609d6 SHA512 0c989687d5f356b961072bb5b6fa7aa6a3fb240ee1ac29abe6e5f78115b949c44328e21449a1c8b9d1e083087115872c8cae42b8c989604f2071ce3aa6c542dd
+EBUILD aoi-2.7.2.ebuild 1150 BLAKE2B 7e0972893c947622bf8ff0a331368e50a5cb6928c9336b093395d23d16b01f3dd5fcd7e9c012121f4de2adcb9f09ec903e8cd69409c028ca2afaf66ac286f675 SHA512 763697775e87cdf54924924573fa7c782906fce2ef6a28b24ac310632aa89b2feeb137a783763899a0abfcd149ac893a96ea8c2b10957ac6caba504cc28d7c60
 MISC metadata.xml 332 BLAKE2B b9ff097d9219667ec524d86bc1e294b8a9f46ed9489d75942f35670a41d0e9ab5fb685beb826717242137a76f4ddc259740a3888de463b2d62ce51b201e24500 SHA512 794201c962be68e01de8bfb5ce9312702bccf64100de79f3d778237334d0a1099b0469cd892707b9d5f2a4c236dd9e4b49eadbfb7867cec550b779de40d0d742
diff --git a/media-gfx/aoi/aoi-2.5.ebuild b/media-gfx/aoi/aoi-2.5.ebuild
index f5d4a06ed893..06c64af08dd5 100644
--- a/media-gfx/aoi/aoi-2.5.ebuild
+++ b/media-gfx/aoi/aoi-2.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit java-pkg-2 eutils
 
 MY_P="aoi25"
diff --git a/media-gfx/aoi/aoi-2.7.2.ebuild b/media-gfx/aoi/aoi-2.7.2.ebuild
index 8ca8c4773ae4..df3e0a207a32 100644
--- a/media-gfx/aoi/aoi-2.7.2.ebuild
+++ b/media-gfx/aoi/aoi-2.7.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit java-pkg-2 eutils versionator
 
 MY_V=$(delete_all_version_separators)
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index 6da631c5515a..eaefc5122ac2 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -3,6 +3,6 @@ AUX aview-1.3.0_rc1-filename-spaces.patch 1393 BLAKE2B 054b0bfc569394f305ebfcadd
 AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a431549df18427cb3ae22fd91ae99ec23fc223da8025fc9bff82fd8268dcb7dcd017d0c53ad6c323bd4e3735cd9f658b38 SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7
 AUX aview-1.3.0_rc1-tmp_creation.patch 1142 BLAKE2B 6042d5b39f2a0f9a4be0207b8d57ff55ef203ed9d6d80ccb593770cc2864262dcc7850bb17ad0414702cad1fc7d17c6ad95d3580dd4ad5639c59d9c719c6aedc SHA512 7fdc336cd2c595754f46948031722f87bb40b0e159950f84ed0959ccdacd01840c0d24dfeac6a9937ab456b8ed66e5c9b8d49a4e98ee45ec64295f8234249d06
 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144
-EBUILD aview-1.3.0_rc1-r1.ebuild 706 BLAKE2B f6ff3c90789b162d0901130a45ce5af18fb189d9685d3cce3a22f2e33ae2197aae13338fd61b21f11c300cc7fc3de8be81218372c70fa48de502a35b64e1dc62 SHA512 2620ad6616b15520c0b8392df0c3e5260065641d097c2a9c597f53491fa7bcd23a37b6dcba3f6f85dbf13f3b6eb3ea57adae3c651f1c63604fbd6f0ae82d7d69
+EBUILD aview-1.3.0_rc1-r1.ebuild 714 BLAKE2B c73e2364234b5b75fab250963c43ef13924c6dcab5333a9e405701e1b7adc35d7830f71645e707a6562d145240ecfe5720a46179e875d1b4dae23387944b0ecf SHA512 4ac6bfc8e11ba1e4d1b6dc8764e963f736a6735a0a1cd6ae817cc17f7050899cd5919f11866f1a97c5cf1ee71f3ed0f023b9e547d9765bf5594f1478f5686449
 EBUILD aview-1.3.0_rc1-r3.ebuild 801 BLAKE2B cd393727833b6b67b51e5ccb7874849eecd8d827189823dfbff7866d033d03baba88e899774dc28e517796d47c5a36e21faf2a90b0111cbddd99ca6cfec27ca5 SHA512 af951ac253755a996f8eee02a8edeac2bffd7f8e53a3a1b92f24a794cfe41ca7057c8a915ee7089250c4471f63ddd41c7f453fd9c417dc349c254c42017cd6fc
 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
index 1e5b6b8b0f42..d7700f082355 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit base
 
 MY_P=${P/_/}
diff --git a/media-gfx/bootsplash-themes/Manifest b/media-gfx/bootsplash-themes/Manifest
index 057e6f373429..3f5491b83ce8 100644
--- a/media-gfx/bootsplash-themes/Manifest
+++ b/media-gfx/bootsplash-themes/Manifest
@@ -174,5 +174,5 @@ DIST Theme-acKme.tar.bz2 233757 BLAKE2B 0a47168ca64827b2c359341e13d1cb7cc979bf0c
 DIST Theme-dotf.tar.bz2 393510 BLAKE2B fb79d3512648aae781da799b15ae6b7cd5db1f29ccfd7562ec1f285ac7af8ab2d5cddd6f9566c846f4a46d1df16fb88639d45d19aecc9fd993121ccb59422d06 SHA512 da80d95dc157212bd8e0f1083afd6e3c82f77922105a0fae0ec94876ad23117f8ab9898dab47b76e8129a1c3fb30db6132e1fb13b77f45de6b46db569d250310
 DIST Theme-iRu.tar.bz2 81672 BLAKE2B 9632c0479e41dccd2eec1fba873c94e253111c325a07ed07fae19df0f503631b1c1103d37b7e3dd9d430d4414ccfc32dd5097851e2c5f40456813d71c4a89e44 SHA512 d496a68631cd3d4dc859289c177e2f572226f6e87d949ce8556895ddc29b9fbcbc21e8e49385f58022c7f08117da94a84c37ec60e95145611a1b1a3f5cd840d3
 DIST Theme-libertnl.tar.bz2 90035 BLAKE2B 939a8e9166e954dad1d917df4546ed4d939532b05b8ff7333389634841f447d413a883f020df15071761ab224f356dd6293b647789aa9459cbd2f563f70dae22 SHA512 4d01967e3713adb2ecbb9534b42f261bbae1a381185bc3838d642e6af28dcb0c254f2b713d52e3e757489006ee25658213375b7f8e08f6fc681bad52bab427b9
-EBUILD bootsplash-themes-20060913.ebuild 11213 BLAKE2B e1b75dbf032dd6540fca6f201de53232215fe512095b6ff8dd476f48c369033b4977dd931cc5a509b69dbea95aa190c9ff74dfbe17d4a7142679f39fecf71863 SHA512 ada8a898e5a2e47e5123218b1afeac203c9005a361cf8a3d7ea2de226d0a9d7197e48c783e90a59d12241d6298d5753def7b73c16816b511b7ecf79d356a2006
+EBUILD bootsplash-themes-20060913.ebuild 11221 BLAKE2B d25bfd2340d117503cfd5ce488cd062dbcb9df71f0507786562858c48828b5b611bae1f63fee60faa62bc2710dfeef5dc8e67d27695716ed5fe14ea47a77a164 SHA512 815819b32bbae6c9b7bc11c8d0fb338aa13d28a1f19c99725c9caeebca6271c93ea6a4a9256923aaaece6f250e35011a1c4b502492956bd23f58d721d1dda564
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild b/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
index 62295f78462d..80c9085d64ec 100644
--- a/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
+++ b/media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="A collection of Bootsplash themes"
 HOMEPAGE="https://dev.gentoo.org/~spock/repos/bootsplash/"
 THEME_URI="mirror://gentoo"
diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index 99da72b2eb80..fc60212cb801 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -1,5 +1,5 @@
 DIST cellwriter-1.3.4.tar.gz 284647 BLAKE2B 93d970c6422c2f250ee516d37e65fe4841efd504ced7ad43c21157574281df4ec0bf57cad5b2802c149d48d14b5ae2b4bfac404028ab4cfa6d9d6e0a2fc5fcd2 SHA512 5839670912a456cc9becef61b9f293575bc04fd4113877a21e9fea247a964917a399393007c3793066fa92a2ba0560776100d56ea56d1dadd49052a4844e1582
 DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ecee854740cd8c5991de62450929a89f04c1601ff77ac69b945d5997042c8f739defa00614aa0af947655d5251f8ef SHA512 a9b682babda4335ea18716032ac52e73578459e9ab8866b20177f6d0cb606b9da2bf5a3fae2e2547277351db2533c7e92461f5c6a6ebc542ffe5844ff7ae65d6
-EBUILD cellwriter-1.3.4.ebuild 619 BLAKE2B 86a0a8b27ec4de47a06f400f50d2d23d927d7cfd1ded7732e9a42d6cb875dddbbc44cc17af31aafaaba2fd71f05227dea0d15cd4667e74677a684e514abab790 SHA512 f04f8391bc0d31fd25380b1759ae022e8020bf42fbb7c825fc0937ce6ddacce36aa80be9f627969f8ea6173039f35734de2d3629b562263dba3b6d4e129447ee
-EBUILD cellwriter-1.3.5.ebuild 718 BLAKE2B b8b26fb0882a0320bf482c6b24b7b4c421e4bba7726cb630484d7192d6e7ec62af0cf25e482532e4c242f889749cf64248037b0972f83bb404bcb5e8f05962f9 SHA512 15f7a1d9d78581e352850c085a40ea0fcd1bb13e1e5c41c4df65f34f9a7f6bcc72d6ab57a15a637e1368856713785ec9f4384a47260680e0e4b8b3aa7212dbf5
+EBUILD cellwriter-1.3.4.ebuild 618 BLAKE2B 8f51ff2e1bddcc0c035694116c4ca4d6225b7d6b20b878cf0bf08e02861b68da27a34a115bdbdb9c29b5e20a9ea1405066b3fc1556e141b44a61b14c7ae63002 SHA512 d716e3954b1375ad21ae940c75bf107856573b7211334267459c79ed2cbb7eddebdc7054330e5e82e5d6c7ec75a3bc09af456b3f2fc8081f7d95a73bedef5597
+EBUILD cellwriter-1.3.5.ebuild 721 BLAKE2B 808b942a5569059c05b3dec134498a4820aae5465a50c292e6853d09169ba508f0caba59c1d6cb8977bec06f9bdc0ba468c998b6e2e19511282840bbf32a3143 SHA512 170049250eb87307cde5583a8a4452c014e208d460758a8b6b0d61472c7ac9f9a97d34b0385d65061ce4857df56b7637a68bb8999911914ebac76d0025e12b53
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
index 517e2596d527..cb3737df9143 100644
--- a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXtst
 	gnome? ( gnome-base/libgnome )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf $(use_with gnome)
diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
index 9f5a7bfdccdf..83526f625890 100644
--- a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
 
diff --git a/media-gfx/cthumb/Manifest b/media-gfx/cthumb/Manifest
index c7447a3443d4..1a936fb54984 100644
--- a/media-gfx/cthumb/Manifest
+++ b/media-gfx/cthumb/Manifest
@@ -1,3 +1,3 @@
 DIST cthumb-4.2.tar.gz 438163 BLAKE2B 5be468230598d664a08e4f50942ebf86bf63e9905ae5b66248c6bad2a777852272a32d98b751c1d64f3072b483690390dc71c1128267dc2d18070679e160d14b SHA512 c64e93651e1d870437ebd56a2aed1a63be1bf132e7544384f27fbb3ffa42b5396d469f719bee47ba0da8809a6707e78c72b80f372e84dca1f15908ff8987c6eb
-EBUILD cthumb-4.2.ebuild 699 BLAKE2B 8cc78eb04b93fbdfba191968775a1092a0de4d8ecec53dacf852e54645245c8ecb9b6a588990744fcb0aeb5bdeb45b8be6d4732c4b3ab36591e12d06ccf567ef SHA512 0a085d36e097324d2efab92fc5fe82b04d5d2202516a9fcca0b26550a4e9a8529b74fafefaca5d5d131dc289a621f8c49fdc14fb1bfdf2cdb13958243a872cb0
+EBUILD cthumb-4.2.ebuild 707 BLAKE2B 06083f7efadbf2d2b188a4d80f06775a5d102b54e6e0ae33f1479a57d01852ce6791ef7e1e22de557fb5ad48c8204c311453fa72c2e104ca089e42e628a89bd4 SHA512 5de71ebbfdfde8deb1b371a271cd9ff4cac6fbafdebe8f9214fb171cd1f1e5ade8cf203dd6c12362f5c527851b394623edf4106a871dbc2b82457a27127b9700
 MISC metadata.xml 243 BLAKE2B 48468b127dce5632450cd314f5492028f7c4cb7926fdcec5fac89bea3f0996be50a8a69b0c842bc61b6fd6dfbb7c413019b06bdf274d9f03d3caa998dd6db999 SHA512 6144265a0b25757c47b92f6e9525d88a06d91619a14f5c41efcfccbfcad16ed85f36308965cf483773ac5bf8e62c68d83e1442e3de31dee0d5688c2cbee3e38b
diff --git a/media-gfx/cthumb/cthumb-4.2.ebuild b/media-gfx/cthumb/cthumb-4.2.ebuild
index b95bafecc4d9..f351ea571726 100644
--- a/media-gfx/cthumb/cthumb-4.2.ebuild
+++ b/media-gfx/cthumb/cthumb-4.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Create a statical HTML Image gallery with captions for each image"
 
 HOMEPAGE="http://cthumb.sourceforge.net"
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index c00ccd7ec39e..7e5e1e6b4bba 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 649 BLAKE2B 1f73a61084a3e38838958b603d92a4749ca1867da8272c9f31eb226a30e88e67f788bea60642b41ddbd9a4fe6eb64beaa2610fc412cce480c888987440e14615 SHA512 8769a7991c41dd2da207d9d5bfb9e9ccb6d79a5b64915c5dc0ac93b1fb715cb2e458df52c4f47f1cc5bce3aae7df9546f05bb764e6dbef4e5f777a07edec861e
+EBUILD ebdftopcf-2.ebuild 657 BLAKE2B aeaaa6a51f154c4ea6a0ee513207fbaf1d3b30bd1e26a68b401158dff83b3c846b301417401d59cb14e9603f3efb701aedf2e92e1162e6667b76f0c48108d08f SHA512 a530830c944b58eb38a7a28df55c6e8dbf92d9dc42adf70dc2d9481c659fab957d9860d62eda2397f6c383e6479c3b932270552fff10962e852d566ab873f1ed
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 5f6ae7673314..8a1bf3a4718d 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="ebdftopcf optimially generators PCF files from BDF files"
 HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
diff --git a/media-gfx/exiftags/Manifest b/media-gfx/exiftags/Manifest
index d3fce1731115..d1994f56a28b 100644
--- a/media-gfx/exiftags/Manifest
+++ b/media-gfx/exiftags/Manifest
@@ -1,3 +1,3 @@
 DIST exiftags-1.01.tar.gz 70921 BLAKE2B e1ca96f057ef1d00f6b50d33bdb7ea11805d7a9b0f628fcab0a6729edfede4b8f54be81119aaeb9586122225aea02059df625c468b63f9747ba47de04355bc97 SHA512 850d9f709dfa034eb5e04318f18b85c486c21407525074a00dccd81781b874cc6a34dccd97b4566fbeb96c61399858ce0718eb90e329383974b6c4dc0180c684
-EBUILD exiftags-1.01.ebuild 616 BLAKE2B 207366958d1c463c9e4862eac2905fb1c0bfa5ab898eda780c77155c734b4d6178cac22080a180ced440f4853c85fec6efce419d6b39b1d89d28cde1719d3473 SHA512 a87ff70cbb0e85e5986df04e59e754349e0cafaa02326fa41fab3cc76470fa27b46d4838fa7e0b7e2e55078290be3d1ba1e5f4d75169cac4122c0c93b4b64ab0
+EBUILD exiftags-1.01.ebuild 624 BLAKE2B 01d45e9f99b6430eb9edaa9a2dd81bf8e52e52e95b9e2310b89526a647652617618f6f483ccf6cc15d9caf7365adf4f690173f933366e485f32e47b4cb809d7d SHA512 5cc8ba7378a8b4b806b32ad88212c32c159c1d88c2ff77abe3f9fb4e75b31a66d62b41fd91052e3a21fd4b06990459e395391ae1af74e0fd673ab60adc3f60a9
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/exiftags/exiftags-1.01.ebuild b/media-gfx/exiftags/exiftags-1.01.ebuild
index 2690748c7c4a..b2ff92f16ae2 100644
--- a/media-gfx/exiftags/exiftags-1.01.ebuild
+++ b/media-gfx/exiftags/exiftags-1.01.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="Extracts JPEG EXIF headers from digital camera photos"
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 9ead582aa0ed..78614b19712a 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -5,5 +5,5 @@ AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b0
 DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
 EBUILD exiv2-0.26_p20171104.ebuild 3086 BLAKE2B 72739b426e741582b3f167f973b250333d37bd68a9a4d381eada321670ff3c41e33f344e759c47641510c724ad4da8b27ee8e2805f4be075a1de9c808b7a2baf SHA512 ddabecf71aef6461442b77ae3afed3581d13a8155b232aa3e946e043853cc8f79bd5866febbd1ca38a4c9a2b6c08afdc1b37b079a30b3d01b358da06cc08db58
-EBUILD exiv2-0.26_p20180319.ebuild 3314 BLAKE2B 637e11a6bf0f1d82b86342086ef3f35b9fd2390dd3cecf817bb2f90044ec2cf27dbd7dbd4b75fead88b45b0fb1a9f43e459605716fec3dedffb7f61b3db46400 SHA512 6e9857924f8d995ec6af559b57fa63fd7b1a1e46b9a220a93e0abf450246316962eeea1e18fe2e993c746a9f6b20083647a526da106bc4dee620d774cf0d2974
+EBUILD exiv2-0.26_p20180319.ebuild 3313 BLAKE2B b082fd029e6a87fa409e8678a239afda2bf8fe64051e2deb82be4ca574d21a3931b7147012171000e99836dcdf0b82e58852aa0bea98e05b38448df80de55b6c SHA512 7594c9824ee2df83a6db8708654e2dd925e80824053d71e9019314ace92a4c537bd82f6bb8a3c29f6600889ae9f96e606ef6e1bbfcd7de6c25129d79b2252cba
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 70bf783d9176..d160ec482406 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
 	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 inherit cmake-multilib python-any-r1
 
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 4c890b52764d..dad66575e4d1 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 2428 BLAKE2B 3a6516fa221312d6117499fef04a93dbba894244bd5c19ae319bcb934e316862b667f0ccb79ade4af8209df7b7db51ad1529b57dd605a600d3c2cf6acef6378b SHA512 b847ad915d41fe2ab95fb487e70419100e4fcd9ae0287449fdcc6f93f5f42165942919746fe856520a79ff9c1b66421530a02f55c8a9e7695a859a6579c60741
-EBUILD fbida-2.13-r1.ebuild 2411 BLAKE2B b9a3558a77c4c76af91705927479bc0fc80afe767c30904bd8633dbce8a1ee4cd575dc89df545fdd74138dc79dfa1e101afeed757ab5b42fa9c974ea0e30d029 SHA512 f7126043f89da9ac6cd1d5a044ade51e99efe184e32d9e458a0301bf843c9bdbf82ca22c24e5c2c9eff927f7a04393233f60b0720d542302fd8469adce1b0ec4
-EBUILD fbida-2.14.ebuild 2364 BLAKE2B 5604557d6d0c0aee05d01467c83758a17bcf79aa5a5fd4b10f08cd4df48ebb18e8d303caa03d4627b31915d7b86ddaac78743b89ec340b99b32a7bf9ef06ea32 SHA512 e264f0f624e48b6fcfb1517e44aa99c73e94eecef8a18dc573743fb91d7cc1876276f352273fa9511d22df966b8c3af64cbdd3aed037ee98661bf3dcd8036943
-EBUILD fbida-9999.ebuild 2454 BLAKE2B 8ec4858ad1be1500024bc5b56b223bd6a90827ec56935e16b18900ac242334e827eba57e65fc7e75fbc2aaf86e1fd65b03dc0356e2c9e4bbb525c2a41ee17184 SHA512 747e48211b510e3330d56a291bc3036df53e77d866010456a55694c6cc57b5e13194e34aecca8f606b15ea5bb3a06c3ceb6db047d77d039e63c210e21db3150b
+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
 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 a54e6b18ce07..21c9c5498dc4 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index b3534f6df821..ca112ea82bfb 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 482c92a8d701..0df94d361425 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index dc27ba67de8a..ff4be7c5c7ab 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ CDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="
diff --git a/media-gfx/fblogo/Manifest b/media-gfx/fblogo/Manifest
index 6fab27f7fefb..1f3d067956de 100644
--- a/media-gfx/fblogo/Manifest
+++ b/media-gfx/fblogo/Manifest
@@ -1,4 +1,4 @@
 AUX fblogo-0.5.2-cross.patch 1060 BLAKE2B e66a25ed07cdfdecc7f4ef2e1ca8470b22e865ea4744a35f54f237ebf8d848b101800cafd2d376ac2347f7acb03f09a3fe9ffcca0b4329aada85a915c476190b SHA512 98794e4de65a9e5e85aa850160ea8c7fc51da4084f79e67e2ad8bbde694ae27614c56bcff08f2023c0309c12f3c8e071e430fb7aab6ac3652f5597329695eb70
 DIST fblogo-0.5.2.tar.gz 21874 BLAKE2B 7ae57359581a5c3cc0fa1d1ddcd6115df4efe8e9047a99b71952665d845c26cf9d410cccd3a5dec3028616c02cbc06947d3cb8210ef15d89bcdd4d1cd6b5d635 SHA512 d0ff36355e80be336d5b02cd6419ee4c669dd98b0dc1334b75440d814ea640e0ad11c14b24469619c116333d1eb7b8256c6cedae3886d1e8a4f99835eed7df42
-EBUILD fblogo-0.5.2.ebuild 837 BLAKE2B 396223d091655ce290d879e795f290043618a744aa02620cf286c8a57105b5e12ffdfffc268ecc85359888949007b290852014e1a446707f78158946fd7d4636 SHA512 ce03d9bb936979fde617521f0a65609b23577eb512171db794b98e92fce87e772dc010fe62a3054ad7fc774dfd86f219711401a1dd80adb19b3842cc1365055f
+EBUILD fblogo-0.5.2.ebuild 845 BLAKE2B 38725afe3017e92df1f1de161e36578c1fefffbe582f8580bb733eb49ae45a555905e8dd2920b0c2304cc6bbb67aad299365aa18073eae8d82d2267890eea920 SHA512 131ec0bdfee4ba5e90e1e4b68f0b3d69b9b388d06c4a7c7976a5f5e7796f78b07dde38e9428fc546fb11052e565a08a8b5ed206bcad31a66545c6bd2147c141a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/fblogo/fblogo-0.5.2.ebuild b/media-gfx/fblogo/fblogo-0.5.2.ebuild
index a9dca8cedc83..22a2d6a35290 100644
--- a/media-gfx/fblogo/fblogo-0.5.2.ebuild
+++ b/media-gfx/fblogo/fblogo-0.5.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Creates images to substitute Linux boot logo"
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 7e52ce76b545..ea2849992c20 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,8 @@ DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c32327700419648
 DIST feh-2.24.tar.bz2 2130683 BLAKE2B b1f720d9ef74b4418daf92b945e57ca7d34839f72f5be47312dd936274e411a0ec4d4df2042cbb98a0656fd52a9cce804d627e8db497467ef4461eb994e5ccd3 SHA512 5d745586201dfc9b72a2e3987aed5d9c36f18c3123d3083c1c130f6b301da98dccbc79bc6aa55c70a895e831a7325c4cbf75fa2ca82a3a05eda3e98e1de8cb7d
 DIST feh-2.25.1.tar.bz2 2131624 BLAKE2B 3e7d9145bb416d433f3ec92b5c921a734de137e3637999b6c3c6ac7e8d8b2e05a8a34dcdb12715431d4dd22f37a6e70b93bd18831c5e05ae9ce91b8e2e2f17d4 SHA512 a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e
 DIST feh-2.25.tar.bz2 2131457 BLAKE2B 50a3ab469dc637195e4421871ee01f690dd890abf97d408e2781684e497623d455ce3a92f5f809b3ab1562396d605618061786cfbaf78541064cc6c2c0892d1a SHA512 42bac46f71d3833affd076d985464c32dbba5ad34c0ab02692e6d9dba68304b2209c87221340f695408c1959a4482cdaf18fda6552a14cc42e08655bbb28ae4a
-EBUILD feh-2.18.3.ebuild 1191 BLAKE2B 65a725d14fe77144ff3cc9c545e46b3a7a8df4ec71c981422a8029f9e7f61a83629a11ce687fc0d98045e935521dd59677be43b8649231c16008c11ca604028c SHA512 cfdb2067a02a31747129abe3833a2999c15e02abbabb7a389380b6351f0d87aaa0b74b29e4253a33dcf12ede43f8964fb5b099a80c438cbe7523e91de45b172a
-EBUILD feh-2.24.ebuild 1195 BLAKE2B 538e485f0814564a45e6af555ae6b0437ec3ab5c03b28b393eadad8a3af5fea0b18ba81e7576a34680db9a99a56d43a44a2e936b55e95730350da3bc99c5c4cd SHA512 2919509a7c8ca99f4d0fbdcdbeb817a01877b07b0352f1a336b6e2c53932d0aa037a3eedf154ba1850d02fa3cf14ad7bfcaf59a4590ef888839dd5b28136e0cc
-EBUILD feh-2.25.1.ebuild 1195 BLAKE2B 538e485f0814564a45e6af555ae6b0437ec3ab5c03b28b393eadad8a3af5fea0b18ba81e7576a34680db9a99a56d43a44a2e936b55e95730350da3bc99c5c4cd SHA512 2919509a7c8ca99f4d0fbdcdbeb817a01877b07b0352f1a336b6e2c53932d0aa037a3eedf154ba1850d02fa3cf14ad7bfcaf59a4590ef888839dd5b28136e0cc
-EBUILD feh-2.25.ebuild 1195 BLAKE2B 538e485f0814564a45e6af555ae6b0437ec3ab5c03b28b393eadad8a3af5fea0b18ba81e7576a34680db9a99a56d43a44a2e936b55e95730350da3bc99c5c4cd SHA512 2919509a7c8ca99f4d0fbdcdbeb817a01877b07b0352f1a336b6e2c53932d0aa037a3eedf154ba1850d02fa3cf14ad7bfcaf59a4590ef888839dd5b28136e0cc
+EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
+EBUILD feh-2.24.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
+EBUILD feh-2.25.1.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
+EBUILD feh-2.25.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.ebuild
index 1b1f2eb93d5c..72bb0487879c 100644
--- a/media-gfx/feh/feh-2.18.3.ebuild
+++ b/media-gfx/feh/feh-2.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
 	virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-proto/xproto
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild
index 97faff3af810..ee6ce5b79e0e 100644
--- a/media-gfx/feh/feh-2.24.ebuild
+++ b/media-gfx/feh/feh-2.24.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
 	virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-proto/xproto
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild
index 97faff3af810..ee6ce5b79e0e 100644
--- a/media-gfx/feh/feh-2.25.1.ebuild
+++ b/media-gfx/feh/feh-2.25.1.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
 	virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-proto/xproto
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild
index 97faff3af810..ee6ce5b79e0e 100644
--- a/media-gfx/feh/feh-2.25.ebuild
+++ b/media-gfx/feh/feh-2.25.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
 	virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-proto/xproto
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
diff --git a/media-gfx/figurine/Manifest b/media-gfx/figurine/Manifest
index 74705db3d239..21e07cd430e2 100644
--- a/media-gfx/figurine/Manifest
+++ b/media-gfx/figurine/Manifest
@@ -1,4 +1,4 @@
 DIST figurine-1.0.5.tar.gz 293105 BLAKE2B 1530ee872cb80e4aa629ec4901c48b49a4aee77667286563da50c037a820ea028defb135e47c1b1b6363b7a59d55d633b30dc516f3b43819b3cc4e61439a6cba SHA512 e3b6a2d0d4b8a4837f27eb40ff158444ff59ac7d826cc780c6c13760e0d6e72844a7b6de69e482dfee12c020600e40c58fb5b4b9efa935342ada6fe62b57eff6
 EBUILD figurine-1.0.5-r1.ebuild 565 BLAKE2B 52a5baee14437c9097776c3d5ac581fbe4fd8f330212c6f9a8abe91316a72aefbd0de928b21f042116800fd7ca141ec50e18a0e940def7d290848a3c11d6b8fb SHA512 c74b9e752075b56be4d897553578519958f3b2fef7370b019e41b8eddd3da206eb3a3cd2c72245e52057927bdae46defe6b9aeeb8f2433d4815796042d2d3472
-EBUILD figurine-1.0.5.ebuild 598 BLAKE2B 657f9f2f940db245fba418896fa399cef1f10dd16005321dccdfbe634578f6a6695ee94388f7cce586942d17bff821db4206e5611ffac25e8473abf56b3a6a80 SHA512 15fcb3b83492e9cbd70d44a76211fbab3eb39523cdd865560dd9baf33fde631e1adebb793978da837d9918e43d190ce387efd177fe6bf458ee295e614ae7fd93
+EBUILD figurine-1.0.5.ebuild 606 BLAKE2B f0c914616eaf208de2cd43e17e19cb492589d88143ae46151c276496801854ea57ca016b5783b4f9331e45b9bfc2148bd0eda7fbbbb13c3d7eee02f6c6b423d5 SHA512 a1121b48b83d194ca2c7c97474c76600578d0f2297c5717869818992452998550634ae7eb9067f537702a21b24633ea8416e8406e61bb2f6858f5f801cacdc2e
 MISC metadata.xml 245 BLAKE2B 0d2e3e7b0bbd5f0c960bf5de591a6729a33552e5e32a4f19f2b7ab79e849dad285bf7e8c88134f213d99d9c83cee8672b37250ed84ad6c6f480bab5fdab368f1 SHA512 122e29d489968047e70dd824a49ffc4dede2a4c632e203a820abe03ea2478cb94b7aad94409ca235f227a034e16141c556fbe462833edfa802f03169215d4c0d
diff --git a/media-gfx/figurine/figurine-1.0.5.ebuild b/media-gfx/figurine/figurine-1.0.5.ebuild
index fb75996726ba..fc075a7027cc 100644
--- a/media-gfx/figurine/figurine-1.0.5.ebuild
+++ b/media-gfx/figurine/figurine-1.0.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="A vector based graphics editor similar to xfig, but simpler"
 HOMEPAGE="http://figurine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/figurine/${P}.tar.gz"
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 309aa2921fd7..859ad2c53c98 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,5 +2,5 @@ AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cf
 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 2792 BLAKE2B 96b466901cfee98f5aa54f89eb69f48e5755a57383e5348accae8748af964466b5d4a097e9bcde573b7ad9bd82210ca3cbf4144ab69701ac8fff3d80ed17c7e2 SHA512 3f59e70c12c7bc2df70578b14c0c7a9018d46e2daecc5fe9f7c4fff81317a4998164549007789eafaacad6355a0db8091f2f4ed9eb3a67eea7a8a3564cbc7702
+EBUILD fontforge-20170731-r3.ebuild 2791 BLAKE2B 3fd287206ea80714c337e478e2a003b80328453887834662755d7bae2e8789ba6d8defb8ca7c4f8e04a0d1a281701965ee52e16feeb86402c04e3125beac59bf SHA512 17b5ca837302778c972e174e173be0094c103ed43d6448e89b6edfe95f0f57d5ba715b5154387a67ad39da06f9d2d65a6a6bf32ae1babd4a0ba79915a37cdf8e
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
index 3461e5fc1b1a..ccf771d57450 100644
--- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	X? ( x11-proto/inputproto )
+	X? ( x11-base/xorg-proto )
 "
 
 # Needs keywording on many arches.
diff --git a/media-gfx/galleryadd/Manifest b/media-gfx/galleryadd/Manifest
index 32433d87a2d0..b045df832965 100644
--- a/media-gfx/galleryadd/Manifest
+++ b/media-gfx/galleryadd/Manifest
@@ -1,3 +1,3 @@
 DIST galleryadd-2.30.tar.gz 10763 BLAKE2B fd5e88bd7f293ee9e76abd8caaca53ac97529cb8136fed3a3264426a0213073ffd358e044249b933b10f7628513e7159cfc50540a6ff021cf78ec740e2768f1f SHA512 f604c92eedf6e753d727c064a1460298b6155e0960cdd1795e36d29a6442e294c153842c296b5422b6a38ffbde671954ce59da27c13740f85da74b0b3efaf162
-EBUILD galleryadd-2.30.ebuild 488 BLAKE2B ac248731b2117c2b9362cfdc3253e84d85860abfae0fcddbb4ffc63fb4d6f873ac148f1b9043ea5e28a1745473c37c454ce078b517166e4f58be46c097fc8246 SHA512 5b2f8dab10e049e3af572b328bcf86267b1899adb07c167005ffef07e59e866593fabb30d34bf123354afc262ce51fc3bc481b0f5e3c627d2d5672c12ee36736
+EBUILD galleryadd-2.30.ebuild 496 BLAKE2B e45c62d56d08a8fed23fd6030b0035b361b3d8749fd751e94d25a13fc7bc9d551bd04db44370a42757ad6a026f25f406073dbfb7755200be6775a131029a636b SHA512 39ef55a595c270d7a62592a556475e6cf9912a8da49cfc37bfc8ddb76014295c894eb3fb0d1d27dc1230341bf4697910b47c20b3216da6e92532d3de022b5e35
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/media-gfx/galleryadd/galleryadd-2.30.ebuild b/media-gfx/galleryadd/galleryadd-2.30.ebuild
index 0447fc67f4aa..7f0e2e0fbbf1 100644
--- a/media-gfx/galleryadd/galleryadd-2.30.ebuild
+++ b/media-gfx/galleryadd/galleryadd-2.30.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Perl script to recursively adds directories/images to Gallery"
 HOMEPAGE="http://iainlea.dyndns.org/software/galleryadd/"
 SRC_URI="http://iainlea.dyndns.org/software/galleryadd/${P}.tar.gz"
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index eea99268da4b..073da422d8f3 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,5 @@
 DIST gifsicle-1.86.tar.gz 563638 BLAKE2B b42065c11822542b75161f34054c3208ad5425570f025fa6bc3c842e759ed84156e6cf202a73f0efd57afc0dff5b9fc7ca8463b6304b97d3888b5e2b0f885b2e SHA512 d55609e5d71f63ec13c1eed6a9071d756f07c765d2496d468cc7291e3b9e29304be1c3a5b0e822d9dc2df29ac489bafca2650d226d5b3c51dad74dd22c725a13
 DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c0607c07cc33bdf9c20d9fa56a004e5aeb66d6fd49bafc12dcb9daf32736597d0377b3dfa1ff665a49f1b47180 SHA512 a5fd815c3aa1388690199edc16c0d5c0c32257cefd1cf8a1b660024b8e2324a6b4a54e19013984f905549df42d7719cdb1a875979b77729723f70d8e43f9bab7
-EBUILD gifsicle-1.86.ebuild 650 BLAKE2B 1202e25ce25e193671835dca4e5a8e4d7c4c5124869a76310cb2b0b762fe8d4d06b4f7990e55e61c32d3c9c64f0d1a99edf108a8354e36ad5ca9641d6e8c380c SHA512 ab68e4ee5e3897296eea9f9cec3207c2f2ef79559d7fbeaa900e5f00e2d7a85840b57077242dcff9f370ee8d6438ede748de8d10ae92a5542a92cf0b897b0bd2
-EBUILD gifsicle-1.90.ebuild 623 BLAKE2B 868e7f02279b40175285676ba12f5d1df4301a7ccfd7a2fb298610eaec16edc7be6f4a47e3cd08383793d18356b7bd32817cae9174251b0cd02b7d25c68ae647 SHA512 9f0d8aa952f205184798e9f0d8778d83a9dade9c04aa395f628c6b8c1cc268a2d0f2484335191a5adda6c5595ba9cf90aa100cad31a14e8e13ea04a0bfaab769
+EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f
+EBUILD gifsicle-1.90.ebuild 626 BLAKE2B c10efe658d8b7bfe90d776ce3dd30e0d253812201a06479a387363d24c73ea915e4d7a161be1c45f1a63b6f996a44a140baa3b2fee3df2d15100d59df85157f0 SHA512 d4edb761f196afad242d81c50f963402248ec8a499fb867136be58fbfbe86556ae876bc5e07883fe010a99f5045e1b8f7707e13dc1a8e00a65f14107b383cecb
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild
index 5d14f6a42a12..4ce9c26ea623 100644
--- a/media-gfx/gifsicle/gifsicle-1.86.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )"
+	X? ( x11-base/xorg-proto )"
 
 src_configure() {
 	local myconf
diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild
index 1120482889a9..9cb9ee7fd17a 100644
--- a/media-gfx/gifsicle/gifsicle-1.90.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.90.ebuild
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )"
+	X? ( x11-base/xorg-proto )"
 
 src_configure() {
 	econf $(usex X "" "--disable-gifview")
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 2203cdcd752a..81c393b8452a 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-screenshot-3.22.0.tar.xz 258888 BLAKE2B 48f997832a8e0f937283a2cfba8880dc9032ea7a3254b0f45dd1ffd3951d096f03899199497ca78fc9be22f83ae8c60bb4f72662a323dad3afc05d2229fd914c SHA512 a532e9cc8615ce22db5805c1857a3bad5bf69a3436a45574384c6c8f848ae67d6991dbfc5556e7cf08f630915c0666bba0c4bee9e4190340bbad57faa9af2ff9
-EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B f2ad4aa2f580f4166e99097f5f99fc63ba8fea74d6b1db301f2128578998116c488cb36cca05dd426a5d03285ecc714f09d3b3e89cb895441fb1206cb743ad0b SHA512 12622777d2c645303e62e2c74fd34fce705f96d3c05de28ce89d2cb424d272f2500aaa8b673833389689db817d362c272a6dcf5bce5ce52f45fb77506fadb69c
+EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B 9f74f14b77d22c51394d9d131a5e03779594f405e2f95c3398b50df057fb7c854979e17ab02aaba1f73ef76dd61262a9d9e57795cac15f2c0946312316be6a6c SHA512 fed2aaf00f661cf23e83f0c86b610e94ed3100d62e8d18bb1fded4b8e72fd98e030e048a8c3aff442eaf990f6a9050431a8448ade68de2c54ce0f8af53b2bce4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
index 8067e0b9f597..7abe28836619 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,9 +28,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
 	>=dev-util/intltool-0.50.2
 	virtual/pkgconfig
+	x11-base/xorg-proto
 "
 
 DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ac268028e84b..a3ab669457c3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,8 +2,8 @@ DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429
 DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
 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
-EBUILD imagemagick-6.9.9.31.ebuild 5119 BLAKE2B 5eb49251e9b0234412ee04e341d81611b4d11b1664042cc657e34788d5997b85185195a5e8a8a484012a79430a7782ab988292f0c8b4c9f40d2d0ed32d3533fe SHA512 5c2f2b6ab47415f90e2b409595a6f43545a5e77679066ddd69f43bff79b791c5ec08fec8b2fd59deb8b96b18f0a56f5cada240791fa5a06d52854745a9030712
-EBUILD imagemagick-6.9.9.40.ebuild 5120 BLAKE2B 881ba981467f841b569cfb7cd10a39128c884e65d7b91178333b8cc49629026ee87ebbc97dd8e4ee28b3c45ce863b9e08e7100b5f5d2141f041b35075f403cf6 SHA512 54dbf1a3f07800ddf1e347ffcd4079086212412d58e0b7aa939022efffb4da35dc4c3e67991233820487a3bbfbc7080e0a09b7d5e35e83ea3df5006daac25773
-EBUILD imagemagick-7.0.7.19.ebuild 5125 BLAKE2B 1385cf3dcd1940be4adf3f29c0f29603e33aeacd11780d5ceff3919477f10214318e8652da2f03d8b9218fb480a2e5bd111855c915c02b37d64a8c7cb9fe886b SHA512 1082239813f4c064fa89f7bf6f2af71f56f00482b428a9beb67e1ba0ce77f3ac51987b0d44557c35076b999d778fc2389f15938c52d722840f242a51d3dd9063
-EBUILD imagemagick-7.0.7.28.ebuild 5126 BLAKE2B d3147cd64da1cd4b63183faebc48a35ee95d38afb60a651f8e9169b543544ec4ecbeb178ae2f60564e35d9ea42c184d9896e7d4a38a332ade76146c448029ec9 SHA512 3b86c740ebc2cbad8e82ee57d1824e7f88a222ea9dd5093f1363db38965618bd063f145930a561daf0dd52d6d869f9332e03abba22257c5420e7b546d6d646ac
+EBUILD imagemagick-6.9.9.31.ebuild 5119 BLAKE2B 2cbb928e6cfe041c36fcdc672fb2a0919cd0aa21fa7f15d9a34ee041038a549e96f714995bebebce79645d8b90bba47a6d57545eba452d7a8067a9cb19553074 SHA512 e2d8cf21b2221d2ce766243ee805ad371b294fe4d00d3a0565ecc296acc027d99d5e6d90a8929621bb7363e1cd4b0a3e12aac34c7f4b2ce93106763b730aa436
+EBUILD imagemagick-6.9.9.40.ebuild 5120 BLAKE2B 743006779fe1fa491552b3296339b20525aee009fead6a0ccdf0a47b0241ea1fa96f92c812a2c76c720b82093ef133abd68a683c4ca93d9b7f7295066a6175c5 SHA512 6ba2b95f552ec595f5a6d53d93a7b51ea087d326b5953e702bcbe98e18dce88aa523a4d4aee57933540c3e9b42e02654d9ceb0faf1499487adb8bb6148f2de84
+EBUILD imagemagick-7.0.7.19.ebuild 5125 BLAKE2B 9fa2d0ba9e119d28bea9119012f1da9ff36e1f46ee33658439fdc7b6d1c6d766168409c91cc9b9850b6a4cb3ba5705517a4b18ba8c42094567263ce97417ee4e SHA512 0db05a2bf38b3be497655cefe90873df4868796874da5607620ea1c65c7e59ed34b16746255ee71d2987c9906a40ca730c48785f6e86c4ec69e2cbfc5c32fb40
+EBUILD imagemagick-7.0.7.28.ebuild 5126 BLAKE2B d72b2d20622f173d4734854359886a2b786e5be9e5cd153ca8adcbb98693b005c87d947063fd368ddf7e39345ff0937c2ac36c746269c8099720298161bb77fc SHA512 292096aa5856a91a8434605172132d5e57a686b4be2422d5e7e0f00dd162e867811c21cbd4693a5a7e51cc1b6aba69692582818abd563ef185b172aae0c0e2bc
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index 1a862494fb19..22edbc5a0ffd 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index 7458e47a0da7..d971391a6a9c 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 1aeb69caf13a..4874250e8c06 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index 5264d406ea24..7b4ac4bbb033 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/jigl/Manifest b/media-gfx/jigl/Manifest
index bfd73aefec0c..7b9468919e8a 100644
--- a/media-gfx/jigl/Manifest
+++ b/media-gfx/jigl/Manifest
@@ -1,3 +1,3 @@
 DIST jigl-2.0.1.tar.gz 35423 BLAKE2B 598371156095a75e20c175dbdb50fd7207d72827f24839c456b96308e876a2d0438ad1191e831efd61d6a62704ab2315c26b2c5c83bc14c5a797eea985da8e07 SHA512 648d00d5c6b57ade66da388dc6168289260006f08f971b9a353529191c06357604a341df371c9638762ad3232efc275cd685c2c3c258472c8503742113c41e77
-EBUILD jigl-2.0.1.ebuild 444 BLAKE2B b307c8e2b8171e95adfd779ff5bcad65e08e00196910735b20891acc1154e6b2282be46909b521c94f99840803d0302e2ee9ea4523cbb1be999ee2cf269c02c9 SHA512 6c3cdf42cc9b8eee696717aa6da1b9f255ae77a607839d942bbf6e775cf982fb23db1d597ba848e3dfe3013644417f5f4ecdb49b997ad2f96a66ca0c69f5d021
+EBUILD jigl-2.0.1.ebuild 452 BLAKE2B c82dccfddebcfbbda12b57113baeeb42125956af90a2d213183500d375dcdaa581c0a5007967ba4bb4a69c474d1026399b6e71f81b0b35620cea2133186c13e4 SHA512 9c705745ecce1148eae2d8f608facf77491fdbf39618f4753fbbfef9145ad7a351231126a014183ea68f5308404a8bc11d4a7f64951e3348061118714e6eb69a
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/jigl/jigl-2.0.1.ebuild b/media-gfx/jigl/jigl-2.0.1.ebuild
index e5e5f2067b43..4b4f15233af0 100644
--- a/media-gfx/jigl/jigl-2.0.1.ebuild
+++ b/media-gfx/jigl/jigl-2.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Jason's Image Gallery"
 HOMEPAGE="http://xome.net/projects/jigl/"
 SRC_URI="http://xome.net/projects/jigl/${P}.tar.gz"
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 3d1d0d7af4eb..9363e60bd2f2 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,4 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 341 BLAKE2B e231ddda6066ba9787f6bf2da8c60ad1b429e7261d2cff3809d0c1bccec80e95ee9aebb4f7a099be8dfcba1908c1ed186b6aef840a3981531f7297d2a975709a SHA512 b67639f655ee752ea2ee3fa881767af46a1f1722510a9e85fd6f79553cda772e9550fd80070084fb85865ee6046469a90b9c90885c1f875d50a1eb1dac59cbd4
 DIST jpeg2ps-1.9.tar.gz 67105 BLAKE2B 68df39df75525db872c683de7b0ed3e64317ea18a54d51fb478c3e51b26522a97081e6953e5ad92f7a6023829dc5fbc5e1e288f2041e76bdecf0b6ef035d1234 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c
-EBUILD jpeg2ps-1.9-r1.ebuild 1363 BLAKE2B ec3abe4df150666312eca88bd92d73ba60d7083a2d88cad799bdfdd7293ae832ad6d61654e9ac371785e33b3300cc5da127edba75cae9c0cc6fae6cc79660d3f SHA512 a0c8092d4d0b84a8fb4f935a72b7109fe881671946c3b641dcbaa1495413746d43ed29b8854a3366bea20f6eb5014a82f2815a570a9b2f162259dd50fd4110e2
+EBUILD jpeg2ps-1.9-r1.ebuild 1371 BLAKE2B cf5a6c2e0d106844be4eb85075dc0c250e3336300cacb1fe4be2d4778f22dcfa7b319f80fb8803a785b5b1ffe21cce378ca7b726aaf504aa24757d31030c1b2f SHA512 498ffae9f9fb9af19a6656709aa8fb088d21b4753d1de48f038ff9bd859ceec7a312552b8c6913368d1d0b1be63fde81f3a1257a6d6a70017bdfdf51b3c9aeb8
 MISC metadata.xml 328 BLAKE2B 04a8462385dca7aca1047d2033773cade34f5af1eeafb1dfbd30dbe721064d2e1e386632c0c0d2e662e3155ed190da109f9d06bfb8395da94d605727619d132e SHA512 a8558499212b37b0e2309500cd2ebca93ee94edd86daa9f203173ba9d4ba9803fac69802dd067b71e7422a175a113961b8e6e139312dc2444f711df59de0e7d3
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
index 7ee60c97d61f..d3601094ce6f 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Converts JPEG images to Postscript using a wrapper"
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index 2ae561fe23f9..ca0cd2a10e4f 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -1,3 +1,3 @@
 DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d
-EBUILD mkgallery-1.1.ebuild 520 BLAKE2B c7cf35c803ff12bd7b70d18af27743e3177ffb8d4fccbac9345812c176c4b389b1c3301de2842a0bcea87e8c23ef09f3d98eb915e31898fed2f20401e2bea769 SHA512 e134ea9a27e0fb7fd8f27e2c10336b7ab031a5dd6e48b5bdc638afc8903a0fe5c6606a36501ec5cf62a78cdba90cd453266d8d213083d69f78f4b45ad9c3ab80
+EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82
 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651
diff --git a/media-gfx/mkgallery/mkgallery-1.1.ebuild b/media-gfx/mkgallery/mkgallery-1.1.ebuild
index 6915b66ce5f2..177b193e832c 100644
--- a/media-gfx/mkgallery/mkgallery-1.1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Creates thumbnails and a HTML index file for a directory of jpg files"
 HOMEPAGE="http://mkgallery.sourceforge.net/"
 SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
diff --git a/media-gfx/opcion/Manifest b/media-gfx/opcion/Manifest
index c81c11b8ebe9..36f1ef3a7099 100644
--- a/media-gfx/opcion/Manifest
+++ b/media-gfx/opcion/Manifest
@@ -1,4 +1,4 @@
 AUX opcion-1.1.1-fix-source.patch 408 BLAKE2B db69614febebd183d219dae70717e3916d6747c5dcd1219303ae3f1a6f8f565aa70d8e21762b1094fc6ae128eda584b7026ad6ba39375856c9fdd57a4a114849 SHA512 3097cc8970296bf9d571c44ac9c07074c88e7a3b8800082dfcaf94c1daa0ddae8c56f7101c5052d8382ac554a725debbb7a3271fd0257ab195d63313133f18ae
 DIST Opcion_v1.1.1_src.zip 319793 BLAKE2B 1c374f7e52ce7f313b8bc5b99ffcc990ccef3776a4e48d2499d3c3e8dccdbca353e00b109dc2f1fceacf020d095106d1c67569a23f65f1b891dc0bdbdf902070 SHA512 47b4729a54b4b76fdd5ece01f40e700f6c942df60a36956e08383aa24bb436e59b40df25d42d2d7c6b01633a92c7449a8c7f0acb9a9e63af76d1054373f51f14
-EBUILD opcion-1.1.1-r2.ebuild 1344 BLAKE2B 0f7e227d2dbc0b68e72c365b2c13f7ce25e0f3b5e7d2a307164fd2a9710686233be9e18c97d6cddb5713c7f0788bb9785c8fcf3bd0166a72200c8a64e01a03c1 SHA512 b544dd18f346a5c7aa4cb278d593f5b82e3432a42682e5710e9c1f0f608e7e1c9ac78ef32ca1dea09f7e9f8aa08773121739877a5614740e3039c0308d90d9dc
+EBUILD opcion-1.1.1-r2.ebuild 1352 BLAKE2B cd9799c147bc824803f872f20616f4f5b71f863ff6195f735d8a9d6df3b745d02d494887df0a6d68d8fb5ea364ff3ca209db23253e107ab184bcb92a5c497e82 SHA512 6ee0fa78e5a3651c44bd716f8674b0b8e70fbe6b07574b01574bc6ad55bd4a8859f0d37252433132fa4d43739f5268debf8598820947808d0b8692c1949395a9
 MISC metadata.xml 314 BLAKE2B cd7e5e66092292581e8368d19331e42bbf2d9cf9cd9ba11a1537938ffcd8b04acdae9edf2250822452ca2cab8a4526dff70674059faf90c47d81ff56c91ac441 SHA512 2d933e44fbd5ec8dc05d7730bbca4f1d80d658f5735706fdc2ba3ce50b1637f37df9e5054d19e3e0e3869ea7b5417593d05bc8eaeaece0239000204666706687
diff --git a/media-gfx/opcion/opcion-1.1.1-r2.ebuild b/media-gfx/opcion/opcion-1.1.1-r2.ebuild
index 421aa9e100b6..9d00507f7c00 100644
--- a/media-gfx/opcion/opcion-1.1.1-r2.ebuild
+++ b/media-gfx/opcion/opcion-1.1.1-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils java-pkg-2
 
 MY_P="Opcion_v${PV}"
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 8d71405a5f6f..2aef14735796 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,6 +1,6 @@
 AUX pngrewrite-1.3.0-gcc44.patch 411 BLAKE2B c1df75d9f27385c4f71a6cb87007d9eb50bc688624d95096f909c94ef853a51ccd7d681b8c5999ba63e2a0ea1c1043a99f180ebb37518a34c8ea5fde69943b10 SHA512 e0a4b22fb59d524f1936c0ff78977e6c75ef815fb1aa89fcd1be6b3e05fbed8d48c290bed83a45dc400c537d49a3c5d8a640de9531795e25181b94f1e90b69b9
 DIST pngrewrite-1.3.0.zip 105995 BLAKE2B f09ce3b542e7013136e9244f89f6be5389df0522296bab609ad2023acb0a9792ee4ae5f9ba3666682c5d81c2364530225f5b306417a8e26d468f39e74d99cd68 SHA512 f146d69780309c61246f71cbc58081e1e357ea0cb58ee7ae5908075ab9cf86218f3eed956ff32df39efcebad7a743bf303ce1a50753d4d4c3710968002a75f1d
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
-EBUILD pngrewrite-1.3.0.ebuild 694 BLAKE2B 6d083a39e1c67225483a6e77f730c754d4896ef80c2fc07ff19a64e8ea387c12710fbcf208c83446cfa5a9a0827d7e2dcc3d51c7ddfe5db30c143b97448166b0 SHA512 6150f0a3b0e8c0829cf697bfbd7493cb28587b8059de6af6da88fff7c932e7cc4c487ca0645f28a2045d64342eb2c462b88962de8956823b139d02bbe4cd0814
+EBUILD pngrewrite-1.3.0.ebuild 702 BLAKE2B fb84c0a1afcb918156f2db5ae747efa3e846ccf77e0f04f04022bed5473b09f5270812874fd00abec6dabeea1b8c5b11e7da549497201c933a5a968885cf94e2 SHA512 f4afe06f24b456c3ba90988540bc618cf07e521256bd247047e33c15e794bebf2ac36ae51c8f5b07ab5560dc681622c94be14935dd74bc1f7ba00d942dc94e56
 EBUILD pngrewrite-1.4.0.ebuild 630 BLAKE2B a8aa5ac17ca5a7eaca48ee7629a7b6e1c4b336d2d93d27f0027b94cdbc74be7659af6b678755cba2d6ed8ba4e1662fa5d844f547f6a33fbae8e215380d5482fa SHA512 958c207b0b43586ad01fc7058fd06455339d4d18ae669bd510b1627d3fa406bcf057bb5e7059b2489597dffa7d68d0da8ad47072ee9594383bef454e8c0329de
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
index 4fdba3ba5d7a..62bb8328e0f3 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs base
 
 DESCRIPTION="A utility which reduces large palettes in PNG images"
diff --git a/media-gfx/psftools/Manifest b/media-gfx/psftools/Manifest
index 72e61029e09e..70a4c14f6e1f 100644
--- a/media-gfx/psftools/Manifest
+++ b/media-gfx/psftools/Manifest
@@ -1,3 +1,3 @@
 DIST psftools-1.0.7.tar.gz 547537 BLAKE2B e3f3acc79efbfdf42a804f665553d7cbeb6c431cd36f3d26b3af37251197fb697d28127ed94ec2f409d4793272b7a5c293b1ba12ec8b94206790aadcfee4a509 SHA512 9135f4aa8ea4a4cfdaebc7764db0409b304dc34310ebe84d6fc786d42a392c79da4f097b6b3526edaf862305edf8794ef62f6bf48a3de5dac22c8e0c0c77aa14
-EBUILD psftools-1.0.7.ebuild 443 BLAKE2B 126cc32ae577a6731c7a7b7e71dcaa760c7d75ac04aaa6b1db355de9890ba8b1ef0f92a544faa7954f073c02d265506d547957c43be03d476142c630372d9f02 SHA512 633511d8c0a2c36536c6ad15a9f22c0d14ac8c43fd7df838dcdf9724ddcdd942122a4f4eaafb615a7dd115ca59edc4d009e5bf84120a52a45f5b90f3a980b322
+EBUILD psftools-1.0.7.ebuild 451 BLAKE2B a90833253dd9858128716ee954d6290e3befdb4473f527a953210ccf01c89c6c7f33eb838b51d359bdd305c05c1adc7c3d45588431e1073ebf6b2219f0c042d6 SHA512 b4cd1316903e27803bf9de32adfae88fb74c79574a537d6a3a342b123facf4ee9d4e0c49872fbc6078936d3fc7560382f58ce19631c7a9c8d5f482b99f201fb9
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-gfx/psftools/psftools-1.0.7.ebuild b/media-gfx/psftools/psftools-1.0.7.ebuild
index 2cdfc40cc302..e9e8e4bbf30c 100644
--- a/media-gfx/psftools/psftools-1.0.7.ebuild
+++ b/media-gfx/psftools/psftools-1.0.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Utilities for manipulation of console fonts in PSF format"
 HOMEPAGE="http://www.seasip.info/Unix/PSF/"
 SRC_URI="http://www.seasip.info/Unix/PSF/${P}.tar.gz"
diff --git a/media-gfx/splash-themes-livecd/Manifest b/media-gfx/splash-themes-livecd/Manifest
index fb42d0381f92..aa9d5fcb943a 100644
--- a/media-gfx/splash-themes-livecd/Manifest
+++ b/media-gfx/splash-themes-livecd/Manifest
@@ -5,10 +5,10 @@ DIST gentoo-livecd-2006.0-0.9.3.tar.bz2 3207382 BLAKE2B 0da84d7afb5fc819c29a380e
 DIST gentoo-livecd-2006.1-0.9.4.tar.bz2 3447608 BLAKE2B 4374a37e28efad824d0fdacae9cc26ed5f5a35ec89fd6a3c01b78a98c8f49c5b02b6d035843e3bfdf1c96a143c8d8832dcdbb0cde95e60e6e75c83cc96e085ff SHA512 e2928b547c6e7fe5e8c633f0a2e0363802c2b8f1fc5eb112a7be727b1a81b95bbb9889509efacbe7d6f555750438a1da7ad3705d9a2315ab15152c3794ac024c
 DIST gentoo-livecd-2007.0-0.9.6.tar.bz2 4760433 BLAKE2B a942ecf0976e605b10f861d73e2009ba215fbd3ff4f313b8c04f2fbca623d584660405a92a0976f9101e0a371e3016c9ce032d1912fd8d07470fe4230e710682 SHA512 a5a1ef2f10c9880d546184772108c56d5c700707199408ae63389a5bd7bec9c526f73631dfe782cceb88242ab8e8a56d14755552500c589fe1958e75e8b5015d
 DIST splash-themes-livecd-2004.3.tar.bz2 1790707 BLAKE2B af0ad28814b07f0e5ba5d91d656077e6e1e2fe81102887fd22c288146c7ae3405a18722f7ff14042869bf4e320a4f38bda8f0219444b2db39f82a64a378b8a91 SHA512 75c897965cec7173c09027a8578e5047f7121e4b64f09f169ab40616bda412d555e5a4e42375082d685dd73d2d1026e18788408b36e9a690c41a0ba83759498f
-EBUILD splash-themes-livecd-2004.3.ebuild 511 BLAKE2B 77fdf547ee125a6441b5d1959b5017c9113eee62636dee527058e08ddeab1fedc7fa7b40691efad592dd28ee131b1c66a76bef4ee0d610733c55621e0c7012ef SHA512 c9e6323a9368ea354e53a173a2e28433f3849a722925248e5de8daead7b525ff0e65d30efac839bfdae13cfd8eef91f1f15cb11a958d039b505c76103a6ae4a8
-EBUILD splash-themes-livecd-2005.0.ebuild 734 BLAKE2B 3c1c8311fdca6254a89bced1b65ed8b02d8b7469b633f38122d0e6576ac879f1f334047dfd1df98f5338fac4e3d4a51387a8934c34cc4809fa3e64cf8de45185 SHA512 878615d44cc4ead46f05060cc7c6f6fe01e4f3a60df54fbcaf286ba200f8ac0b566f62de5ecda8bb0e34fe986d71a9319ad094281d067d0669ae7ab857dcb2d9
-EBUILD splash-themes-livecd-2005.1.ebuild 833 BLAKE2B 288acefc73fec7a1f6897858576749d40969e75cf8150d75b1f3d463929fa748f2f382b0626175ff49667018559843be732dc5751d19e0e738167c785c161946 SHA512 5787872e41d7aa6a8504a3e3a9af5ab9b6bf4202f96a3c012a8573a7407cd1e77458b5ddc7fe5410c22854b6c38373d910111d21a11cdcd3e857d4687faee27a
-EBUILD splash-themes-livecd-2006.0.ebuild 716 BLAKE2B 7a6b97a783d503117e1c506b06d8161702108e81a3055221fa218ce6cd71c8c7f36e0c6bf210eb769e4b2815b4effcfada23e5c64d461126a738ac6ec1821f37 SHA512 553bd4c097b0c076b0581b05fc64ea2153f2d42162e001a7f1e893e0369a9b12e1f4303e154d689810220d00c63279d72216228a1ac41848fb9a6796fca0b8c9
-EBUILD splash-themes-livecd-2006.1.ebuild 720 BLAKE2B b568bef343bb437bae560e72c074844b3eac76a6d5173b2832e7c07e8d403ff273a40c560b683e46402fe9493e9aeae79f444646db68c60234095309572f21c8 SHA512 d7ff46f6358fe5aa06b9b772c36cbb0af1c7e889896dc2351347d0b8a1848c55b8c525b29a6d7d00d191bde1c58711bb7a18e63a940a433d4ef8b9bdc156f78d
+EBUILD splash-themes-livecd-2004.3.ebuild 519 BLAKE2B cca7808a9dc949ccd2674ff3c0ebb7927ea928922924357014e81fcbb17068f800458e2095a2d8c590ca881875ce2c27a33eeaf2a9ef16a102ab3268f3c4a954 SHA512 792f55e53308d1ac8be957a4f62e3ebf5ff6672671f370aee8d8cfd14ce2ad668928b398b7600f6ef9151ec8755beb25ddde43f8fa0028f9a1404bf83788756e
+EBUILD splash-themes-livecd-2005.0.ebuild 742 BLAKE2B 3801fad364a566a2430044146cb2b54c0c9928d213c22c3563d57bfe116e79d9236865055f89ea0916cbc10a53f17b963f2ef9d184f93deee55533a587a47b8f SHA512 de2127b1a4cf104489afc696767052a4dde5878f4764a6970bd83e5bffdb388cfe9a20a67a6c68c4dcdb6d5555905be59f8ed0355e327d61246769da9860652f
+EBUILD splash-themes-livecd-2005.1.ebuild 841 BLAKE2B 7985bf3a777f36fe41287b87e4d25eca78ae188637d835d44f721e8c744f5eda92bb7dd68be29b45eca3858a9d7174c138c570c11fc7cb301a7b320a63fac9cb SHA512 50fbecf77d7431cd3a7167ca3cea32d93da4244a74bc845a4acf2afb1a79270b003bcfa008f79813d72dea9039daf2218583f39219183ee3276a0d192eef1370
+EBUILD splash-themes-livecd-2006.0.ebuild 724 BLAKE2B 930d5fa2933c46c42af37cff288a5b6d1fbec525dad88e5f23ea26ef5fd8f996a8b15d301f6a11ac461a32ff25a064c16bd655eb3034d5b5f03b08ef92647c5b SHA512 a3759bed721200907f7169d0d693b1dc7d3eb4eda26a1b4f6425c7c721fafb167f895d4ca4d4c934d946d34e0cd0d284180f19a803ce712a5cbe4960880a4189
+EBUILD splash-themes-livecd-2006.1.ebuild 728 BLAKE2B 5a3806a98c01bad9377b95e909c78401508ca9eafac4f8557f847d273a59fcd0fda06f309a970ba7f19d169a877e052c9ec4a87aec7520de410ad77eb9e8c5d3 SHA512 c3c23dfd418907bf240905f3c486bf689799bc6f42038e877a4e54102504a181fcc5eacae9b9240842efdbc508a0259d9ff43bd54aac9d1e3297e0543ed18a59
 EBUILD splash-themes-livecd-2007.0-r3.ebuild 721 BLAKE2B 177e95111706f28e088597b6768504e7b376f9b04e743d6d7ffd8f16c0150073637c098a90ce4bb6f5bcf1d6256b65be915850ce76bffc960f7f8d3cccfd1389 SHA512 3efd8574dae88e32a0c56a090bc13517d0bc3ca9c0508f8df48292e56c1bb1d583f4c5e02fdaf892987dae124c016c0be74b0c1bdd31cef9fed1a30cd3b02225
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
index 0c33a319051b..47cedc02f9bc 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 S="${WORKDIR}/livecd-${PV}"
 DESCRIPTION="Gentoo theme for gensplash consoles"
 HOMEPAGE="https://www.gentoo.org/"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
index 0a81732e5410..7a0bff437888 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.1"
 DESCRIPTION="Gentoo theme for gensplash consoles"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
index 75c895bd71a8..9f3806493a10 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.2"
 DESCRIPTION="Gentoo theme for gensplash consoles"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
index f33946acddeb..17bc45e58a98 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.3"
 DESCRIPTION="Gentoo theme for gensplash consoles"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
index cce53f3873b2..a47bd26782b6 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.4"
 DESCRIPTION="Gentoo theme for gensplash consoles"
diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest
index cc96b753ff57..56de24b5849f 100644
--- a/media-gfx/springgraph/Manifest
+++ b/media-gfx/springgraph/Manifest
@@ -1,4 +1,4 @@
 DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325
 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b
-EBUILD springgraph-88.ebuild 886 BLAKE2B a980762f30fff863be905e26a8dc19a8ea2f6cf8ebc32b838c1cdcd44bc826f5f9c299d83a531c5ad52259b5045379de29752b4d79e3c78ccf0e2f9cddb7dc64 SHA512 596febcf313fe66ff26e3a1165550c7346f26cbc295b1f9f017cdbc53ee1bbcf6b2554d4a90b4986293e20c70eaaa019c74c3026859710342e4dc6f5859067fa
+EBUILD springgraph-88.ebuild 894 BLAKE2B 186bb3fb4be074d0ffe04aad45c178c68bfeb4072c4a92ebabfe8d9b30f029c6bb8e917f343fbc576ec6b564447c724dda0c1024ae035edcb4004497e658977e SHA512 f2238d0f7cd754cad397efb1de8ffc29e7d6fff24affbdba59a19e0809680dc63922efbd8a97073504899d49c8f8832f8131fb148db334ce282dfe76ae6c210a
 MISC metadata.xml 709 BLAKE2B 73334cd9360f91db9fd8a0064edcce559dcd700771b8bc1a1f73c013bd71f56a9c6aea18bd30e2d908fff63c2bca27389c11a81edff03879342db8efac191be3 SHA512 f0dca73c130603698093f900d702c6d9d8fbc6bdde5cb95369d24f0dca7b5f35ff68d773b8056b5cf7f0f8f3bd41b5a55bbd68e4323f32d4d6a74eaaba4d72f5
diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild
index 5b76e3db5e66..8b15f006c874 100644
--- a/media-gfx/springgraph/springgraph-88.ebuild
+++ b/media-gfx/springgraph/springgraph-88.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Generate spring graphs from graphviz input files"
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index 77a60c59366e..2c5d14736ba5 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -5,4 +5,4 @@ AUX swftools-0.9.2_giflib5.patch 678 BLAKE2B 1bd7e82f2faa13d0c56c6e769efca3b01b5
 AUX swftools-0.9.2_nopdf.patch 2366 BLAKE2B fe2b7f826a557d9a67d18851b085b3f3e045347d789d8c9988298b082b834bdbfe21a02eca195f49757ac14e2e8407b98590d31bdd90a736328ff20fdd1810a8 SHA512 aaecc86d3cea1b97d748959fdf00c4249891bc3ff4d668e7d7a2ec5277e53cc9bda9281a2de065c9395aab49175f5438822d82641a24768997ec48cd4bcd213b
 DIST swftools-0.9.2.tar.gz 2675939 BLAKE2B e5d2edcb5a23f4c174da61bee97eb708e71a0b14657b27dc01294ee8b368fd53cca08c7c354c9c038a02c4a3e0220d90e80f8637c86469eea169a431f35d0573 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
 EBUILD swftools-0.9.2-r1.ebuild 1038 BLAKE2B 3388878b979a979759875aa42a8b1804362950404ef7b216507058085a7637b6f3a9c6e0d82a298ee47e50cd67c532c78a936ef64f298395e6db28f251d9e1ed SHA512 c015470a0880dda540c2ba139bb5c45a55877ba821e0216a5c0bc917d4115ba948f6235d0eaad26391d845c63ba16e6827630eb0931514cf756917019981b192
-MISC metadata.xml 326 BLAKE2B 29728e600aa2567624be3be97b43bd4be59bddf2c30fe55df8a918891050233d5c9278262d5622ee14c47ba29bc41d978e41d1b6cf5bf9ac1cf702e3c0e09741 SHA512 87b54a21fac364103ca858170d5fa36b7eec93d29f73ef748e0afa89665900c62f046cdb4fb62169b241ecdfdffaaf2b8049fcbad708d5baff3d7ed77a926c01
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
index 7e0acf82177c..6f49eba8f496 100644
--- a/media-gfx/swftools/metadata.xml
+++ b/media-gfx/swftools/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>dblaci@dblaci.hu</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 11523c5a547f..cc7e1af21847 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -2,5 +2,5 @@ AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b1753761
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-EBUILD xfig-3.2.6a-r1.ebuild 1188 BLAKE2B 20b4641d066b9634e046cd4e2cda4a3e975aa729133f7e8a63d73854ccba53d8b2c1a19afed2d4d8136dfa3acaeda4b6b56e52b3913abfb5f0371cdd8cc70967 SHA512 0f509415bed84d05fbecdc404b3ed09601dc7216ed969d5879c939a2d91d942ec79dd7670ebe103675086a924986e517b39210f77ff81f1b93dc4ae6517a93cc
+EBUILD xfig-3.2.6a-r1.ebuild 1169 BLAKE2B 20645bb76b9368fdd233a1ed1ae0e4e203aa9c5e158be1b56dd30c03daf1d81ec7ebdc33fdb25f0b95263759253bd072e7aff55c2454471e33156251d70b1cc4 SHA512 3ff5e96b91d7e7964b1613b4fdd3e78a17e36f60d7468433a9efdb7b9d7c8c2bb9d4c3832d663362f273c5f5dc4eec5539e06b60ffc8f95ff402e05bf937b02c
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
index 4104b2e0d1a6..d68fd060b615 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -27,8 +27,7 @@ RDEPEND="
 	postscript? ( app-text/ghostscript-gpl )
 "
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto
+	x11-base/xorg-proto
 "
 
 PATCHES=(
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index a38a0cbce72c..d6df8409ea5e 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1940 BLAKE2B d0e980a9de5ba0ab9ccddd831e75b32eb2f5366b3b7b1265423e6b3d5c1df8daa7f28856a9985877f71cdb387efd2c38bf94ad2f246a159c177ec4ee7b1ff45a SHA512 e95f5c4f013af5d4d42acab2647e4a82c9cb3d679e6c19471d2130da721f9d14942a9c9f1b6643fe6867e41143e91f61edc5ae71028d2e0e361a3883bcc5fb4d
+EBUILD xli-1.17.0-r5.ebuild 1940 BLAKE2B 539399e6b68c4f2276d4fdfec33fd4b8b498dd827d7e845c9289ae38f0f02680a22e51b721332692d2b2d8dd12bcdbac035a79059847c829f9e4d013010b9f6d SHA512 0b057dde5cb1e77023c59d90fd6279c01375c6953909d7a1b98586c09426bf78099d57ddde47ead9ddec3507988ebbe8ccc36609eec2519cf6bad2db349849fe
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 64185ccfaefb..fecafa404d77 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2
 
 DEPEND="${RDEPEND}
 	app-text/rman
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake
 	!media-gfx/xloadimage"
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
commit	7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree	bac2a67fb24ac0836147fe370d30e1610ae1845d /media-gfx
parent	2f8db31405fac68eea6f7257d58529243815033b (diff)