gentoo resync : 19.04.2018

16 files changed, 73 insertions, 96 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 785aafe0097f..f3ff74b492ed 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gozer/Manifest b/media-gfx/gozer/Manifest
index 67de65816409..0ec5a44a3032 100644
--- a/media-gfx/gozer/Manifest
+++ b/media-gfx/gozer/Manifest
@@ -1,4 +1,4 @@
+AUX gozer-0.7-fix-build-system.patch 1600 BLAKE2B 2d1bb419c587c4c24bad15f8b0ec99f6052e6ff924db9e3ff4a26a7e04f2b2ecdbbe2bb0a022b24fc4c4150499ad562289e9311b711de71cf1dea280a2299276 SHA512 a17ffc77e3899dba47227343d7f3b656d3223085b8419460b73031c50e46d9ab5d7668154ea10cd733b3f3c2693649c355bf43306ef205213a42d2b990cc4648
 DIST gozer-0.7.tar.gz 103545 BLAKE2B 5eb3e2da348204f6fac9c00b681df56d4d419df671d9967c0b05b78838fd9b2ec4e76a7f2df07396e6aee1313117f72126aab57732d4b9713c54581bfbe3bf3d SHA512 ae39b74272f87d5e9bf71c9df7e6e9ac37a44a54dafba45aa5e8037657ba128e4e6c77a5624921fbca5c57791a0047f491013582cd9e5a6a5c8932a23233a29c
-EBUILD gozer-0.7-r2.ebuild 760 BLAKE2B bd8df407d063fa3d40c14fea2e6995a4f30d21aecad4f0499ca868b39fc7b70c266b44f3cdbd312f20b132ed8a2727b44d6756b31a713690c892be82d1d22974 SHA512 4db8ecb35307fbc730100c259c18b509473bd9793d829afb430a158dc4e430aabba87983bf865e8c95d68cc47e46a180a1d4c17f3f8c337d9a870592f43da8f5
-EBUILD gozer-0.7-r3.ebuild 768 BLAKE2B f6ac14b93153c88f022e04950b113d0b54dab1e119da979de6a228f45dee770c67c52b7332eda25b698f352c94fe2445850385667484ade88cc7c57c9c4772be SHA512 bc57b6c5374a0db074363cb9fca5d1fbf955c6b3de5d28dc6c01d2d3fcdea87e34662765b364f1f4e4c6db4f332b5ac75c62aa6eb49a458aeb3e86a9277b6a55
+EBUILD gozer-0.7-r3.ebuild 602 BLAKE2B 9aee70b89e2c5aa1f5557ee4932948812543ff3da79891fa680d9fd087055d1c55aca35bb974b3e554c150fd2ee018a67971feea64c9fb947ab5e75764dd4f96 SHA512 48f681c15824aa2d0ff9d64ea5d1ebd6207c587e73b18f62d161d5c604520351cbbfa8298c9ae0ba3790e1a259d9069119717682fa4b7a5cf7dd41a85c010216
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch b/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch
new file mode 100644
index 000000000000..6102fe9c64c8
--- /dev/null
+++ b/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,14 +5,9 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in gozer.spec
+ 
+-LDFLAGS           = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
+-INCLUDES          = -I/usr/X11R6/include \
+-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
+-
+ man_MANS = gozer.1
+ 
+-docs_DATA = README AUTHORS ChangeLog TODO
+-docsdir = $(prefix)/doc/@PACKAGE@
++doc_DATA = README AUTHORS ChangeLog TODO
+ 
+ EXTRA_DIST = \
+ gozer.spec gozer.1 $(docs_DATA)
+--- a/src/fonts/Makefile.am
++++ b/src/fonts/Makefile.am
+@@ -8,6 +8,6 @@
+ fonts_DATA = \
+ helmetr.ttf
+ 
+-fontsdir=$(prefix)/share/@PACKAGE@/fonts
++fontsdir=$(prefix)/share/$(PACKAGE)/fonts
+ 
+ EXTRA_DIST = $(fonts_DATA)
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,15 +1,13 @@
+ # A list of all the files in the current directory which can be regenerated
+-MAINTAINERCLEANFILES = Makefile.in				
++MAINTAINERCLEANFILES = Makefile.in
+ 
+ SUBDIRS = fonts
+ 
+-LDFLAGS           = -L/usr/X11R6/lib
+-INCLUDES          = -g -O3 -Wall -I/usr/X11R6/include \
+-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
+--DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
+-LIBOBJS = @LIBOBJS@
++AM_CPPFLAGS = -Wall -I/usr/X11R6/include \
++	$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
++	-DPREFIX=\""$(prefix)"\" $(GIBLIB_CFLAGS)
+ 
+ bin_PROGRAMS      = gozer
+ gozer_SOURCES       = main.c getopt.c getopt1.c getopt.h gozer.h \
+ options.c options.h debug.h utils.c utils.h imlib.c structs.h
+-gozer_LDADD         = @GIBLIB_LIBS@
++gozer_LDADD         = $(GIBLIB_LIBS) -L/usr/X11R6/lib
diff --git a/media-gfx/gozer/gozer-0.7-r2.ebuild b/media-gfx/gozer/gozer-0.7-r2.ebuild
deleted file mode 100644
index db1e762db93e..000000000000
--- a/media-gfx/gozer/gozer-0.7-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="tool for rendering arbitrary text as graphics, using ttfs and styles"
-HOMEPAGE="http://www.linuxbrit.co.uk/gozer/"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="x11-libs/libXext
-	>=media-libs/giblib-1.2.1"
-RDEPEND=">=media-libs/giblib-1.2.1
-	media-libs/imlib2"
-
-src_prepare() {
-	sed -i src/Makefile.am \
-		-e 's|-g -O3|$(CFLAGS)|g' \
-		-e '/LDFLAGS/s|=|+=|g' \
-		|| die "sed src/Makefile.am"
-	eautoreconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/doc
-	dodoc TODO README AUTHORS ChangeLog
-}
diff --git a/media-gfx/gozer/gozer-0.7-r3.ebuild b/media-gfx/gozer/gozer-0.7-r3.ebuild
index 05e8079d3ba2..eb15f0c92d2d 100644
--- a/media-gfx/gozer/gozer-0.7-r3.ebuild
+++ b/media-gfx/gozer/gozer-0.7-r3.ebuild
@@ -11,25 +11,20 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libXext
-	>=media-libs/giblib-1.2.1"
-RDEPEND=">=media-libs/giblib-1.2.1
+RDEPEND="
+	media-libs/giblib
 	media-libs/imlib2"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXext"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_prepare() {
 	default
-	sed -i src/Makefile.am \
-		-e 's|-g -O3|$(CFLAGS)|g' \
-		-e '/LDFLAGS/s|=|+=|g' \
-		|| die "sed src/Makefile.am"
+	mv configure.{in,ac} || die
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	rm -rf "${D}"/usr/doc || die
-	dodoc TODO README AUTHORS ChangeLog
-}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 8d46a2b618c0..243ca9e6a8f7 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
 EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
-EBUILD gscan2pdf-1.8.11.ebuild 1733 BLAKE2B de1f8b855cbecf6a06846ce673d7b27f23a496635dd01e7d897a400bdc5ab7f7def3e5c099402bc5712e8f993740b0da160f3d4e3bdaa58dbccd0f27cff2c229 SHA512 5f4f08dee9d0b82514af42f465a70a9a460d1e21fca6421365413b3cc5b2af04480d8153c18a9bf243d515ba28515cae7b3337c1e71289953d9ef2d11d007597
+EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 3c094262c8e7ebace698992703f9e7ea4fe156d11532d80d1b8112ab347a4aebb35d2ce89e41a6413650053c654139a92dfaad2e57e00f0af54339144d39e626 SHA512 337e787f9a1500243a133bd83f66a0f2e0098221bde49fd8ce7343ea14300b2a23110ed1a6eaee66bb835514910e1203bdf207cbee25a7e7d2341f40056cfbd4
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
index 96b14c3454ad..9cb3a35ed0e6 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # OCR tests fail with tesseract[opencl], not fixed by addpredict
 # and others on Wayland and the console
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index fb69996b2775..479f55d4706e 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,4 @@
-DIST qimgv-0.6.2.tar.gz 233608 BLAKE2B 563a5a88cd870fa0f0a7ab3c426f31f889c3faf2463ad1d8404ed410d75bfcd1d89b76bc94b617246e3a42c26ccc84c7e2721278c83afde20c45f74fc47456f5 SHA512 ea553f646943b86268beaeb26116b4fad97f5462363babf6339f1e0f854140e8c9f71b957e73bfe73a9eb3e30e1b2338d21def753f63e088e9742a56550335e8
-EBUILD qimgv-0.6.2.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
+DIST qimgv-0.6.3.tar.gz 238521 BLAKE2B 55da7c0e7b18547e7c2e2ab76f0a535c655c898707641c896469a07040e8f7f1a6e80580143016e24cdc0a7d9e2287c0d081ca8d262337faeea5d02168796a8e SHA512 c18ed0678bc094fedb339cfa227a5ddace6728b724f7640e4b018e52aa49dfb80d18879b372ab25bbf9e8c38497999471ba35a9bea5cd6b18d5ccbf1e55f3301
+EBUILD qimgv-0.6.3.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358
diff --git a/media-gfx/qimgv/qimgv-0.6.2.ebuild b/media-gfx/qimgv/qimgv-0.6.3.ebuild
index 9226ed2e10a9..9226ed2e10a9 100644
--- a/media-gfx/qimgv/qimgv-0.6.2.ebuild
+++ b/media-gfx/qimgv/qimgv-0.6.3.ebuild
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index dc9c1e14efe3..70f09190b09a 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -2,5 +2,5 @@ AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57f
 DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
-EBUILD qrencode-4.0.0.ebuild 884 BLAKE2B 5ecd8b00e533621f4b3f2c61d4a2a04f946c1a81f294bc5a9bd851e01bedd6a1c98841217402ee12888542e7c20519912b26c0fc749752bf5d719c5581cb40d0 SHA512 014a1462e30e06b56460f5d9a5d0fc7173a59761f507616550a5eaa85cb9bda2e9c94287e4cb2b88908cb05efe96f90d3a00a0571c02aea4b95e6d4c46f39875
+EBUILD qrencode-4.0.0.ebuild 882 BLAKE2B 264b5ffb21441035e6265055bdf06247349e905f415dda2e4dab68d40bf96960af08efc004fdafb32faf55bc45a1fabc02ccb98c92849d241ee5e25099cdd584 SHA512 1e28302ed541f06a34d46cea102bc6c1b55b171b17a33fe0ff5d2aebcb1fc8db560ae070af517615ab528fa504bbf24b1db83bbf414134e556b032b613f23b55
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
index 2a64ffeaa65b..cafc959fa029 100644
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.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
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest
index 658b2571bf22..489b038afaca 100644
--- a/media-gfx/quat/Manifest
+++ b/media-gfx/quat/Manifest
@@ -1,4 +1,3 @@
 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b
-EBUILD quat-1.20-r1.ebuild 781 BLAKE2B 7543f7b522050ec126b6a3934ef7f7ce480434a4a989dcd55bc3e0ff84d9a38cf2e3a7f5e71d1e653cf467f8a5d67f76c323205e2aeb6be19a581e9f95bf98cf SHA512 1d690b02e86c8d45592c274caa716c739453e92bce6c1ba35ad6e9387c4f15a7885830fc9c1d93e8f00de7d31345f4d5be3cacab1bfd969f541f34e16d4884c8
-EBUILD quat-1.20.ebuild 859 BLAKE2B d524d9af4c5e18d9371fc61d3e9116ca6b043ca16da08de36bb1de2ccf6f746477f4c1cfeed4f5df0b32af98f349d85a0fbe69328806e1a70068d95ee2015f46 SHA512 82e50cb8a8de385b6ab415482c600069ce601898e75d3cef46078fff5d9c2cd2f81511b79600ff597dd1e08440118fd745e0a47cd0b30361bd08b67bf21dcc7f
+EBUILD quat-1.20-r1.ebuild 780 BLAKE2B 43711ac29ab670bf397c0f56a1c1ef0225d42bcb014b2dfbd5d66c30b785dcec6d6670e2c29cc7adb238e34f09e0337175d2031b45125fe232bfa68f775815d8 SHA512 329a196367104144f28bda71483531655bd59a7f13f93c0e308e8c5212c7dd34fc6f57af7deb105cfaec84ae14a2d9888ce1b651a21d889eb182784450022b5b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/quat/quat-1.20-r1.ebuild b/media-gfx/quat/quat-1.20-r1.ebuild
index db86e456d4cf..8c1256dbdd07 100644
--- a/media-gfx/quat/quat-1.20-r1.ebuild
+++ b/media-gfx/quat/quat-1.20-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X debug"
 
 DEPEND="X? ( =x11-libs/fltk-1*
diff --git a/media-gfx/quat/quat-1.20.ebuild b/media-gfx/quat/quat-1.20.ebuild
deleted file mode 100644
index 275fd898170d..000000000000
--- a/media-gfx/quat/quat-1.20.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A 3D quaternionic fractal generator"
-HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html"
-SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X debug"
-
-DEPEND="X? ( =x11-libs/fltk-1*
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXft
-		)
-	>=sys-libs/zlib-1.1.4"
-RDEPEND=""
-
-src_compile() {
-	export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option
-	econf \
-		`use_enable X gui` \
-		`use_enable debug` \
-		`use_enable debug prof` \
-		|| die "configure failure"
-	emake || die "make failure"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failure"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 8bf6730485ba..586ad68c3537 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -8,6 +8,6 @@ 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 7738 BLAKE2B d1762f06249a0e150259fe18704e10585b758754fde385b4470adce6e5df3a80d102fffc2c25a8ab753b2463a82a06e20ee30759f3361c329ed65cfd89e14a60 SHA512 e518104ed334885f03239833fc58c7f50e2818d2145cdb2c23940b497d2788b437134dd2b596eedbbedcffc8c8eefce8892e1369bfdec4c1c13b17b9a1912200
+EBUILD sane-backends-1.0.27-r1.ebuild 7737 BLAKE2B 55508444163266a9c134db633b774860838e89301d6162fba2e4ed8f49607e143c6ebac2c149f06ffe66d0af81a04b61a4a5edad17748d6da041652e7302bcfe SHA512 43c5a9540e61de432b7f266b7866f1c5ed96300acdd4c95661283df66785d01a648dbce3b729456e0f040bea3201832bcf1ede5fb87f55ce7f18f356d4070b17
 EBUILD sane-backends-1.0.27.ebuild 7913 BLAKE2B f6cdfc03d373fbad3872fdc6f7686d3b006e365860851f821eded0f0cbc661f8ed1d176f6032ca2abfd706afc2846185f09a134ace637e896f3c2e067b748385 SHA512 c228f459e1e62095aa57f75018cd63773cf6c55ef6e24ff28123476f43d8a9798d27d6cc2b6f4d85a79736d824ebc5ca4216199e527158781cf698bcc62b2620
 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 4b7b9d954cdb..7829abe53d5c 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}] )