gentoo resync : 24.02.2018

34 files changed, 127 insertions, 227 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 688796b4ace2..c128818c663c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index a4035bdb4624..a2311febf838 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,5 +1,4 @@
 DIST ast54unx.shr 1465432 BLAKE2B 9eec58fb66110a7fd072eee8b02dda109a22c1a1d59506943011041ab595e33eac39f5372ab55f587bcdfb447e599b16b8a9f0ccd04c54257b0dd38a85acde08 SHA512 824fcea1891dafc77692e84a36cc97a8afd90ad93d772edab8437e89869cdc912002f628fd86eecc8182ba4f1ad02cb98f42a30fde425bf94cf59f852b4eda1a
-EBUILD astrolog-5.40-r1.ebuild 2095 BLAKE2B 6e5ba9161deffc6191ab8a9b2ce377936d503e54c4ee8cda644e55a777d736d8d55ff6e03598ff27223fc8cc3162bc0a326663e5e2be90f65a3dc16302cc62a0 SHA512 3d7766d07a6c0df8c3e71e65524805eff84a4ae177612274e8731ec5b5fdb9f3df1717c93346dbf64971422bdb02127fbe1faf9b451abc8de1260d7b8814f8a8
 EBUILD astrolog-5.40-r2.ebuild 2093 BLAKE2B 4abb37900a6fc86a1326f27428698b244df65a6271b25b94fc251a2186f067411e873ea2458f580da5f203e45d7339069b441b1fcf3b118d263cac8550270982 SHA512 d92361442fd0733d94add2d2a132589fe02d71b60e1263da0ee539fede76558545d3ffed8dfe5120307032031e1e9a46e4658cab9c2d2b46ebe633d1bbac84ed
-EBUILD astrolog-5.40-r3.ebuild 2128 BLAKE2B f4b895a5818e93c2ed4d3840c1124c605024bb99a60636cfbe9edf415b748db69ac20911fb26902f8fc41d7cfadac3e9454ff09e6e594b70c4fcbf5e4d4f99e4 SHA512 278e7ac93f8fd3e71c8291bf63cf19ff0dac00f78288b9dbcaf6f80107e2cc88d1f00c01521f08be3af8cb26f2d2d2147b578a6ceee0b2f11a13cb42aa6ffed8
+EBUILD astrolog-5.40-r3.ebuild 2127 BLAKE2B 623fa300de585296a034f9e90cb92933c92b6202257a9e9839f0d9004b1e600465b5f71dd9721aba972662942f58ce8b585d981270eac7afd761ddeb9aa2d4c4 SHA512 b8003620c9fc68e2ccc794934123aabde690a14481a8fd303a6c0242085d9549f5f08dd6d6f13bb443a237927d1a94c49100c719da70c6a14282e430b01fcc5a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/astrolog/astrolog-5.40-r1.ebuild b/app-misc/astrolog/astrolog-5.40-r1.ebuild
deleted file mode 100644
index 6fe1978c6375..000000000000
--- a/app-misc/astrolog/astrolog-5.40-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="http://www.astrolog.org/astrolog.htm"
-SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	sh "${DISTDIR}"/ast54unx.shr || die
-}
-
-src_prepare() {
-	# remove stripping of created binary, dump hardcoded CFLAGS,
-	# respect CC (bug #243606), and CFLAGS (bug #240057)
-	sed \
-		-e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
-		-e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
-		-i Makefile || die
-
-	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
-	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
-
-	# if we use X, we need to add -L/usr/X11R6/lib to compile succesful
-	#use X && sed -i -e "s:-lm -lX11:-lm -lX11 -L/usr/X11R6/lib:g" Makefile
-
-	# if we do NOT use X, we disable it by removing the -lX11 from the Makefile
-	# and remove the "#define X11" and "#define MOUSE" from astrolog.h
-	use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile
-		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h
-		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h )
-
-	# any user may have an own astrolog configfile
-	#sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin astrolog
-	dodoc Helpfile.540 README.1ST README.540 Update.540
-	insinto /usr/share/astrolog
-	doins astrolog.dat
-}
-
-pkg_postinst() {
-	ewarn "There is a sample config file /usr/share/astrolog/astrolog.dat"
-	ewarn "astrolog looks in current dir for a file astrolog.dat before"
-	ewarn "using the file in /usr/share/astrolog"
-	ewarn "If you want extended accuracy of astrolog's calculations you"
-	ewarn "can emerge the optional package \"astrolog-ephemeris\" which"
-	ewarn "needs ~4.7 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/astrolog/astrolog-5.40-r3.ebuild b/app-misc/astrolog/astrolog-5.40-r3.ebuild
index d75e36445013..0f14039203e9 100644
--- a/app-misc/astrolog/astrolog-5.40-r3.ebuild
+++ b/app-misc/astrolog/astrolog-5.40-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
 
 LICENSE="astrolog"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index 683b21dc5dc0..1f4318356601 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,4 +1,4 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
 EBUILD away-0.9.5-r1.ebuild 846 BLAKE2B d774832642767b543d15faf8ed8ef6dc497c4b3147d11e5c2a3a013845d0a9bc9baebc85b6f87259df1b726495d2aebac322e29dbdd9dcea2e7b7fc04b952289 SHA512 1ed2bf3c0a588bd5400c17f71859049b2c24dccaf3f00ac4c8374cf07838542a4e8069d1874b16143ce70daf0857d63adb3677c87d4cdbeb0b4c057ce50714e4
-EBUILD away-0.9.5-r2.ebuild 809 BLAKE2B 08ae4dbcfb74647a12bf00319f21aadbd4edcefca21a759752f7b0dee17d5a9cf3d3f92b44a69ed2d12824575ec3be1f1f5427366f16d85cce6b950d9012b1f0 SHA512 acc209b29641ea731f29e7f0f3e7a456cdd2cf18d7dd33e87ba743ab9b3c0b69f5565ec9dbaf0f567435fa5b32cbc17759afc2071e4c5c7e2bf57228d7140339
+EBUILD away-0.9.5-r2.ebuild 808 BLAKE2B 2cc831c13591dda81acf4c59cd53c0e2360c79c8d5e68928935f1639a17615058ffe6b42307893935da72385f21135d874b3da66484c1392fe3d7729e697c67c SHA512 616c4063f7ed0c8c17f1cceb78c9fea3a4f5ce0fcbbedef4e65e88b6954fb87cb1fa58b98003dbc385a0a434f18ccb472857c163399b0137146d825366d809f2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index f9c221d9b662..2c5e59eac8d1 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://unbeatenpath.net/software/away/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/pam-0.75"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 966c3e6a9ed5..786b3e9af762 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 635 BLAKE2B d5f6b5787d41456f6008ac386246691bfdf95c714cde9fd0e28ca9877afa9e13f08ab147a2486c5a8cf10164e0d85451fa9d9811dfa38359663ba2419326c3c3 SHA512 7fa46be4e28d8275bc1c84dda763c9011312c48a9b1a7c1e9ddfa9b12c84b8213df3c75fe037b6cb997362779913650f85658590c24c38edcb5a4f1a8b1aa45d
+EBUILD calendar-0.9.1-r1.ebuild 633 BLAKE2B a1838e46dff6edcd0cbd3975609ac855aad4a1a46bc52707cb3b394cb208e61c8ffb0dadcf947970506465ce2c18bad1ef4ff77ef94dbcb95763c952b668181b SHA512 b9e2e60fc6b0fa27b49edef49828628c86adbd299ca386944ee458a711dd540dbdd9494ad749cef54764bee348fe797291327e79e6bbd444b6389d02a46c6718
 EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index a645952daef0..9ff0da301319 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index bf6364f92fb8..0dd8fc4a35cf 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,4 +1,4 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
 EBUILD dailystrips-1.0.28-r2.ebuild 810 BLAKE2B de7b86da861863a1df925985b36033df94d32ba4e919ceb78ec1567ec5ac59bc7ff797f2ab954fee4259df87e6c3e33e2fffd1c3e840fc49f40ba86ffbb1dd08 SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618
-EBUILD dailystrips-1.0.28-r3.ebuild 751 BLAKE2B b0cc15ba88a99c460fa7fcadc320ff60e49aa849a5d902fd6d39e3ed769764e9e94f49ef49edb62bea3abb4dc3008231111ad7f4aff7527b50c27ed2fcc681e2 SHA512 9b00871a38a99a2fb9e6c0845a0fdee6515a056320bb208f57cfb92e1346d169ebe0442a01ad8b7fe24b8f1d84c5e25f771a9ee8f8d1247f8d011cb50b61ca71
+EBUILD dailystrips-1.0.28-r3.ebuild 750 BLAKE2B e515204fce0717672a3241fe45bb49d8751b8ef8dafb8b0f585f9b02d9758f48844d240bb05f3c30b4cba71966739973e23cca53012a9bbcf046c5474859612d SHA512 b2e1cc28bc3949b3fe16de9c18ff747ad4470999aa228557e661929bf36dbc2119629a28858dea7f758d2cfbaec77e526e66aa8655dd9ce1fb2a1f42cd2de642
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index 2f22affa9df9..bc2f4ac04ccb 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 6d0e2ed0f39b..344a745a6e3c 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8ef121d05af783c710cca42c3bb0557eca47e3efe36beb4a091b55120fa660d713873c8c6167e02911c22c0bdbf9620ac265733f3e96b244f24be4576cf41146 SHA512 fac8d739132bb197411e82a324e566b5c64ea6604e84f23d74a2604ec4d4691ae1a6c95a43a23a8ed9692d5ac2071dbfbd96beef04c48eb747cdb991af329a37
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 916 BLAKE2B c940152e33cc29998993abd6d8c0412126bd86d6f3b151c7154b531a51804fb79fa9984d248b4d838e825329e27bcdd392f62c0e6a61d995d27a82dfefb5d5f9 SHA512 12877201ebb8a5641210f19b0b14a03b73ad4d0eb450fe416bd6d1529f8c353478d5f0c20387626f1b9d598bb4119861fb55e572f0c398602af68c54bc3e4d58
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index a4cae3011502..945592c7f128 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index 8582385dcc28..ccacba6603b1 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,6 +1,4 @@
-AUX gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 702 BLAKE2B 21cec2768a0bce49121544a4ddba1a6f675ac30f1218e414a41b504809c63289d6f185782d3bb2a9b6c96e1ced2b10715f10b39d42383fae59e17a82952c23bd SHA512 6868bb0dec7d0841b680ae818dfccc50ba2a67ab606a17b143b800e771678f65829dd6f4eb3dfd021c65b0e1850034eec1bd068fa5e57de45bbcde7bc57bea22
-EBUILD mepl-0.45.ebuild 751 BLAKE2B dc57323a6975a3f7449239fa0b43002fc4513585ab34aeadd447e3c4214ff0bebc037d948373619ba54dad62cbc9920f6667bb2d92e7013bcc49727cf64d7b70 SHA512 4e05c749580e35532731f1aa48fca36efc95be8f49b13b6734c100a9bf347b9f2c92fda2863e2a14f120bf19177c4817f6753adc6d1da73616c7cf8044ff6c45
+EBUILD mepl-0.45-r1.ebuild 701 BLAKE2B b19b056179fffb66034fd1220844505a1d4b364691e1594f0834184937658b19ae428b58034710a2c24952d3fdee0729a1f20a9362262b6ab6a28de10d995a34 SHA512 ab07d182efc4103b760f5ba26ddefccf4e038f38e3e1ac91f1143fdb3a12ed630a1ba5a541ddee00e32b3c9e145101b0aa9ded597c02ffa507e1e60b7cf56add
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mepl/files/gcc433.patch b/app-misc/mepl/files/gcc433.patch
deleted file mode 100644
index 0fd857a9ae30..000000000000
--- a/app-misc/mepl/files/gcc433.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/mepl.c	2009-04-07 21:17:32.000000000 +0200
-+++ b/mepl.c	2009-04-07 21:16:48.000000000 +0200
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #define VERSION "0.45 Don Nov 25 19:13:58 CET 1999"
- /*  Version: @(#) mepl.c 0.45
-     Autor: Frank Holtz <frank@hof-berlin.de>--- mepl.c	2009-04-07 21:08:18.000000000 +0200
-@@ -347,7 +347,7 @@
-  errz=0; 
-  do {
-  error=0;
-- resout=open(resdat,O_WRONLY | O_TRUNC | O_CREAT); /* In Datei zwischenspeichern */
-+ resout=open(resdat,O_WRONLY | O_TRUNC | O_CREAT,0600); /* In Datei zwischenspeichern */
-  sendstr(ATSENDMEM);
-  line[2]=0;
-  /* Erstes Zeichen suchen */
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r1.ebuild
index fc4836b314e9..260918797539 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 S="${WORKDIR}/${PN}${PV}"
 
diff --git a/app-misc/mepl/mepl-0.45.ebuild b/app-misc/mepl/mepl-0.45.ebuild
deleted file mode 100644
index 5c4b07351dd4..000000000000
--- a/app-misc/mepl/mepl-0.45.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
-HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
-SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/gcc433.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DMEPLCONFIG=\\\"/etc/mepl.conf\\\"\
-	${LDFLAGS}" en || die
-}
-
-src_install() {
-	dobin mepl meplmail || die
-	insinto /etc
-	doins mepl.conf
-	newman mepl.en mepl.7
-}
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index 780b2b5e10b7..87a166f88f99 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -2,5 +2,5 @@ AUX mvcase-0.1-flags.patch 531 BLAKE2B be56f4ebf49427f3d6202ca78bf76d40419055235
 AUX mvcase-0.1-includes.patch 526 BLAKE2B 1ae38fd8c03a82694fd57c9af033443d3e0a09a794686ca87419167dfd16697addb57a2f73923a8435c88fd82c5555b0715bc541f2eb377aa9f2e6389b14d311 SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f
 DIST mvcase-0.1.tar.gz 9467 BLAKE2B 4f73908cb549af143582f2f046096b5ffc82bd68a7be9d599bcea159d2182a52d37b9afb7e6e5e3fcb2ad01fd647c3649dae56ed47258166884a20e81b00d40b SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c
 EBUILD mvcase-0.1-r1.ebuild 676 BLAKE2B 3b907b18fac78269dd1cb326322b262c58ddadb08d25ec4c06e52ddd47815a33acbac3feb10381e03e7e30708954dc31aee980e1154dc8bbf12f8af657aedb7c SHA512 4fc782129c08e4fe83e997dd26c5d3ca7d81cee74767f96dbb93d26130ee094d12a50e9979092e327500dff2eb2932dc51f7438294a614040090f792298c5db5
-EBUILD mvcase-0.1-r2.ebuild 641 BLAKE2B 23b4535b0e4de8c2190d7e264ff7eb34124733739a514ac35b2bc4376f6acadb831476aa2246a8068f8e6079020b65842eedd72422c3c864576117183ef8e8e2 SHA512 81cb0169264d89febd4af26629577945f827019d0d2fee28585d4218a7bc0b8ceb76fc2cbee1c5c3e619a897eef0a05f398a7c525e5d397546fb6dea2a6ecd45
+EBUILD mvcase-0.1-r2.ebuild 639 BLAKE2B d62b57d54079ddea8a770c07909c5e900804e9bea3c6aa44714cf89888c874c645df577f8043e387d09d0a927543b7e1cce671e769bac0a6ca1f948b8393c195 SHA512 107db7314699cf0f6b721f256daa5c949278cf7beab365a399eb7efb1c414b8181ca9c86dca88e40286f232e545c49b1026fb4951f0fbb18cda9d8cb4f49912a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
index 568fed8c4a02..cf2b600c032c 100644
--- a/app-misc/mvcase/mvcase-0.1-r2.ebuild
+++ b/app-misc/mvcase/mvcase-0.1-r2.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="dev-libs/shhopt"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
index e3d50a9509dd..de2a31f0dc81 100644
--- a/app-misc/openastro-data/Manifest
+++ b/app-misc/openastro-data/Manifest
@@ -1,5 +1,7 @@
 DIST openastro.org-data_1.6.orig.tar.gz 13603001 BLAKE2B 64a0850cc681c13eed672285edb5ebdf7b2adae6012f5525461312b6ede56c65d20b17c554220174c4e191bd326c8d201e5d6db49435e62b4a7a1d1e743ba3bc SHA512 99f3b6db61e27ccf04a7e0ff3ba7da45b889e1177bfbc1192af1929fca7255dc2b18a4ac9eb536af9ceb11e7722e0a3420102c7e45a6c839abe87734e8be6591
 DIST openastro.org-data_1.7.orig.tar.gz 15682188 BLAKE2B caa423b90fac8391bd30b6ed1f6b6065c91b5a1828defbbc753dc88ac23f3bfef8437b87d02dec4176fac419206ab5df4822e2353a36a0e92255d376e678ee54 SHA512 a67cc528253d0a9f70fdce550b8065c481e2dae8dc59dfed0428491cf4751648e41f0d6032b58008f2fe095f81fc4a23717156a69a73b03bd3105b50eb325ffe
+DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af
 EBUILD openastro-data-1.6.ebuild 536 BLAKE2B fcaac146a091782e7560d18c54eeb11af4c9bb5342061fb2a78e84b7ba0860a31341452b3d8281e3c76478e4d72fd1c30a9087af6dac1e014d547da57c6491cf SHA512 7c674f9ed47af5c4e92de0180d083c3c1ab6d2545a827dcc8665ac69306a6f1c3b6c23b69e325e0191a563bfc0372f15fe577e71a93440dfeba08a9ec030ab2a
 EBUILD openastro-data-1.7.ebuild 536 BLAKE2B 4e6529414ed28d9a3f3666c28ad3b159ada8c1bc19012a6f9277547e3805d34bbb51577d70ea17611b58bb5b7d51288d0a0bd0dd5787b040619490a7c747cb2d SHA512 573683c1b529dbf6032329c338a1c9be018f6a4f587d123233c316209d63868b376b673c2636c32198b9aa48f5472bf484c55ec36a33007b9618d5ab5e21c7a2
+EBUILD openastro-data-1.8.ebuild 557 BLAKE2B b5cadc16f1bd965ac09a81a5674cb1f9cdfd47bed73b3ae10529b70c3ad626a802bf2c90f71b10c77b6283289d000a532fad6d3ae38dfbc14d02544cef72595d SHA512 e6955a4f9486e4a56147ea74fd70f72d348ed03e964f84a1a2aca54b5012bb11b62fb19797302075d90f83c6539212f3146e4a0690dac3b2d1f4c1eade1bd088
 MISC metadata.xml 597 BLAKE2B c706d7b1ad6975e22bcab85e3cd58b765fc32d3b16e6cb415ea83eff1978317366cad7468fef55f72442a9ed94febe067a3571277e2b60dcbc826ae1dfc14ddc SHA512 01f7315f5fb9672ee5d93fab9f438ca2fe0acfe6ba08bc62e3e4c3d9e97725885e60268d23bb67074bcd5426fea334e4f17be64092a42a39dd63af3d2e1ea5c8
diff --git a/app-misc/openastro-data/openastro-data-1.8.ebuild b/app-misc/openastro-data/openastro-data-1.8.ebuild
new file mode 100644
index 000000000000..34fb99b46590
--- /dev/null
+++ b/app-misc/openastro-data/openastro-data-1.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-data}
+MY_PN=${MY_PN}.org-data
+
+DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
index 9f24d2972fd4..f589c5b98511 100644
--- a/app-misc/openastro/Manifest
+++ b/app-misc/openastro/Manifest
@@ -1,7 +1,3 @@
-DIST openastro.org_1.1.48.orig.tar.gz 205879 BLAKE2B a1550c4afd022408bbef1d44f8ad73370a93e2a8d2f4ff0f43c05269d5865a5cdf10aa487c9e1b62f5367afc771c4a92565e414534bde37612290f2afebdddc6 SHA512 996e503a8dd2504da252ad2b20ac185301e81523629cbcf05fcf37ec4ca3859ef513a194feb2d05bd7c4cbe796bf514afa4eb242b8cd51c65d134b51165f97d3
-DIST openastro.org_1.1.49.orig.tar.gz 213256 BLAKE2B c313877c481439d2e7cda6de0442c8205ae824aeb5e7ddf22d7f0fc6eed2171addb4075786479c4efbb3523aba5fd7e05cb49f1754d4771ffa127e17a20304ec SHA512 1028807d2a84850699f47a03ad74a851873b9b448f87169bee7d142e5ca750aafe33313b6181b9ee0ed6ccb66c3a867e86bd56648ebe67f4a7a9e1b914b77cec
-DIST openastro.org_1.1.50.orig.tar.gz 217959 BLAKE2B 9c1f35178afa63911d83a781771705d0de525710928ff91e25ec509099e44b3933bfa69e6db0506c3f696b00376a220cfba63ac86f59248f07a14dc01cf5e908 SHA512 39004f78c8dd098e2f018147b581608e22718fc844dc5abe5d97124662882d2ca6bd0a49fd4a003284cadfe31ab8c7a9343ecfa4fd990b7b3af0eb9d5ad18fa4
-EBUILD openastro-1.1.48.ebuild 881 BLAKE2B 6a714b30a55e6e0e0616777cc0ea8783e523ece3525733269542ae7f94ba5f4b2a979e55aed09c400c50d41ad21aaec297998fe0ef7c9c496d71a5e4ef0aa914 SHA512 727b27d10985fbc5b8260616d77992809655699944fed2d7faf9f1669836e0d8640627d507ed61e4cc7fe1be7f29222bdd5f1633523f5199d74bcde81e6395c6
-EBUILD openastro-1.1.49.ebuild 881 BLAKE2B 6a714b30a55e6e0e0616777cc0ea8783e523ece3525733269542ae7f94ba5f4b2a979e55aed09c400c50d41ad21aaec297998fe0ef7c9c496d71a5e4ef0aa914 SHA512 727b27d10985fbc5b8260616d77992809655699944fed2d7faf9f1669836e0d8640627d507ed61e4cc7fe1be7f29222bdd5f1633523f5199d74bcde81e6395c6
-EBUILD openastro-1.1.50.ebuild 881 BLAKE2B 880f4c752f69d9cdd383cdbe7e9071a970acaaa66e27d29c25e8d09fa1aaa803cf86affee968c5379984281a0828994c0641acf0b2fdc3d87024399c528b9398 SHA512 16f8be04eb0abc032702981e9ab59f38b294cabd7dcfda0277e0b5768c47e90c1a793f1d167b2a385732ed7c0eeabc0ccb6dadd0e5c3122e497bcc85942e1668
+DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d
+EBUILD openastro-1.1.56.ebuild 919 BLAKE2B 21726da473e1e56e06512ba566d1457fd4a5f73efc8d073bbecbcdb25eeb7e505ccfe7da7d50dacbefa32d3d3b161029cccc8c41760788a4ea54be6b2edfcb84 SHA512 684758d970d7515c5f82a8f137fa805376103221167f067584efacc42f57c157c996d255e3759a2910e1244d71b3d8bcfd0385f9888d7a1d7d04dbe4328c4ad4
 MISC metadata.xml 760 BLAKE2B e9b074215b46c50472e3eed1ec3c37eec0278596de1865b5ac230957be46dd197750dff099c62bd4f51be639ad47506b5f1e2c896fd87dee8ea275f53d247380 SHA512 300f1ab4db7cfe1acce6a62282ddc506c4af8f41c548702afa73a46ecce2882bf604074f3d4aae1d07e856f0459e9df96bd9d940c1635fb850ecac71013dbf39
diff --git a/app-misc/openastro/openastro-1.1.48.ebuild b/app-misc/openastro/openastro-1.1.48.ebuild
deleted file mode 100644
index 102f982b518e..000000000000
--- a/app-misc/openastro/openastro-1.1.48.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN}.org
-
-DESCRIPTION="A fully-featured Open Source Astrology Program"
-HOMEPAGE="http://openastro.org"
-SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE="jpeg png"
-
-DEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyswisseph[${PYTHON_USEDEP}]
-	app-misc/openastro-data[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	jpeg? ( media-gfx/imagemagick[jpeg,svg] )
-	png? ( media-gfx/imagemagick[png,svg] )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/openastro-1.1.50.ebuild b/app-misc/openastro/openastro-1.1.50.ebuild
deleted file mode 100644
index f7f9437778dd..000000000000
--- a/app-misc/openastro/openastro-1.1.50.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN}.org
-
-DESCRIPTION="A fully-featured Open Source Astrology Program"
-HOMEPAGE="http://openastro.org"
-SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg png"
-
-DEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyswisseph[${PYTHON_USEDEP}]
-	app-misc/openastro-data[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	jpeg? ( media-gfx/imagemagick[jpeg,svg] )
-	png? ( media-gfx/imagemagick[png,svg] )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/openastro-1.1.49.ebuild b/app-misc/openastro/openastro-1.1.56.ebuild
index 102f982b518e..1a0a8770f703 100644
--- a/app-misc/openastro/openastro-1.1.49.ebuild
+++ b/app-misc/openastro/openastro-1.1.56.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1
 
@@ -11,21 +12,21 @@ MY_PN=${PN}.org
 DESCRIPTION="A fully-featured Open Source Astrology Program"
 HOMEPAGE="http://openastro.org"
 SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3+"
 SLOT="0"
-
+KEYWORDS="~amd64 ~x86"
 IUSE="jpeg png"
 
 DEPEND="
+	app-misc/openastro-data[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyswisseph[${PYTHON_USEDEP}]
-	app-misc/openastro-data[${PYTHON_USEDEP}]"
+	gnome-base/librsvg:2[introspection]
+	x11-libs/gtk+:3[introspection]"
 RDEPEND="${DEPEND}
 	jpeg? ( media-gfx/imagemagick[jpeg,svg] )
 	png? ( media-gfx/imagemagick[png,svg] )"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 10edc3b67186..3de313bd91cb 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -3,6 +3,8 @@ AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 BLAKE2B
 AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d9271f9ee7ceac9826282d2eb3461a656f21c96720cdbc8b9c91661ac23327a8e5053ed7675afd47d7d8a037525a6d992d SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1
 DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277f3b562c9d8365ea5a6b5bfa4327bad66cf1f62cb626f8b6ec3ae693cab713683b81142dd71920f3b6300951f6d2 SHA512 cec176cf5863b15acc058cbd99639f5f456346136d0551ce5875cb66c28dd0f6e7f5077b0c06751a3a68984b5c4386c232d3db8b76aa4f4b326b0b692835fdeb
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
+DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
 EBUILD pax-utils-1.2.2-r2.ebuild 1631 BLAKE2B 93325fab783633b6ad3c677febc206754fe12fa58b0f4b193bf3ef9575ed29473c4da569c1b35a25d5ea5fa42b299293adc33066434faa5eb0fa4ad6878543b7 SHA512 9eee026d4e51a66c33ea0126fb47b90cdb1b2a469a3a97e982351e387d7f3b05c7dcab70578d1e15ad9225501f6b1dbbebf435973295c8a11c300c8f3ec8911d
-MISC metadata.xml 489 BLAKE2B 2fcc27d5145a496d5bec7bf953b4007760a85471f66027b6a842ac5907e063522189ca5c107e8080e8b43aa9acceebc228f796d96d9b3b35c7424148f60dbcb7 SHA512 ada40ae17d53809394f87a89876b52df9c1c88ac231282cb9cf9f27e9314d3facc65f95c20ea03b3e994e19dbaae8fa5dcd20684b52812aaece02da76f089bc6
+EBUILD pax-utils-1.2.3.ebuild 1488 BLAKE2B 578a405210bc5e0beb2725cbc59ff3b1d39a9740fdec4d032e381fa87999f139e2face9830914b79d631d92d293005898549a79914d47011c8e097d3029de8fa SHA512 1f3d96207ef7a9a5f13814bf85edb2b601fd2c915dc0c498880a294f85cd703774b897b17f91a6f5308bba1640eee9901084d000192e8baa8791fe9f88396dc9
+MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index 0e2626a05dc6..a83679714a4e 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
   <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
   <use>
     <flag name="python">Install a more powerful/faster version of lddtree</flag>
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
new file mode 100644
index 000000000000..32ec5fa80b37
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? ( dev-python/pyelftools )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+}
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
index c87ea7d6fd73..f36c8b0d1918 100644
--- a/app-misc/pipeworks/Manifest
+++ b/app-misc/pipeworks/Manifest
@@ -1,4 +1,4 @@
 DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
-EBUILD pipeworks-0.4-r1.ebuild 645 BLAKE2B 850662572b09ec6cef727e56764203e08eef73091af724a73fabd06bbe261b4cbf77a6eb806523cac6900853a4381a35ac6dd82de8e6da13ddfb19c34c467df4 SHA512 da3d06fcd463b5e33a7f115fadbcf19d84983cc7dacb37a0d3c6c11c647ac9c8bda73e0898dbf77d38e0775d5fad06d1ea7ddd01531d357a834743668c16e092
+EBUILD pipeworks-0.4-r1.ebuild 644 BLAKE2B f188419787806b194de7ee163d7e7811ed12409e03896644baa286dab87dbfabfb4a6d3ec0ccc66eb79a5e6dd264ee893ed69a6d99a87088aaca956c4c0b7694 SHA512 dcf51d065658b47e3ea113a7b5e02ff4d9956f2554b748ed7c631b00b93f88296c7ebf7d7561c410a3504eddd0e3a36f66c2f2d155e68765fd0cc7b838c3afa2
 EBUILD pipeworks-0.4.ebuild 614 BLAKE2B 149f3927c70ba4092d804b6c8e407ad7d6c784f7bf2158a79090f4a497517976e6a7338ec5c323219dbe732a2d6af0c6dd791d0b6933e2eaf8a2ef12cf1dab45 SHA512 ab7c7a5630b261a4a6d1548c8b1e2b8e8f7f0d9eb327b99c0fc58e5fc922c1df70306de325d8bedcb110e71a39a7e396da66fc8344e9599bac231efcd5db65a7
 MISC metadata.xml 520 BLAKE2B 7c3c2102bcdad8698d9970f496002e43a7b93a88368555cf4e6762e0752e1dc56df82b66d4560dccebfa4b1bfb817d2c975019946e269cf074871f184078baa5 SHA512 f95bd764a974893a6ec46c0761a8b7a5edbb467c5b393a771163e42451efb34d75e25b73efb984d960b0aa46f19c233a5fd2df1f90aafebf4365d425d63c7243
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
index 3f6c50acf2f2..eae515efe9d9 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pipeworks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest
index 252dba4f40ab..6f5e18f115db 100644
--- a/app-misc/timestamp/Manifest
+++ b/app-misc/timestamp/Manifest
@@ -1,4 +1,4 @@
 DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
-EBUILD timestamp-1.1-r1.ebuild 486 BLAKE2B f3b5455504dedecb03d7f8d6b0b337ae6bd378c1126426f278eeb1b2ea5915f980ee625b643a8304f61b84c0eea41ebe407a4faf8eda8301103366355ca2d302 SHA512 80579fc844d468efbed574e7d3fac14f2e4f497e1a73ba7fb4da413ce2d5ab575c1988ebdf58a64d934d01114a37e38fc76c9a64bb3df4e220d7e2d4de3372fa
+EBUILD timestamp-1.1-r1.ebuild 485 BLAKE2B 724dfca2b20381a918b6a82dd618dcfaab0431fded2ceed629cfc826cc36f4a54e5d29de6cdad2c7e98a91dc19b20b33eba0c35cbf328ddd6e7b761ef374b9a5 SHA512 cc48a2a97a261b22a6550cd33f8c9feb9ecc26e601f3f5cb6008a7a6f576d2f31faed83bfe7db41c02fef0d6c0f13c719ed97e8a8c89564dbfcd023e94f55c4b
 EBUILD timestamp-1.1.ebuild 503 BLAKE2B 15251f7614236e3a4ee0640ad84fc9eb62d621d169d423c4ae6121702b3015c9cefb6b358ea318c8004f273a68c8d5e7db6fcdc7da66b36061c3c7fd7d37740c SHA512 7bd92b0ecf3a40cc7e149ba237b05f6afaaca5a52e4f933e5483a2470a2e0c2b937ddd15069660592f183da0e5d4318ff544b2b70817c2f26408c29cd8883dea
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/timestamp/timestamp-1.1-r1.ebuild b/app-misc/timestamp/timestamp-1.1-r1.ebuild
index 82d8717a12fe..abb385021b58 100644
--- a/app-misc/timestamp/timestamp-1.1-r1.ebuild
+++ b/app-misc/timestamp/timestamp-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://math.smsu.edu/~erik/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="!sys-apps/moreutils"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index aa7e605947e4..71627909225c 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -5,6 +5,6 @@ AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a
 DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
-EBUILD xmind-3.5.3.201506180105-r2.ebuild 2215 BLAKE2B e7cfad25893f5c2a9433b0600fa5f96fa1012a4a315c53d3b3f008b42b82dc56711d35bc546501117a4146e9f86f0a501c1e653df6e5b4bda140c1c9d424d241 SHA512 af0c431cca019f4b5b1228daf2931e1bed1d8d01711aa1a19aa3b73d75176f08e10d6353c8a0460f33dff0b13dcd9d4f3b7cd8d32fa89611663ead849674d7a0
-EBUILD xmind-3.7.6_p201801311814.ebuild 2170 BLAKE2B e45c6fa4d2f074d63b18af8a106ec92038598e75d40e5ba95a45994d64af3cd914b4fa120d05f1ebfc342fc13b0ae53161c279ebe624601988c6555e77b5e305 SHA512 117453801d73331af8f76040e8bc293ac392adf17e75624cd6b5d66301ace686980df8a8d2b37518a3376a1daa08b9c3552486eaf016458c7e800ea63121ade9
+EBUILD xmind-3.5.3.201506180105-r2.ebuild 2223 BLAKE2B f58c600cc10dd9517b3950bcee924d8b6db4d87a3156f3d42529bcea50451a2e206f36bb3118a57c51655071dca9bf7c34703343d40e2953616fae4c0f1328c7 SHA512 2373680777cc001a40b82a7bba55cf391376ee1909a2d95c3ef559cb9876d57cbccac894bee738f80679f3b6dfd13e838a5b6061c094827cdb4335cbb79b7afa
+EBUILD xmind-3.7.6_p201801311814.ebuild 2178 BLAKE2B a85f27c6e1ced5482f7458d2aa944ff0e4ff94dc298c56b2da0cab1b78d05004bddf1a5cacbf7faa433c2cd407862339d95467df93aca855a53ee5bf9f2a2d5b SHA512 06ade7d0e264affcec8b2b11ae95d2b7897fc70b6d000ec5f27dc7097c50efeba9ba01c8fade7e733339605a6304694605ddbcbb8a99ad2e611d877253439bbd
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
index 437bcef1b8d3..c06409b09fda 100644
--- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils multilib gnome2-utils
+inherit desktop eutils multilib gnome2-utils
 
 MY_PN="${PN}-portable"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 21d20c8af343..40981f622a19 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils font
+inherit desktop font gnome2-utils
 
 MY_PV="8-update7"
 MY_P="${PN}-${MY_PV}-linux"