18 files changed, 386 insertions, 100 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c6ad04282a76..0bac94e7ae69 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 29702d65b323..7500e034122f 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.0.tar.gz 153479 BLAKE2B 6b3f4baf1f6323eeb6747a06ce82682a72a7284df4235cdcbd50c765a6f890de46385bf3eab4f919bc11070bc63cafd4975654e9f16e399aa793dc03406d6da5 SHA512 046dd19be1791eaf2b50bd7029f0bbe8ad0805113faf9a80b37571c42d76c0f7661a9273876de8cd5bf1d13fdc8133a8eaf9def28dd8077bf667225726797fdc
 DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e
 DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4
-EBUILD carbon-c-relay-3.0.ebuild 763 BLAKE2B dbeef24e2bde653685aacae04eeda8832a4565692aa46f8cb4713dc4596a61ae6756211558661fcc593e858e1d9b140668935caf953bd1c59e7124bf5c4f7565 SHA512 f8836f0b85480498ec316e1e356e2c06038f7cd98f80519d7734b3ec4d41113a6ba0f67a4740b2244ccbbf60a643c94dcd9be20d15efa44bfe60f362c9b8d770
+DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
 EBUILD carbon-c-relay-3.1-r1.ebuild 765 BLAKE2B 6596ee93330fbe973d42479a8d8b1b1174464a5ffdc513cfb6235ed069873e59177fa1d9be862a579c2ed4c482b2a8df5b8cb3f9b8dc075ce4615133dbc5a381 SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa
 EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
-MISC metadata.xml 399 BLAKE2B 3b59f24909963ce1e8ff9c1291a95d81174eac64df80948990e523e5d75315e653b19ced888bbbc98faf67650086cf133a29373156ab66ef1c171156f2d48fda SHA512 95617c9e65ebec2caf7015ec6e4fdb7fbbdbeccca3375ad53ab5ba974e490ca111fb46b16dbf623648a0808cda4097c4cbb52aeea4c4a5f289d7b2f2ae126950
+EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
+MISC metadata.xml 572 BLAKE2B 46f6020c9d2a5187eecbff60365a7d7649e3548c94b4d9f7981dc6efb1a0d66afe82c5e590ef658dbbe763fb6e7f45253420a7e83c181a874fca332035616b62 SHA512 f7811671d545fe45ba401b69c04cdf8118845414bc5f9f1f3869c4517ce72f298a6248752e6c9c140a1877857ca0f03832de83a0e02bb51fd1ef8ecf53f8e7be
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild
deleted file mode 100644
index 963456421ce6..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	newbin relay ${PN}
-	dodoc ChangeLog.md
-	doman ${PN}.1
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild
new file mode 100644
index 000000000000..f5a67797fa22
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.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 user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 ssl zlib pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+	ssl? ( dev-libs/openssl:0 )
+	zlib? ( app-arch/gzip )
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+	default
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index a9d0c9cb929f..5695b7a6de75 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -6,6 +6,8 @@
   </maintainer>
   <use>
     <flag name="lz4">add support for LZ4 compressed transport</flag>
+	<flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
+	<flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
   </use>
   <upstream>
     <remote-id type="github">grobian/carbon-c-relay</remote-id>
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index 2f8aae2142a3..14121b6d5a58 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,9 +1,7 @@
 DIST datovka-3.0.3.tar.gz 671555 BLAKE2B e8fd9a196ed2d3c353dd94c4be4d734666f5a90866de7ddf0a8efd3ff9b6e96343719810cf585b8f4321c5028b9f229a0224cbc9ee4cb1ddb18727012bfa4d5d SHA512 c3dfa23125849fb1c5691a4ad6077fedd307b8c0417c72e014876f56c1185a2da73478927fb594cac45ada77a71a3798f57a75032a4d83cd81c194fe3257397d
-DIST datovka-4.10.0.tar.xz 2449068 BLAKE2B 5da00d48aa2d1d04b2c32b49e3901187cfa6ac3d02d2ea230dcccaf048269b736f3a38c88530ab3865c673c661d2448d5eca5a7a8bebe8b01e24d9fb4c1a502f SHA512 2801898ab1511ac98d0eb5a1b0f82fe5f1bae6c2bbd77d8d818e848e0f85242a07f414d3983c9278db8540bcce9a7ddedc7e584c328a32c6715bcfa0e7d4afae
-DIST datovka-4.7.1.tar.xz 2347736 BLAKE2B b50b2ee47d3aae61ca53f08c243028f1e8e6befc9c6ce55b44d3c88712cedfcbfc0ba84bb406f167a200413e2d21cf90b44b7ec4c296ae13c0b608c1c79f7d97 SHA512 b086f74bfc13bda0631d7dec3fc2523fcf6395e6874542f04173ddd7315ee6fbfa55e60b8d3e3b5dc7e6c2f0ce56c97fff9d9d1947ddfce5ad1613ac30af9d8a
+DIST datovka-4.10.2.tar.xz 2465696 BLAKE2B 1c355070c4bce005f1a601875edbf40c279e11f32653e59d52321f284b93abd6e404774f41d3bc0430b9b01a13bd1667223e8aafd60f89058ba4eee2ebeb8269 SHA512 e1338d9448b042b26b9829341b93cd8d07fd7d2b854dce33b80731c9a9d41965ea646ac95c7883615ac4f682ed28fb1d3184554505acfb5e76b4ef03ab32bc98
 DIST datovka-4.9.2.tar.xz 2373540 BLAKE2B 2de754a5a9b59b5184f63dd8e1790b3345cc6fc2429aeafc60d6944a8f7372b898e11bfab7aaf21b9041697532b454cd7d91a968435a0cb297183902881b705b SHA512 a906a032d138be33f6011c9e5869c5c8ae44f305279fc531e6e21e7911a04d3f3f2a360d561f0553c581806fe3ac8344dbb30bcdc604e79db37fc948f12a7e1a
 EBUILD datovka-3.0.3-r1.ebuild 664 BLAKE2B 5dfcc4bfa7843f007dc01985d9e18cefa9176774b11680b58cc1ea5fa774971f7084d439ba18afc57abd5f0290ac1c28277bb4118800a3601763c20773c0862d SHA512 9531c13e5ecc9d26fbee745f7399132b18adf3c595dcf91ac0cb5ea55252614ba53e54b55f54f6fefd3e34d286dc08b95dc67a27d551c3e01b2e6a472c398b0c
-EBUILD datovka-4.10.0.ebuild 1092 BLAKE2B 50077cb1a9f9ec0c2d5f67de7c6181cb11081861e49cfd09ad7778abd10dee0bb185cd30aeeaf94903772ff435d9c5fdf0cbb5269d95594d9b1a6f5f5db48d7f SHA512 317817ecf97d217c5f5d787948e0127b005964e495a356f9ebcf5dfe4c1e462d32eb3727e7da530f2fb532ea7d64db086cee15bfd53bb53fbdf71bf2e068116d
-EBUILD datovka-4.7.1.ebuild 982 BLAKE2B f5403b08afc5f2c6d398fb9eb4fd98f463a8a9bd17e3fd6318124325e6d77ea8d258f3fcb6412997cde07c960a37d5cf0e3bccad3548123321b6f705c8d9d9ec SHA512 93b130ac994704500718e7729b2f1965ac93227c2b215d3b67c39b08446741e5c23099ce27e88e99b92b255b3f11dde4dea85626987abd94465e7bc60c938e30
+EBUILD datovka-4.10.2.ebuild 1083 BLAKE2B e3537122d6e380ace728d89aa18f255ec391f13bfcb239db588e1a8ed7153e64bf5019b84606a9f372e28b7eb0d4274fd79cfedbe1a573982666a3f569f06a79 SHA512 dc5192ec3a6434396365da91d638b677d03b15d2c63d64f1874bda635445917e9097c3aa8c72a10f3d9256d3902e70bf0d6f7d465cb87325edc20bcb0c57ce05
 EBUILD datovka-4.9.2.ebuild 989 BLAKE2B 928649d617d216fcfbb4d3960b30625de0a2b7211350681903d660cc6ca67be1f9d1cc237b4eeb084c26f82efc7019a6dcda9435156de72981d045f16da76413 SHA512 48753345ccb14d1328ba38211f7577b370e1c9835bb5d51bbfde8a60df02eba182eb4166fcb2deff1f6f0161e3724187910bdba59a56f55c0ca62d8698be7275
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.10.0.ebuild b/app-misc/datovka/datovka-4.10.2.ebuild
index 0307a8c7de0e..1cfe026721f1 100644
--- a/app-misc/datovka/datovka-4.10.0.ebuild
+++ b/app-misc/datovka/datovka-4.10.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit qmake-utils gnome2-utils
+inherit gnome2-utils qmake-utils
 
 DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
-HOMEPAGE="https://labs.nic.cz/cs/datovka.html"
+HOMEPAGE="https://www.datovka.cz/"
 SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
@@ -36,8 +36,8 @@ DEPEND="
 DOCS=( ChangeLog README )
 
 src_configure() {
-	lrelease datovka.pro
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_CHECK_BY_DEFAULT=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+	lrelease datovka.pro || die
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
 }
 
 src_install() {
diff --git a/app-misc/datovka/datovka-4.7.1.ebuild b/app-misc/datovka/datovka-4.7.1.ebuild
deleted file mode 100644
index 26f6ff8da71b..000000000000
--- a/app-misc/datovka/datovka-4.7.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="GUI to access Czech eGov \"Datove schranky\""
-HOMEPAGE="https://labs.nic.cz/cs/datovka.html"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.3.2:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.1
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.10.5
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-"
-
-src_configure() {
-	lrelease datovka.pro
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_CHECK_BY_DEFAULT=1
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	docompress -x \
-	    /usr/share/doc/datovka/AUTHORS \
-	    /usr/share/doc/datovka/COPYING
-	dodoc ChangeLog
-}
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
index 0b955f838de5..8fe7d1c2cd83 100644
--- a/app-misc/gcstar/Manifest
+++ b/app-misc/gcstar/Manifest
@@ -1,5 +1,7 @@
 AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
 AUX gcstar-1.7.0-gcstar.desktop.patch 796 BLAKE2B 052d2d3325c04e1d8bb64951cfa43b44d1fa85f7c11326e2d56b04e8c5a57e70dc7b5a6758ae27186b403d27a4fd3d1ffc903c761c7a0a98b7430c4ef3602d56 SHA512 59ef9e55ffd607723b0cf833bf666ea4661db3af14b45425ba4b55de1d6144714eddf4cdbe17caddfa5a2876772c5c387a0fd06354c44fc8f3b26b83bba56150
 DIST gcstar-1.7.0.tar.gz 4506937 BLAKE2B dfc6f53921ecad73676fb9943f87dfb3c465347e4d4783f1efc29ec75c35eb56ecf97f9eba6121eb22740642d186d642a3384c10ea8ef6a8b42664e1c2a056e3 SHA512 9cb22a7ee38bbeae67ffc6f649ef6e988da43a1f353b027bacbf14ffcca8a4c12ef28d64876b2171396315eae95f76708a1307255eabc3eed6776137e2ae7090
-EBUILD gcstar-1.7.0.ebuild 2858 BLAKE2B d4551f462d5d942e9111f32f685767eb5aa9c8cd9ecc989467a4a6ed063b4c129b80c87e7f84590dcd7e124cbfa9898c47e662bc250f211831a338e23f2bac9a SHA512 32e4f5d31b14c9fe091a1cc2542c78728ab9ae09a0151cd98ff65b1acc9d15f4f0b58d08b0959b1e43f8748221df3d321e85e6d74465068f5f2639ebc7e74ab8
+DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
+EBUILD gcstar-1.7.0.ebuild 2983 BLAKE2B 5dea9b2b2e74043d0c015bd975cf2b84cc928862f871c8c0833dfa92ef7db4f13d99de145987aead78281a1936199b3efe7059756a90cb72c1b2ff85c130a69f SHA512 dda33ea7ecd94915c9777448fffca7768f53e12e85af730a1b1e9af343a7596d6319a06b6ba9f58a38cefa0db8d972cbae43f17a0fdb52e238480bf03c523b4c
+EBUILD gcstar-1.7.1.ebuild 2172 BLAKE2B d6b0641fcaa802947c08096c8a4eac18ba7615a7d0a30fdabb048be8dddbb4140355bc4bd5ddef33eb3054b2d08eb08fd86fe0a2a804a4724c3c844ad9ac280f SHA512 99e26e221e53648586be1dacde738076d1a3d434d57d7f83f1183201d504dd3582b8e079595a5ce095368bafa4d1a362a2659d66bc53bdcbf1a09ce28baaec8d
 MISC metadata.xml 967 BLAKE2B 94301ae3ebb8b7f8339f09c9e0d490a4c46e9a35eadb3eb2cd209ed292a6fc546faa41995bee4cbacfbd76445fdeffa78075377ecab0b2625e45b2fd283abc65 SHA512 0a7c5e4cd287e6c7d9f6bcbb3e406a19511410e3ea7498ff11fe00df89739bff959b0a1af38410f9a226fe850005bf0b604b3c2c0690adf5ba75fcfcd86183a0
diff --git a/app-misc/gcstar/gcstar-1.7.0.ebuild b/app-misc/gcstar/gcstar-1.7.0.ebuild
index 7d283d97551b..0eb9c9eb8cc6 100644
--- a/app-misc/gcstar/gcstar-1.7.0.ebuild
+++ b/app-misc/gcstar/gcstar-1.7.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="4"
@@ -7,7 +7,9 @@ inherit eutils fdo-mime gnome2-utils
 
 DESCRIPTION="Manage your collections of movies, games, books, music and more"
 HOMEPAGE="http://www.gcstar.org/"
-SRC_URI="http://download.gna.org/gcstar/${P}.tar.gz"
+# Gna permanently shut down in May 2017
+# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/gcstar/gcstar-1.7.1.ebuild b/app-misc/gcstar/gcstar-1.7.1.ebuild
new file mode 100644
index 000000000000..afc8b8f716ae
--- /dev/null
+++ b/app-misc/gcstar/gcstar-1.7.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop xdg-utils gnome2-utils
+
+DESCRIPTION="Manage your collections of movies, games, books, music and more"
+HOMEPAGE="http://www.gcstar.org/"
+# Gna permanently shut down in May 2017
+# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
+SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb gnome mp3 spell stats tellico vorbis"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Archive-Zip
+	dev-perl/DateTime-Format-Strptime
+	dev-perl/Gtk2
+	dev-perl/HTML-Parser
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/XML-Parser
+	dev-perl/XML-Simple
+	virtual/perl-Archive-Tar
+	virtual/perl-Encode
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-IO-Compress
+	virtual/perl-libnet
+	virtual/perl-Storable
+	virtual/perl-Time-Piece
+
+	cddb? ( dev-perl/Net-FreeDB )
+	gnome? ( dev-perl/gnome2-vfs-perl )
+	mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
+	spell? ( dev-perl/gtk2-spell )
+	stats? ( dev-perl/Date-Calc
+		dev-perl/GD[png,truetype] )
+	tellico? ( virtual/perl-Digest-MD5
+		virtual/perl-MIME-Base64 )
+	vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-man.patch"
+)
+
+src_install() {
+	# Yes, ED *is* needed here. GCstar's install lacks any concept of DESTDIR.
+	./install --prefix="${ED}usr" \
+		--noclean --nomenu || die "install script failed"
+
+	domenu share/applications/gcstar.desktop
+	for size in 16 22 24 32 36 48 64 72 96 128 256
+	do
+		newicon -s "${size}" share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
+	done
+	newicon -s scalable share/gcstar/icons/gcstar_scalable.svg gcstar.svg
+	insinto /usr/share/mime/packages
+	doins share/applications/gcstar.xml
+
+	dodoc CHANGELOG README README.fr
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 66ef3f92f9ac..a2b57da8f043 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,6 +2,8 @@ AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca60
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
+DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
 EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
+EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
 MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
diff --git a/app-misc/mosquitto/mosquitto-1.4.15.ebuild b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
new file mode 100644
index 000000000000..65dffc2f3f19
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )
+	websockets? ( net-libs/libwebsockets )"
+
+_emake() {
+	LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	python_fix_shebang test
+	eapply_user
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto "/usr/share/doc/${PF}"
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "The Python module has been moved out of mosquitto."
+	elog "See http://mosquitto.org/documentation/python/"
+	elog ""
+	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+	elog ""
+	elog "    rc-update add mosquitto default"
+	elog "    or"
+	elog "    systemctl enable mosquitto"
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 70c3ee3e3c4a..d062a1fd2756 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -7,5 +7,5 @@ DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c70
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
 EBUILD pax-utils-1.2.2-r2.ebuild 1627 BLAKE2B 4cb00aa04ebbca333f1b1cc3c5db6580f592bd3a7dab1c87a8aa7eaa4250ca1f261442f0d662960e41fc659048672487d5674f930be972732239fe6e48bc4646 SHA512 ef06d06f27ed726e14e196ead496fc72c0f7426d45f35839527ed1fb8c5ebfc3ecca4aa8bf41cc5e35d00cbbe01d77aa45a1dbf8dccf88d72610098fa2e9257c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
-EBUILD pax-utils-1.2.3.ebuild 1488 BLAKE2B 578a405210bc5e0beb2725cbc59ff3b1d39a9740fdec4d032e381fa87999f139e2face9830914b79d631d92d293005898549a79914d47011c8e097d3029de8fa SHA512 1f3d96207ef7a9a5f13814bf85edb2b601fd2c915dc0c498880a294f85cd703774b897b17f91a6f5308bba1640eee9901084d000192e8baa8791fe9f88396dc9
+EBUILD pax-utils-1.2.3.ebuild 1487 BLAKE2B d1fc6f13abbc2f25ddfdcb763bb35409cac1b1596a491d211bd753f1ae03650fa2f3b185d815e3750f7db0d6fa5a9eabcc8fcdbc0fd117b51fd2675440d76da6 SHA512 cbf436d325442d5c794901326d83f4169924d2a03f220ab78198cfe51a06984fd0cfaba2553d7464b917de7c76e1af180630bd1f37c1f5b0b52d40e9eb7e0270
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index 32ec5fa80b37..e20193b9c3ad 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${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"
+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 )
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
new file mode 100644
index 000000000000..eb523dd9d2fa
--- /dev/null
+++ b/app-misc/skim/Manifest
@@ -0,0 +1,32 @@
+DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
+DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
+DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
+DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST libc-0.2.34.crate 304756 BLAKE2B 0a2af3e2a92ac6dfc72d72d26ff2df47b0c8656f22b3a52df02cf8eff787ae638ae8b2c56370da0e9f3831cca325d6073c6d08beedd7c75455c2785ccc5081bc SHA512 5f7a108608c2d202f6d59125aec37679f178cd1e34f0b6cc9384c476179aa45a8f10b5934314e2b2243fba4233bf8b1ce91399c8ba73e41c3591c14debc12856
+DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
+DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
+DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
+DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
+DIST skim-0.3.2.crate 69623 BLAKE2B af7236145d300033fe4d61f639209660c41c67d9ee1848c9a55e928531fa450c9c69c806abf93fd21e8876d5755143f80ca3746053617b8309c7e36f009761c6 SHA512 3f0358bd48169e9a5bdfc9b7ce1269dd1823b8df4035b0d4c81ee1ae0bc7dfcab696efcaa4bfa6a7e0b0f7143dc2752dd5df45dbf10ce199615f509d6c68efef
+DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f48742a8090a1465d2b6cfc9a80e50a737cc75d65f4bd1de226c341d10d630092fee3be74daaada88f567767217403 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d
+DIST time-0.1.38.crate 28500 BLAKE2B f0d98a7288616c2a5a07691e6bfe2bed5b043c9ddec3a6658e2e1dde294af030b635aba1d8c408f0cbe3c4c2692d4e2705d91276fac0c63f5ca03d3be3b19b59 SHA512 9052d6bc6c9222d331d23f7cb79b534bea6b1cc0f259c97f465321bcdad11b643cbd2e9bb3a456770a19a2a84dabfbab55e522cbb745f4c64e228736eaaeaf24
+DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST utf8parse-0.1.0.crate 2927 BLAKE2B 7f199899b6e87f600b77deb69004faafc0b24af50e746f139d32456d461245d9793a7a739389f432fdc2e1617875aed5a03a4fcf4fa58d2f8d0deef788755f02 SHA512 732568bb44eb285fab2d55b90a97786e503ea680e06be606e9ce975d511fee086ecd490cbc5f3daa35deeba039406b9b8ff63c3ef11305436fd5594c6e5dd7b2
+DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+EBUILD skim-0.3.2.ebuild 1243 BLAKE2B 12b4b6ace6d683ec02700b576624576aa6d15f5e2992440d80e558b6178684ef1060e16f7f6eaac49afad4df40a9c2d9fb696829c5be7305e2a4f9a8f73a5993 SHA512 ce00f85f43c33db517ead66810485a2626298501ede7f3520aa1a9e0dc0c68233b2def03507917b97b44ab04d1ba0c17e1de3fd2248edf1d0ef40d5d48586e6f
+MISC metadata.xml 470 BLAKE2B 180746e1e2f48f8024dd0cfb490e8ad2f1ccd4b32b7394f081f251b93b27bfc20e0fe440fe8449ffd52547b055d761428d585d9b6dff4f974a071349c56b87eb SHA512 c38d86b5ce12408946b75aa4537589512ea23eb09fc50354afdfdf266592e0318f0647b35d38de53b837c6f7096cd35584f8aa5395b0aa2076f3b82de389819b
diff --git a/app-misc/skim/metadata.xml b/app-misc/skim/metadata.xml
new file mode 100644
index 000000000000..1ca7d24e80a2
--- /dev/null
+++ b/app-misc/skim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lotabout/skim</remote-id>
+	</upstream>
+	<use>
+		<flag name="tmux">Install sk-tmux script to run skim in a tmux pane</flag>
+		<flag name="vim">Install vim plugin for skim</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/skim/skim-0.3.2.ebuild b/app-misc/skim/skim-0.3.2.ebuild
new file mode 100644
index 000000000000..7aa141240d6c
--- /dev/null
+++ b/app-misc/skim/skim-0.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+atty-0.2.3
+bitflags-1.0.1
+clap-2.28.0
+env_logger-0.4.3
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+libc-0.2.34
+log-0.3.8
+memchr-2.0.1
+redox_syscall-0.1.32
+redox_termios-0.1.1
+regex-0.2.3
+regex-syntax-0.4.1
+shlex-0.1.1
+skim-0.3.2
+strsim-0.6.0
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.4
+time-0.1.38
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+utf8parse-0.1.0
+vec_map-0.8.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tmux vim"
+
+DEPEND="virtual/rust"
+RDEPEND="
+	tmux? ( app-misc/tmux )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+	dodoc CHANGELOG.md README.md
+
+	use tmux && dobin bin/sk-tmux
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins plugin/skim.vim
+	fi
+
+	# install bash/zsh completion and keybindings
+	insinto /usr/share/${PN}
+	doins shell/{*.bash,*.zsh}
+}