gentoo resync : 23.06.2018

28 files changed, 550 insertions, 125 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f327e1517a1e..fda968ec6616 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
index 40babd895eb8..872949edd513 100644
--- a/app-misc/cdircmp/Manifest
+++ b/app-misc/cdircmp/Manifest
@@ -1,3 +1,4 @@
 DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
-EBUILD cdircmp-0.3-r1.ebuild 750 BLAKE2B 2cd0d47339df57d57b563592bef95918005f0b903d8ece85a2ade1590b3eefc8c0f3374df09609dfce9c744424ca031ff0dbd1fed89d8ce1f5f65df6647a8c36 SHA512 34cfcebb8172ca0fc716733c5cbbb89fc0fe2eedc139406cca20a592f0120762cb8f2784d9690b8bb1a60ede03662b382805587649bb2d0ba8ce42676236781d
+EBUILD cdircmp-0.3-r1.ebuild 756 BLAKE2B 85ff26a39b82cb2bcd1b6ad1ed8215ade2d1f986c63a75215db444598bb933510eeac73a6b42a52164e4c8053c97ad247051f4981faf5ccd81b50968cfaf2ed1 SHA512 1f208a84a06f735e3631ec55159528ab24712cf74228d9f8e7957d3383202c8953a40815ebf339b812cf41cc1323d2eab41194384b795533b5c78499be68325d
+EBUILD cdircmp-0.3-r2.ebuild 663 BLAKE2B 371d80aa2cb1f654a0bba24d9cf21a2d418184ca73fa067d5a542594d9f7d44433deeeaed0db98c7aad01fb7ca6ada50096ca40be452cce03a4468e3f4b4d872 SHA512 2be97f0c1bed5525e7f1bb04ad123dedd83c6d3894909fce94838605b12d157cbe594c4fa21fada0e8e859f361945dbcef9cad0f843530f08628c43296220c96
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
index b2576f017b87..f7851f0207a2 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Compare directories and select files to copy"
 HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
-SRC_URI="http://home.hccnet.nl/paul.schuurmans/download/${P}.tar.gz"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
new file mode 100644
index 000000000000..ea5818e44538
--- /dev/null
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Compare directories and select files to copy"
+HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.4:0="
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+}
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 90fb324bc8cf..5be4a90802a6 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,5 +1,5 @@
 AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
 AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
 DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
-EBUILD ckermit-8.0.211-r4.ebuild 1955 BLAKE2B af963e7ece8e946e780f147015c94478d8c79972ea9b8af7d38b6b7bfefcabe55a88f88153e73f3d853137b0463353da16a335caf72391cd0ae4fbf442bdfdfe SHA512 67536adb24b301c2ebd62671f7bc8999b06b80b5f84ef9f648d746ffdc53cf3aa41eabb718411105aa9c1b06a8fa898b4c05be0613055aa7227e730164e03fd3
+EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
 MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
index e129da2a6c12..9d8950eb448b 100644
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -34,23 +34,24 @@ src_prepare() {
 		makefile || die
 }
 
-ck_use() {
-	use $1 && append-cppflags $2 && libs+=" $3"
-}
 src_compile() {
 	# we don't enable any of the telnet/ftp authentication stuff
 	# since there are other packages which do these things better
 	# USE="kerberos pam shadow ssl zlib"
 	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
 
-	local libs
-	ck_use ncurses -DCK_NCURSES -lncurses
+	if use ncurses; then
+		append-cppflags "-DCK_NCURSES"
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
 	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
 	append-cppflags -DHAVE_CRYPT_H
 	emake \
 		CC="$(tc-getCC)" \
 		KFLAGS="${CPPFLAGS}" \
-		LIBS="-lcrypt -lresolv ${libs}" \
+		LIBS="-lcrypt -lresolv ${LIBS}" \
 		LNKFLAGS="${LDFLAGS}" \
 		linuxa
 }
diff --git a/app-misc/eid-viewer-bin/Manifest b/app-misc/eid-viewer-bin/Manifest
deleted file mode 100644
index bd3b0ccf196b..000000000000
--- a/app-misc/eid-viewer-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST eid-viewer-4.0.7_p184.tar.gz 9908119 BLAKE2B 3be67b5ebe6ab179d0013bddbf84533d8a413897c81471f4ed5d5c3e90ac70ee946baf9aac4934b765f758f57a0de4eb3905b8cba72755cec3f90073dbeb69cb SHA512 65b93e86e0175ca9aea8b5fb237aaa8b3fcab838d7507db335e163a6927e1c214248764b96c61eb3bbec6caf19440f7b7cd60dff79482ad249e23770b51fafa9
-DIST eid-viewer-4.1.9.tar.gz 9924753 BLAKE2B 1d8b96b5a46bc49125fc6fe2095b01125108a8dc2da7a9446b54c3b17f02c3ac5428b8d0681b979248a3c27999ac2d4ca8a3fd8a919c02c4f9ed61ec55b85def SHA512 536387f93e0fee3f39145a888df93b58fdf4e92389ea5eee99c41713f2eef22e136ef674c7c59790e8484d2353820c4b6b104ea45dd41036fcdeb5f7754fb52f
-EBUILD eid-viewer-bin-4.0.7_p184.ebuild 733 BLAKE2B 554bb1d1cf1744a8d1c05c774e51af9cc8389ab0fc1f42f62702bf0ff08baedfaf5fb596b9c599c3a00965ea01049a4c46fe457a8662b4ba52d234b7b51c03a2 SHA512 4b55021119f833e959a85914585844b05025d6438fb8f6c63af628fa69fd107c4de1fbeedc4223be07ba3b8d29483ba3b62491ca7a6a910a66f392ba82d61c50
-EBUILD eid-viewer-bin-4.1.9.ebuild 633 BLAKE2B 9b9ff69d5f2875c9bbc1f777e27681202395485d8d6b51b80f39bdb89270135a1979574b5cc4ed4455b12a91c088986313fd1a92053e16f32ca99d77e156afaf SHA512 3c5273bc3888e72f4ea33111ad84f7a45a5afe92b80ceda6b44ded0325b219cd9512d780007951271f59928e7bcd7bc6b78fef4c6c8966332b833578f9c5112b
-MISC metadata.xml 1107 BLAKE2B 775afaf351806fa0e365ec00e5be491f01dd7c2394bec4317ac202205e707de9cffdede15694602d83feced8bc9e4799bb893d64ba281cde076443eeaca173d0 SHA512 98c909228ab14eb599f6f6b9da05b5c9fa4945283e08c654b5dd43f6d242bbfe2b929ee78533d4cc9e6dcc50d92bbd9cbaf99e67a8c888616a172d33588039f3
diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild
deleted file mode 100644
index 0cea01094a4a..000000000000
--- a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="eid-viewer"
-MY_PV="${PV%%_p*}"
-#MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Graphical interface to the Belgian Electronic Identity Card"
-
-SRC_URI="http://eid.belgium.be/en/binaries/eid-viewer-4%2E0%2E7-184%2Esrc%2Etar_tcm406-250014.gz -> eid-viewer-4.0.7_p184.tar.gz"
-HOMEPAGE="http://eid.belgium.be"
-
-RDEPEND="
-	virtual/jre:*
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e 's:icons:pixmaps:' Makefile.in || die
-	sed -i -e 's:Application;::' eid-viewer.desktop.sh.in || die
-}
diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild
deleted file mode 100644
index 34372ac5cbb2..000000000000
--- a/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P="${P/-bin/}"
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Graphical interface to the Belgian Electronic Identity Card"
-
-SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}-v${PV}.src.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://eid.belgium.be"
-
-RDEPEND="
-	virtual/jre:*
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e 's:icons:pixmaps:' Makefile.in || die
-	sed -i -e 's:Application;::' eid-viewer.desktop.sh.in || die
-}
diff --git a/app-misc/eid-viewer-bin/metadata.xml b/app-misc/eid-viewer-bin/metadata.xml
deleted file mode 100644
index 7a2a8b3dbd4a..000000000000
--- a/app-misc/eid-viewer-bin/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>vincent.hardy.be@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
-eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
-
-With your eID, you can:
-- identify yourself when necessary. All you have to do is insert the card in the reader. All your details then appear automatically on the PC screen.
-- authenticate yourself. This is a way of checking that you are who you say you are. That can be handy on the internet or to enable your children to chat in safety.
-- place a legally binding electronic signature on electronic documents.
-
-These three functions form the basis of the countless applications for your eID. Go to http://welcome-to-e-belgium.be/en/ and check out what can you do with it? and discover all the things you can use the eID for.
-</longdescription>
-</pkgmetadata>
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
new file mode 100644
index 000000000000..90e6f460c8f8
--- /dev/null
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -0,0 +1,4 @@
+DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
+DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
+EBUILD kryoflux-dtc-2.6.ebuild 2416 BLAKE2B f46de2423db72922873ea8f9c6dccc2736c3a2fcfb68dd5b611519b7689a3d22f9b4892c2ad5bd32d2d9ee1e93fc2302413400b69c89ec6df71ce6509d0d8215 SHA512 f0bf9fa0b0f9e915a136386585f5668082f0cda3dc7b76b7ba30c4976002fcc6c4fd61c56479bf8c104444d0377538c354479fbbbbf80eee41cc2a49413aa61f
+MISC metadata.xml 582 BLAKE2B 6efbcc8d9b65499ea7025dcf9bbf1352a52abbe34a77d8ac59a8f022448ea82d12d84516104b7a719d4e9014a51460bcae29efce62a9a5e6bb41332286528dc1 SHA512 00f628fd32ab3a5568f9bbc841c38732b07d9db58ed2020703dfb0908aeaec2b07d8a6aa84e884442981126755c7d6f92cbef7238c38f2c3d6fc985a3721e9e7
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
new file mode 100644
index 000000000000..de512258d895
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="kryoflux_${PV}_linux"
+
+inherit desktop eutils udev xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.bz2
+	gui? ( https://www.kryoflux.com/kryoflux-ui.jar )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="SPS"
+SLOT="0"
+IUSE="demos doc fast-firmware gui static"
+
+RDEPEND="dev-libs/spsdeclib
+	virtual/libusb:1
+	virtual/udev
+	gui? ( virtual/jre )"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="/usr/bin/kryoflux-dtc"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+
+	if use gui; then
+		# Updated *.jar for compatibility with >= Java 9
+		cp "${DISTDIR}"/kryoflux-ui.jar "${S}" || die
+
+		# Extract kryoflux-ui.jar to get a logo for the meny entry
+		unpack kryoflux-ui.jar
+	fi
+}
+
+src_install() {
+	newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
+
+	cat <<-EOF > "${T}"/80-kryoflux.rules || die
+	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+	EOF
+	udev_dorules "${T}"/80-kryoflux.rules
+
+	if use gui; then
+		insinto /usr/share/kryoflux-ui
+		doins kryoflux-ui.jar
+
+		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+
+		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+		newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
+
+		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+
+		dodoc dtc/kryoflux-ui_README.txt
+	fi
+
+	if use fast-firmware; then
+		insinto /lib/firmware
+		doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
+
+		dodoc dtc/firmware_fast/firmware_fast_README.txt
+	else
+		insinto /lib/firmware
+		doins dtc/firmware_kf_usb_rosalie.bin
+	fi
+
+	if use demos; then
+		dodoc -r g64_demo ipf_demo
+	fi
+
+	if use doc; then
+		dodoc -r docs schematics
+	fi
+
+	local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you want to access your Kryoflux without root access,"
+	elog "please add yourself to the floppy group."
+
+	if use fast-firmware; then
+		elog ""
+		elog "You have enabled the fast firmware. Please keep in mind,"
+		elog "that this firmware can cause trouble with older floppy drives."
+	fi
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/app-misc/kryoflux-dtc/metadata.xml b/app-misc/kryoflux-dtc/metadata.xml
new file mode 100644
index 000000000000..c95657a7f862
--- /dev/null
+++ b/app-misc/kryoflux-dtc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="demos">Install example floppy game files.</flag>
+		<flag name="fast-firmware">Install fast firmware instead of slow firmware.</flag>
+		<flag name="gui">Install the Kryoflux GUI</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 18de22ae2bd9..c469baed49b7 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,5 +1,5 @@
 DIST ktoblzcheck-1.48.tar.gz 561054 BLAKE2B 559f70712050a41c07bc440ce6ebfb8a8d51053b17556b1e04d831cafb2097d61965b44ee9bcc807378923c0863136ad3b84c3d8ae59b63a21d712541e28c907 SHA512 897a98b7f39cee43f46fb34009e5d51b06fc0734f4c6e50adf888e9663114c7f927ba5b34cfe8786cb4558621828a580076cd975512a253f247b1e4ce5cfb089
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
 EBUILD ktoblzcheck-1.48.ebuild 862 BLAKE2B 5b5b3bab6e9a5a3889557e8a5b779cb5c0f3a713fb3c21527fc0e65496960167647c3039190c8a3900e4aabf79c968fef93f0b4cf7748df96e55cbc771e56dac SHA512 376d251218ef70ed24e9d54d5057634cb46b296fe9c5705eee29ce29232705a37cc4d09d332d90890385285d72866b1fa3c53697f91a53f044c7febeab7f9691
-EBUILD ktoblzcheck-1.49.ebuild 864 BLAKE2B 855972267266f152d0981ed201146cf294db2a10098444a835af4a770ed931805d6143ba70a4e9205ac9413ea280f9bd055699e42f516261c68eeb80fc2fef0c SHA512 620c18a905f542fa3696219fb1c20b300d22cefe90420d1ad9d5f46407fef69a975a09cf060c3294be085600425bf3a7638c80919ed95ebb44a2d33a94011d97
+EBUILD ktoblzcheck-1.49.ebuild 863 BLAKE2B f7241fc856f911894bfcb671c7c6db61a7ca58fc0a5544b3091822547331976a780d58115b014c7f63cf99404f50ba6a82baef7f1aea62a6181076f3856f166b SHA512 4b1ece7fcfa1910d2c97ff247b33fd3f75bf6235e6e6173f4ce7c17f92b0b6940e2876881eeb8b8ad20fcd308b8c2554d8e674ef84ec4a9970f822e10732c64e
 MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
index 4465f59fe022..8918bd7bc302 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="python"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 7194e53af786..1e4430ca9649 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -5,6 +5,9 @@ AUX lcd4linux-0.10.1_rc2-nordtsc.patch 4703 BLAKE2B 951f35d6b935cc74d7a39b810101
 AUX lcd4linux-0.10.1_rc2-usbdebug.patch 3032 BLAKE2B f6672c30554fd271b5fbaf2832ec2d55c3e14544147cfbdbfa29a579f7a59243a08b6523af779938db4c2f7cf368d7f47dfe7c6581ece5bcd4f4fc60efbc96d2 SHA512 252ebab0e125c2189178f1de35c46d398f79d4b5fd4ff5b92c72874e95c7b45c25eaa92b600a8d5a160e4e45c265f69b6240123c6d2ec4076c7947659e46ae46
 AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 BLAKE2B 4e4c6f34ffc440083890df845616cb723bb26756ea08b34d7dc01da25abe33b59b4bb81f78a53c6c71a57dab42bc30429ba4b399c2c55b1611c3443bf8d454b2 SHA512 ee6b163dc93f2913c629b056ec79cffaecbdb9124d187be8e616e10cc3cec917d98cc8131fda9d3b310530c00cd61dc1617dce4f54143c77962cbc0c58f4d615
 AUX lcd4linux-0.10.1_rc2.initd 539 BLAKE2B 314810d6bf8a402a435dc1cb53f610ed1f0fd3ec8965cc9fd798b5aa097bf1c35a5baa4a76dc9ed7d244943c9aa1b05aaf5e010b431522fdc3d7d45bbdffeca4 SHA512 c3f6cc42bb6c0d7ecaa180c28c0d9a9530b32dca97cb563960a0c30ca9cbed80a7b249f970d791ba034f115ef22218feac7a449ab6fe69109a1427565d62be07
+AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
 DIST lcd4linux-0.10.1-RC2.tar.gz 386188 BLAKE2B 7d396ee15e00212eb314721cd9627147ec1654f43fff1d3ae3f8c38d33d8d133f1fd5c53ef2b78eba7afefb7f65a53810da52a903911abdd95383b2b2c28d06f SHA512 8c4299f50ab4068d4106ba32309f4f66bfedf382a4aed7495cf400d22c57c22c4dfabd80f7e4355417c5c0d964e69f0c268a50bae6924b759b720bd728a969f9
+DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
 EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5156 BLAKE2B 9cd0d0231dfec0ff6fab4c668969e16a546e70167d0d495caf8d527554521a1878e3b4f14451ce7abd29c2db7b8c0bb87cb2815a087c79777592e431a8b4610d SHA512 a17a33cbeac88b0eec6a6d5fb8435667f3f9d5c33bb77e360ba7d755f6c3c138d3d6a7ee87c83eee4f4679d4df59dc27457a61ed108c0a11ed30d2dbf8d4b1d9
-MISC metadata.xml 563 BLAKE2B 4a4876fe523695733cfb7a22890b8f9cb4b398ab87233011ef279eda3eeb8e44572874fbce427f21fe07176a838e0f5bd43a6727116d9ee6a21ff4763368bb8e SHA512 74c04fe6e8bc22b8b57d83062459c7daae1d003f86aec1318f7701389627443026a4b070d864df85b270a26c0f2882d9333bd07b4d6572b9a9b3380d5dbf40f0
+EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5555 BLAKE2B a97eb9b0efd8b22abafd271d53f1530cd126694515c8a9d0a7e6a340178354ffadd99904901eac4615d0572f478242bab55905669b32b7c91e02dd6d873be6d4 SHA512 af9afccf37f5c92ec522aa8e86678ec71fb9c702162eb040385a691adfdb0c5a5afaac1cb9d5ad230f3d01f96c4e296c241ba2ebda8b1a5f2910f78ddf9d4c6c
+MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/files/lcd4linux-r1.initd b/app-misc/lcd4linux/files/lcd4linux-r1.initd
new file mode 100644
index 000000000000..44ca73e9aabe
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-r1.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "lcd4linux" ]; then
+	config="/etc/lcd4linux/lcd4linux.conf"
+	name="LCD4Linux"
+	pidfile="/run/lcd4linux.pid"
+else
+	config="/etc/lcd4linux/lcd4linux.${SVCNAME#lcd4linux.}.conf"
+	name="LCD4Linux (${SVCNAME#lcd4linux.})"
+	pidfile="/run/lcd4linux.${SVCNAME#lcd4linux.}.pid"
+fi
+
+command="/usr/bin/lcd4linux"
+command_args="-f ${config} -p ${pidfile}"
+command_background="true"
+command_group="root"
+command_user="root"
+
+start_pre() {
+	if [ ! -f "${config}" ]; then
+		eerror "Please create ${config} before starting LCD4Linux!"
+		return 1
+	else
+		checkpath -f -m 600 -o "${command_user}:${command_group}" -q "${config}"
+		return 0
+	fi
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
new file mode 100644
index 000000000000..098e0b9b1d05
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=( ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11 )
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=( apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
+	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
+	proc_stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless )
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE=${LCD_DEVICE,,}
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? ( dev-libs/luise-bin
+		virtual/libusb:0= )
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? ( media-libs/gd[png]
+		media-libs/libpng:0= )
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1=
+		virtual/libusb:0= )
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris_dbus? ( sys-apps/dbus )
+	mysql? ( || ( dev-db/mariadb-connector-c
+		dev-db/mysql-connector-c ) )
+	python? ( ${PYTHON_DEPS} )
+	wireless? ( || ( net-wireless/iw
+		net-wireless/wireless-tools ) )"
+
+RDEPEND="dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r1.initd" lcd4linux
+}
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index 2d2a4720b153..a359d32d1f1e 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -1,14 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-  LCD4Linux is a small program that grabs information from the kernel and some
-  subsystems and displays it on an external liquid crystal display. It is
-  fully configurable and supports many data sources, displays and plugins.
-</longdescription>
-<use>
-  <flag name="mpd">Add support for display of mpd controlled music
-    (<pkg>media-libs/libmpd</pkg>)</flag>
-</use>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		LCD4Linux is a small program that grabs information from the kernel
+		and some subsystems and displays it on an external liquid crystal display.
+	</longdescription>
+	<use>
+		<flag name="apm">Enable the APM plugin.</flag>
+		<flag name="asterisk">Enable the Asterisk plugin.</flag>
+		<flag name="button_exec">Enable the Button plugin, to execute something on keypress.</flag>
+		<flag name="cpuinfo">Enable the cpuinfo plugin.</flag>
+		<flag name="dbus">Enable the dbus plugin.</flag>
+		<flag name="diskstats">Enable the diskstats plugin.</flag>
+		<flag name="dmalloc">Enable dmalloc for debugging.</flag>
+		<flag name="dvb">Enable support for the DVB plugin.</flag>
+		<flag name="event">Enable the event plugin.</flag>
+		<flag name="exec">Enable the exec plugin, to read output from external programs.</flag>
+		<flag name="fifo">Enable the FIFO (First-In, First-Out) plugin.</flag>
+		<flag name="file">Enable the file plugin, to read from input from files.</flag>
+		<flag name="gps">Enable the gps plugin, for reading gps coordinates.</flag>
+		<flag name="hddtemp">Enable the hddtemp plugin, to read from the hddtemp daemon.</flag>
+		<flag name="huawei">Enable the huawei plugin, to read from a huawei device.</flag>
+		<flag name="i2c_sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
+		<flag name="iconv">Enable the iconv plugin, to convert between encodings.</flag>
+		<flag name="isdn">Enable the isdn plugin, to get information about ISDN.</flag>
+		<flag name="kvv">Enable the kvv plugin, to get realtime train schedule from the Karlsruher Verkehrsverbund.</flag>
+		<flag name="loadavg">Enable the loadavg plugin, to get stats load</flag>
+		<flag name="meminfo">Enable the meminfo plugin, to get memory statistics.</flag>
+		<flag name="mpd">Enable the mpd plugin, to read from the Music Player Daemon.</flag>
+		<flag name="mpris_dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
+		<flag name="mysql">Enable the mysql plugin, to get mysql database information.</flag>
+		<flag name="netdev">Enable the netdev plugin, to get interface statistics.</flag>
+		<flag name="netinfo">Enable the netinfo plugin, to get more interface statistic.</flag>
+		<flag name="outb">Enable raw i/o access.</flag>
+		<flag name="pop3">Enable the pop3 plugin, to get notified about new mails.</flag>
+		<flag name="proc_stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
+		<flag name="python">Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.</flag>
+		<flag name="qnaplog">Enable the qnaplog plugin, to read a log from a QNAP device.</flag>
+		<flag name="raspi">Enable the raspi plugin, to read sensor data from a Raspberry Pi.</flag>
+		<flag name="sample">Enable the sample plugin.</flag>
+		<flag name="statfs">Enable the statfs plugin, to get statistics about the file system.</flag>
+		<flag name="uname">Enable the uname plugin, to get the output of uname.</flag>
+		<flag name="uptime">Enable the uptime plugin.</flag>
+		<flag name="w1retap">Enable the w1retap plugin.</flag>
+		<flag name="wireless">Enable the wireless plugin, to get wireless statistics.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 01669353e9ce..6303a559e54d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,8 @@
 DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
 DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4
+DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
 EBUILD neofetch-3.4.0.ebuild 528 BLAKE2B 55af7ef9e6137fe42359f3db5af58c3418d4efbb9c1cf2dd5321acb0990e31de3db5258bc1bd6f4784e54cc4e9b3dd6abfc7ebe7c6dc366d72ebba82f6964042 SHA512 21b9a4f2d6df165860872f58794b34550df3dcacc5a9a3673a5ac45eab46fa7e2c3de238f266f7ef3944aacfe6787b1debf70d8f7b85fb4c186029efdf78a2df
-EBUILD neofetch-4.0.2.ebuild 530 BLAKE2B 688c91a8e3274b77d03a2869d476342ef6282b969d655f6bac6a0f96e2b36c5bbe7bc89440e07e253ec31b2187e21492150f53a983d68604eeaefc1a29674861 SHA512 07bc21b1664221d3d76a0bc81460b1eefc2208cfaa199031d260a1f7ce0fbd639ee1467cbbe7450688031e2eb26279bc121ed8dd7d2a916313a4ce01cae10786
-EBUILD neofetch-9999.ebuild 497 BLAKE2B 755f18e1319131a25eda33357cb86c654637aa44c919a6c4bcbcc6c34ac9c52db058055b9893a60d0433c02e57d6f14b14c110f2e0d49e70a05095b7565baa16 SHA512 48635d857f74691f06a7b3cbaf9177c1929aa3a7a00441b0b3664823ae294e2ea0323803cf2a50220fc38656d8af28a0f8cf1adce2b72c1e1606af125a985bbc
+EBUILD neofetch-4.0.2.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+EBUILD neofetch-5.0.0.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
index a25cba92a486..4757864917ab 100644
--- a/app-misc/neofetch/neofetch-4.0.2.ebuild
+++ b/app-misc/neofetch/neofetch-4.0.2.ebuild
@@ -3,12 +3,18 @@
 
 EAPI=7
 
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
new file mode 100644
index 000000000000..4757864917ab
--- /dev/null
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 82642075d611..4757864917ab 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -3,10 +3,16 @@
 
 EAPI=7
 
-inherit git-r3
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
-EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 IUSE="X"
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 244b5f78094c..63ad19134861 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -1,20 +1,34 @@
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz 11663 BLAKE2B 17e4c4d8403663b27c85074f456c60f7da3d43c875816b6f4da32ccc4c422b59cb28c11a894705430b6001766ba3a63ddaade95ab1510f87ce19cfe0b1391d04 SHA512 9ba6de3249259ddbc81faef63e0c801822687f875acb5965dcdfd52c85bca887dd5248be731e0731f1dcf274de64a87630cb902fc2e15718ffb327922f023bea
 DIST github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz 35509 BLAKE2B 66c231463c6ab3a6f680e6f7359f5308d2c07cf41a445d106339a0b8f190b790c458e07715f1a2dc5febc86b8559d33f87d29554e6a4113b7de863f38fbc406c SHA512 44c70da26dff59e3ae264e9b586517327e1612d9e173d7d4a2dc50740a067bfb5af2dd9a6dceef86fa65bef719ae8dd443306078e02b2a06eefd9971896079fe
+DIST github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz 36845 BLAKE2B 2c99997fcbc05cf6eee1d8f5829b331d14d9981598a913832a71c58a19fa889a4b270df7f4612a0dff3eddc03dcf6d4be42c05f762010a9ed4f53817b0b61d86 SHA512 f8d2c9c40c594a3ac2724c7109eaf22b212b644c39846f6c86ee4199c61f7197b0e276dfefdd037accdbfdb24ddf850a2b3608fbaaeeca2048269c219dbf93cd
+DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
 DIST github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz 587208 BLAKE2B 9950f95e1d9bcac7e97e88d211ed0cce83ea3bb43808b70a7443d93f9d4f0c14c3714968b3c37dd703bd6cca1fa7c7f9d20966979b8b331469af40b712ee6131 SHA512 cc36bf9807a8f50951c9da6b49ced1f3b3fff8437371e8bb0fab5f56785f2e9c0bada77efe08107405f4a72f6d5b0e0fdd34be60498bd5e52d3cabe6c6cd2a7a
+DIST github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz 230977 BLAKE2B a551b24b20e846e81305181130bdf47af11ab0ce93d9b2c7a626df507c5eb8a88f416e919dfe7a9f73d47c606d34182a90a64e08b4279928a300bac664250368 SHA512 a1d337d50378604f28c275dc3192565a7b058ace04cfefa5b5cce7141873e88925b63750a9ba62e87e4b3e65f4c94875435674653836d8785c02b26f82a1ceb6
 DIST github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz 245917 BLAKE2B 28ebc8887957684a7d952300b3309d7846eb273945172c3ac833cd5fd7d947df35fb6f872afd4f18c4edffee5078c5833c85a9a7c2dca0c6c6d620e258752a2c SHA512 bf77e378486d96ac62353e2c92dae6e8e7a7daf59c26053fe66d455b2d3319101e217f0c8edb9f40ed7b00034537040a99eb96d1d9859e01794d07fd6d96d42f
 DIST github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz 169813 BLAKE2B 3bc9dd34e9c2626cacaf53dba8d173013ee3c0a4ecd376021c0fbe82463bd12382c515fb473ab423cdd2549b9ea62243719e332c1e7b64a0611439e7fc8d0787 SHA512 aaedfc089a6b1300e5c3a73fa634a982e5391463f7f594a4908cdd7c7e37c9626c7fecb2907e5bca067395fcb826001748fa1a84b3cb3ff59f8cf7006a4f6bd1
+DIST github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz 195878 BLAKE2B 46e186bc1a3096dd043780a35a989959b2cbcabd063bd4bd671fb3b4536ecff731037c57479228badb438fb53bb0c21e8fbb1db881f1438be9bd2398a75c9455 SHA512 da15b3ff93cc1b26439b9e7acf3ae5a12e7d23c0d6e11c691c4013133d37b41d35275f8040a74fcd4f90a9ad93c0b95b48687de43e94831b699df60fbf0c5159
 DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz 28059 BLAKE2B e760c6976b7cf6bf4df46bc355eb1ecbd62795d65ddc8172f4ee727579a5848f1e202afe9fa1fd649ab52c417af8f0c8aa09a139904a57114214859206404028 SHA512 27931ff511b9ddca3ad0f21d648ac4652736907366136d8e0282a89acf4afb589821aee0362166a8df2de2cbd6b20edf13c13d2686e6e5f9ea2d773e6e507b36
 DIST github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz 27556 BLAKE2B 0fa04ef876787441426eaa0801a04e82ef50dbe9a538652e75e74704ae5814e3171d5c82f77961b43b2d6409b0398a38f34193f5dab3ff2fb8b9a81fd54dd228 SHA512 70fbbc37ddae36769fd75d16c342fb41a19f0b7f09e3291fb8579afaa7f02962f7192d9030be4b35cce0fc847275ecad88121e254d28e963efa16a99cd42b41a
+DIST github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz 7598 BLAKE2B 21a5b6e25859f38416a185646e3d63cb7fc2d175f816ba71b924a80a939fdd47af5be8eec35146703822e1eaa91a3a2f41123eba475f678cd0206b597b879189 SHA512 47f401a01ecc8d08504bb8da3164b95c814ff567d9d44dcdd8aed7dcc2768e4aae0b65504f15931a20c3ec6bd9873383e2b1150660a7ae5016dc1d389305a0f9
 DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
+DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
 DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
 DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
+DIST github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz 31339 BLAKE2B 38224fa7af5e8e56500fc01f3e861aeae2e81b4cc38859d9598b0883ccde7504f1f717a73db4a76c4ea4baa5f052fb5b7f39413aa8be9e5cde5b70d8693f2044 SHA512 f53f34059016336cdf2d061594b50ce5a3bad9a9a97158218342e245c277ae68571647fe00bf207274a8714ce103a536ff80b820feaefb44cbd12abc5debdd47
 DIST github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz 30244 BLAKE2B 1e770aaaa79326b3acbf4bd956924538411c8d805b6c213603106e6a87a6b4e4aaa6095033393a5b1437073004e2672596e55f6d1b4fe7e902c71237f192e2a0 SHA512 194ccef5dc9aee30422285bc752700d24b7dc05475dd5bce5023f8fe426257d0c3d75bde5c4a3681737b7604c944d964344f81c663a4ad180f9e41b70b1e81b5
+DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz 74684 BLAKE2B 7c3809f3040dbf8872c6081afecb072ca198f8a22c89860edb452e55807a18dd41e2887911be4557448cd571d3db42493c7a5af2796bb8b9494ebd10822c00a6 SHA512 8919acb161f6f98e22f866726f3f85b4d5071782debe7117ad55c28508e469b73a2975d4660998a9df7a86472e8f65f2f103cf71c42d913d79a1bab6e86d94db
+DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
 DIST github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz 39235 BLAKE2B 743ad732b19efa4450b4a8a8512d51e03694592f9803233dfd946e7eaa513c8edf0e4b2763f458bae2e6af58a26a4d9559c54a35a0da6af9909d6b2b9b0a9624 SHA512 6bb7e34efe274e9a77fe95771ce8831a73537c5745f58ae62ec75a3744010752e1b4f3d1c35c689a41e1b0488a090224aaa3276f0981febd0838cf1a889be202
+DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST pet-0.2.3.tar.gz 2733693 BLAKE2B 92024983e2418c5c47f3a18ea664073fe847e2ef9be58ceb2d8e610cf8b9ac75a95d26a2512d26334c1cf989ad570fad83fe58ac7cd828740371c7276fd6855a SHA512 5207773b71ce773c974187cd86b8ddc7d1191f1baf615e035e290254d49d8c0ac4372b3ac004c0883a3fe7167447cab21e5b0711a78ce8ba57fcace975ef80a3
 DIST pet-0.2.4.tar.gz 2734689 BLAKE2B 2f6a4b0814cd69ec7b58f7a0892d955e8b4bc402c526c32b2b3240d7a883515b86b3f7d99a76bf58592eaa2eaf8f230889f0dd5ade6500506c217db68e6928cd SHA512 59b4c8f660fbcd208742e4c90a90c9eb4736d99631e14def5e8bdc1c75add2a6a67c358d2ec59ca816f6485d3d824bc6dc1592949889bace1734a5f2c3023e3d
+DIST pet-0.3.0.tar.gz 2735876 BLAKE2B c2b629db202c263b7419e79e15e07b808ea2a395030ef79214c541ac0d17a9fbe9cf3db9bc7e1a886da38ff8becd06d18abc24a69131cf6e3009ee2d72b1e6db SHA512 deb0323fbcd0195df9638bd82077a55be6554d80c44ddbb08cbb63c2a055659f5aa42fd87bc498d5cb0c93d57047f48462ec428ebff3d89a80dcd4b3661447fc
 EBUILD pet-0.2.3-r1.ebuild 2012 BLAKE2B 592a7253976aa5efbecc118306943712cd505c111bd2b573b1c6d0b939e283e7bd304694b3ff11d073eeb9867af7b7cb34fce3d1e2ec49b7c7e47c49f03fd885 SHA512 cfc5aabf28f43fbda06e8316e67b3522eeeb4a6c5caa8b78bc8e095e86a7f64e51577e30f9d8d174858dda1cb47c4a22b448c97bfe212e9dd3b59b5ce704e313
 EBUILD pet-0.2.3.ebuild 1988 BLAKE2B 4a8b7687f9f5009ca16fd4ef3673ee608da3f038f95684d3d90ec772843d1362d4b5146312538a139bd651bc199e3b06bf193a3b8bcbada66e9c5631ce3927f1 SHA512 5360ab9e5213cd89a2114617950c610a51e1d7002a0621e3431d50da1f5bb0f2b4dfae3e3a9d088883161880c78479b327a22df98215ad1e87f10906fb37e053
 EBUILD pet-0.2.4.ebuild 1998 BLAKE2B 317dfc8a59b15199cbddea040f1ac8c87bdc1d2b75ee8991c6aa447d0f80ceff70ca1ca9bc98dad3932d56a3bffce68f944bb9deacaeaef5c2d193748577a019 SHA512 2a7e813468571e3366402567eac5909568e2187cecc6b3baefb3189e9d7014ba436f563945d3dc12c784dcb306548d6e87c8552ed215451819951d30a679b6ed
+EBUILD pet-0.3.0.ebuild 2169 BLAKE2B c82ef596b6abfb64733fafce4a3538c0ee825f102b092b267592aeed9369171c73a0f5cad9e9f71ec4dc4069a5754f330824e788dbc27e756912d0f585a3440b SHA512 ea6141990ccd11c3498ae71f71d398c7f46c05a44cf9b9961781cf9e1ecc2a9e29af9a5c07eeda69fa7b6c3619b5f280a35eefc12e920ff17733d3b991c1e5a1
 MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/pet-0.3.0.ebuild b/app-misc/pet/pet-0.3.0.ebuild
new file mode 100644
index 000000000000..991478810dcf
--- /dev/null
+++ b/app-misc/pet/pet-0.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
+	"github.com/chzyer/readline f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f"
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
+	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jroimartin/gocui 4f518eddb04b8f73870836b6d1941e8aa3c06637"
+	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
+	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+	"github.com/nsf/termbox-go 88b7b944be8bc8d8ec6195fca97c5869ba20f99d"
+	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+	"google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine" )
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="dev-go/go-crypto:=
+	dev-go/go-net:=
+	dev-go/go-oauth2:=
+	dev-go/go-protobuf:=
+	dev-go/go-sys:="
+RDEPEND="${DEPEND}
+	zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+	dobin pet
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version app-shells/peco ; then
+		einfo "You should consider to install app-shells/peco"
+		einfo "to be able to use selector command"
+	fi
+}
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
index 884bf0328590..ae788a344553 100644
--- a/app-misc/tails-installer/Manifest
+++ b/app-misc/tails-installer/Manifest
@@ -2,6 +2,6 @@ AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909
 AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
 DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
 DIST tails-installer-4.4.8.tar.gz 332532 BLAKE2B 5c597f38e8cfd690b56e1a08d98567278bcb12eb72cb292c02b77d497c8fc4925f5829efdbb3351fc5a30296d9138a07f2dc8077ada2e32bf7b04dff2f31193e SHA512 3a15d31d54ae17c12c1ba8346782f26678fbabcdd99582a5b43c75f520001ec01e5cc09b1832d0f7d346852f9eb30114135c92caff8690281469f35f23806a12
-EBUILD tails-installer-4.4.11.ebuild 1156 BLAKE2B d1dd2d76b7e0b00af774b3b48a9fea4bee3d6433de968a7eef6799a64a1f187b2c630c696c0791c1988a1e03ca7d543ca14f4bd6e08ca9ccbe19c44ecc5cec3d SHA512 95c0b153f5127b9e26016ad4e18c441a85a556d46b82383036f2efe00baccbfa3fbb71f5a53896f460ea1c18f9d20b6a0de0933c06651864aaebf397acc55a08
-EBUILD tails-installer-4.4.8.ebuild 1158 BLAKE2B 71b39ff49545d5e993ec151414ba5932d439bb1c36aa132098da34757ade89153343302e8741fe49d32fbd204335233afd2cc9d13d8d8104319afb0f9864188a SHA512 83ec233a4800d5fb8311649c0673c97bc1f09a338001c82145f74d1e61d92f48c285d1abce01b22bd595d99e3fb18e15f83940d4be596ec424318617b9810616
+EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
+EBUILD tails-installer-4.4.8.ebuild 1160 BLAKE2B 3eb26826d2ac9201bec0e8137effa1e3eff9e8f2b2d79a32f7c928768bfe51125181fb224e5c5e684717dcc0852f2705289d248bfc59da318cb833abade1fb12 SHA512 a8a7bcea7e1ffad14b6f11eb11024a3cbc3204043689cf8928201dd011bbd9d38a956914c16619c87c6a7126e2792269ccd4b951a672f3b79eede598e0b1600a
 MISC metadata.xml 398 BLAKE2B 89d09e8e687f1b78c7b57002ac5033c4f39e22b82b856487f31db3e7e5a2bc1786f416970e0f35c95bdabc3b8025326a4f85618b6891f14bcfd7881ac016e8d0 SHA512 6871f9133b0f24777a9046d0a5d51f2191a0b36bf1532d6e2d560df1e786940da997ec0cdfe59b45236e5650c907a2e7f1ebc4e7949de3dbea373db60edf3767
diff --git a/app-misc/tails-installer/tails-installer-4.4.11.ebuild b/app-misc/tails-installer/tails-installer-4.4.11.ebuild
index 19426c959275..e67daaeac16f 100644
--- a/app-misc/tails-installer/tails-installer-4.4.11.ebuild
+++ b/app-misc/tails-installer/tails-installer-4.4.11.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,8 +9,8 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org http://git.tails.boum.org/liveusb-creator"
-SRC_URI="http://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
+SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/app-misc/tails-installer/tails-installer-4.4.8.ebuild b/app-misc/tails-installer/tails-installer-4.4.8.ebuild
index 2c3bb2dc3688..95febfb28b2b 100644
--- a/app-misc/tails-installer/tails-installer-4.4.8.ebuild
+++ b/app-misc/tails-installer/tails-installer-4.4.8.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
@@ -9,8 +9,8 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org http://git.tails.boum.org/liveusb-creator"
-SRC_URI="http://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
+SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"