gentoo resync : 11.05.2018

16 files changed, 86 insertions, 317 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7a31ac2a6f0b..3d9ab34f89b3 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 5424584a729a..906b6b534ed7 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,13 +1,6 @@
-AUX elogviewer-0.6.2-missing_newline.patch 806 BLAKE2B 9d2cb63fd3007d274c6ae744558553fac2502fc36e5ff8c2e513545005e80a760cb8066cde678bf1c5c5a7884a38bace368f954027de41255870b09f3c7e01a1 SHA512 e2e335f679cfd8850c9797f1233464b44abc9939f48ab218aae94e072c597a10a1814411f7453d01ef39c79382d5904c48efa12b9eecb6282d3cb9fde3a54968
-DIST elogviewer-0.6.2.tar.gz 13904 BLAKE2B 9612fafd14e1561a1172fa45aa44a3dda19ccb74ce56b8dfa6f8e6cd2103c80a34e278a3ea788a26b64da0d8deeb6b2b7cfdeb73cbc1d791629ce40e7bbfc4bd SHA512 dccf4dffb87fefb7d9e0609b3312d63b73c1b9c5933819c38b775b049e222687e9da06e63fe8194560f4bb631fa586b4746af9e0a7575eefa782b57d9c1c6e04
-DIST elogviewer-2.1.tar.gz 14968 BLAKE2B 027ed77deafa3646c2d20e9f7f048d723178ccef84d07839c814e10ab9047ff997917cc5704d73a48a4b56da8f93bebb46c6701ca985c10c5240550e4dcf607c SHA512 27a34ce67e16a51055246b7169c11c248310b2a1d987018938094301b2602839e48909e3224f7d791343bb691de8e2f0ca7b00bd1477e2b3b43d61a24b4e688f
-DIST elogviewer-2.6.tar.gz 16093 BLAKE2B 9b8b22e6e2ae772d2051a528867b139d33557279ab8349270afd497031599cbec27313287cda4cfa48529973672e4dbd28e4e51f29b1922380ece30980ae3279 SHA512 1ca43c0ddc7dcab6a9e753644866b0a8ec8ddb5a56d2b8a25ab06f9ee1fc759910ef7af6257c3c98b886700121f078409931aada67b2aad03a43f440a0b8f233
 DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
-EBUILD elogviewer-0.6.2-r3.ebuild 1627 BLAKE2B bd5ff2629f94674607bbcded8840dbaf2cda744474460ec074dae2c5657534f6113da66bfb1af6f0d226c007d1698cb251e6f2021ecb58dec092ce7a5a0d88d1 SHA512 37f1e3c1251bbb2b7dd8e192bf8d64316836f88c77e1f890b42116bca24ea98d0a4f9768e345958a08f0f4e3742c716e6998cc71e261c4888974e1f07cae8e3d
-EBUILD elogviewer-2.1-r1.ebuild 1343 BLAKE2B 8e937c6a85a738a36971cdcce87ba5288f0d02e084b15be64137dd3706a558333da6e9153b19e505e7aa19baf1bede4bf70613da250f4f2548506ef1324bb37a SHA512 2db28fda43a17633e0bccc7a73c8e52d4083c7cbf6999308373d2495f67b3686ac14b5b1972c41764e503223891a26ad801dd0f212fc1cc4662f067445d0250e
-EBUILD elogviewer-2.1-r2.ebuild 1349 BLAKE2B b39d72b182768ddd0f2b1feb283af288227d4a8eb065628fa9497bb421d80b1a0ef92be47c1db840c04cb42367b3c95d426f303f1f4cb3c7f97552f553a6c8bd SHA512 bf1fbfd6b012dd6c0e1f9ea31b6356098219cfd15373bf4b4471b785fc67f40c13850cd1735119898b5ea60e23dee0f7e8f8db3ff3f93138012dfcd9bbb50583
-EBUILD elogviewer-2.6-r1.ebuild 1511 BLAKE2B 099a4423d6fd1ae1b9cc9b39cfc74c7121c4058a55753ce7671cf5f3d0120c6611e7ccfa510fc587d2a5aa04c584ed021400e33c7e6dff05ed2eb2ac2f99a0fc SHA512 5996ca563a74e8ec679c0e4ea87821d4b0bbbabeba6c32a51a8bc5b2c360e53dcbd419b2422a8852b628b8f720f9083476c2e8d4e4a2c34ddb060095630a96bf
-EBUILD elogviewer-2.6-r2.ebuild 1569 BLAKE2B e0bb5b2ca7bf6e04ff9adb6f611bbd4cebd6487c34803c6df2f3d85d2a61c694c0ac6b3907fb96bbe3d793490bc3d1e50f4fd1af3147f433755f421b279540b8 SHA512 9a05aad3e028ed993283c0bb9dbef9b517f0f7b58d4c85b955404b75253677b916d91b8a28a3c8b566f153c680d0f72ccb72daa101fe9c29681a6d5b7adbad5a
-EBUILD elogviewer-2.6.ebuild 1457 BLAKE2B a70315579271f03b824747f6a2590cdbe113bae593910e215a1cb9750ee9ac9ee01bb43ff96fe22345fa7a9b2e66e741c3ea5b5dd5edf7b335d70dfb4ac669b5 SHA512 1914a17e6a2dbb062b3b15c051e32be7d4c03d46243d359d192af79f0496354ef0ade2af62ac4dba01624f0f379fcb7c0c03d9f7af83669b029f81e79ba600e9
+DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 EBUILD elogviewer-2.7-r1.ebuild 1903 BLAKE2B ba1d44a2d319b8c1286e94d521e6a15da9a56e74acdb4f7fab110c63085d79708c82f0fa77ba262a48ffc62f6908167f43b019141d47be1af593195f6912096c SHA512 884642f815e018d5eb0fc5c323ff0fd7d71ab7f2f00670694cc71661f38147ca0f88bc793326ccf0c5f86a8f7a3c459fdb2c5f6340015cc113c540e9760862fa
-MISC metadata.xml 509 BLAKE2B 3a84f5b5dafc1666c58c34666742f4e67bf969d7e0b4b166bddb32b7254d3b4e5257730541438746071f2a8c1a9e057ac0b5977e32695c6a96a76b661cd84d2d SHA512 2fc82898f7f2968181f8ea2cbcb3ad34327f4849e6060ab818c4d4d9bf58a8515027e74dc6034dd1016e12c0df7fb84d0c234235880ee547a5ae3fac9a09e1b3
+EBUILD elogviewer-2.7-r2.ebuild 1756 BLAKE2B 1fbea8d206ac31e9a056ed564982f02ffc3384a451a1046c05ca5d2f24184cf436e9e2deb3e71215dc8d3603bc393c1e18d11b090f613826be4f9987b5d29e4e SHA512 c4eef83e6bb2c089d286319ec77f658d8dc4d53950119b6f78b30035c44a3cdb34e6891f09663ee0e5a9ee7605378d8fe8f13650a91bd2597976e03a07afc280
+EBUILD elogviewer-2.9.ebuild 1758 BLAKE2B d60c2b09aeb6e0e9183c7b8832f106db1fc27b133b1c4c1e8a00301dd137eb82dd51b6a8785281452ec2c2413c256753146aafad792ccfcdca8c779e51975770 SHA512 a70da5046befbc695344d61f3173fcc28284e45592deb2a027bb93b798d630a06c6e762f028efc35f2d233022ea2758c3ca31fdf4801b7247054925e6c86d87c
+MISC metadata.xml 508 BLAKE2B 4414a5567ae33626032ceec6a059d7547bf8f2b69bc561b08e7ce60817194cd646813e0d3d0debc88ca10b85933ecbbdf954cbfe4d6b4194499e866ce54d7271 SHA512 bcea5d31473ddfb682d52f604f8eec6ec26938a30a62f7388e9b3be36d17a8f189ea97c418708b88949a6d48e10f6652feabbd247eeb9ef9132ce20916c41ec8
diff --git a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild b/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
deleted file mode 100644
index de0a0d95ee43..000000000000
--- a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GTK+ based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer/"
-
-SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=sys-apps/portage-2.1
-	>=dev-python/pygtk-2.0"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Apply patch from Bug 349071 to restore missing newline
-	epatch "${FILESDIR}/${P}-missing_newline.patch"
-	# Fix bug #453016
-	sed -e 's|is not ""|!= ""|' -i elogviewer || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript  "${WORKDIR}"/elogviewer
-	dodoc "${WORKDIR}"/CHANGELOG
-	doman "${WORKDIR}"/elogviewer.1
-	make_desktop_entry elogviewer Elogviewer "" "System" ||
-		die "Couldn't make desktop entry"
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
deleted file mode 100644
index 3d151f53b65d..000000000000
--- a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
-			dev-python/pyside[${PYTHON_USEDEP},X] )
-		>=sys-apps/portage-2.1
-		"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	dodoc LICENSE.TXT
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
deleted file mode 100644
index 53a2e8edd64d..000000000000
--- a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python{2_7,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
-			dev-python/pyside[${PYTHON_USEDEP},X] )
-		>=sys-apps/portage-2.1
-		"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	dodoc LICENSE.TXT
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
deleted file mode 100644
index e7579cce328c..000000000000
--- a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4})
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	!dev-python/PyQt5[-gui]
-	!dev-python/PyQt5[-widgets]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	make_desktop_entry ${PN} ${PN} ${PN} System
-	readme.gentoo_src_install
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
index 94b30a95ff5d..cad621a1469e 100644
--- a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 DISABLE_AUTOFORMATTING=true
 
@@ -11,24 +11,21 @@ inherit python-single-r1 eutils readme.gentoo-r1
 
 DESCRIPTION="Elog viewer for Gentoo"
 HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X]
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 	)
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	!dev-python/PyQt5[-gui]
-	!dev-python/PyQt5[-widgets]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -45,6 +42,10 @@ To operate properly this software needs the directory
 ${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
 To start the software as a user, add yourself to the portage group."
 
+src_compile() {
+	rm -f Makefile
+}
+
 src_install() {
 	python_newscript elogviewer.py elogviewer
 
@@ -56,4 +57,8 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
 }
diff --git a/app-portage/elogviewer/elogviewer-2.6.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
index c1e8197e554c..e007e8820641 100644
--- a/app-portage/elogviewer/elogviewer-2.6.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4})
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
 DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 eutils readme.gentoo
+
+inherit python-single-r1 eutils readme.gentoo-r1
 
 DESCRIPTION="Elog viewer for Gentoo"
 HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	"
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
@@ -39,10 +42,23 @@ To operate properly this software needs the directory
 ${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
 To start the software as a user, add yourself to the portage group."
 
+src_compile() {
+	rm -f Makefile
+}
+
 src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
+	python_newscript elogviewer.py elogviewer
+
 	make_desktop_entry ${PN} ${PN} ${PN} System
-	readme.gentoo_src_install
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
 }
diff --git a/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch b/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
deleted file mode 100644
index e7f3e79a6a93..000000000000
--- a/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Add missing newline and remove debug print statement
-
-https://bugs.gentoo.org/349071
-
---- elogviewer
-+++ elogviewer
-@@ -154,7 +154,7 @@
-                     and self.filters[section] == True:
-                     self.insert_with_tags(
-                         self.get_end_iter(),
--                        line,
-+                        line + '\n',
-                         self.get_tag_table().lookup(header))
-         finally:
-             file_obj.close()
-@@ -385,7 +385,6 @@
-         if len(split_filename) is 3:
-             (self._category, self._package, t) = split_filename
-         elif len(split_filename) is 2:
--            print split_filename
-             (self._category, self._package) = split_filename[0].split('/')
-             t = split_filename[1]
-         t = time.strptime(t, itime)
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
index 2ac6f8372519..7144a8404ae4 100644
--- a/app-portage/elogviewer/metadata.xml
+++ b/app-portage/elogviewer/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fuzzyray@gentoo.org</email>
-		<name>Paul Varner</name>
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 7f2db4aafdba..fe37798103c3 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,6 @@
 DIST gentoopm-0.2.9.tar.bz2 24652 BLAKE2B 1046d4cc5dca19d2cc72e8d8d54cd0d2172164aa5594666c89a4dde9dbd994654d07982a2381fa09038b29ebb011bdd410f60ac3c340bdbf533bcfc29f4c4796 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7
+DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
 EBUILD gentoopm-0.2.9-r1.ebuild 949 BLAKE2B cddba8cbec01872603134552283f1893df14f877a5a31d855ef74a93939b354a85e988856d9163878e85fe21da8a192ea1bc61bfa0db20962c9443a13d422f5a SHA512 47f12ad7c000b293e07e8baa9a309f82014604aa37961b81328b9102df7dd98ba1ba55744029362048eb79db27e162b7ce8c336a16e89f7cb5c370e14b14eeed
-EBUILD gentoopm-9999.ebuild 1096 BLAKE2B 0103075de6fa4557d8c877d7c7764534fe8470de7f3618266154119554db6dd7ded2ade13a6a4cdfa78c53fb06b8b8c7c7da31c05beadb1da78d89d33e5ac872 SHA512 683aa712825c855dd299811e2e87732b1f5bf79a0d68e121c5d53579a92a60da4ff3afb37307f8d46939e869c4da21251d5c8c9ad113def2aad7b64f2d9335bb
+EBUILD gentoopm-0.3.0.ebuild 766 BLAKE2B fda0b3d19493bd2e65b27d63add3cb319b74159a40afc234bb41f8500e376a0098454f616d99d711e5e7deb98980350ac7639d52c7d1d1f8c9c528baebaaf3b3 SHA512 480ba237ef5e55cebc04f74861510ca9c43e9dbc3aef879d080c7e75ed4b296c96859abb47e462bbc975070012be5d019a7b7e1c7332b9c4029a61d1a1eddca7
+EBUILD gentoopm-9999.ebuild 713 BLAKE2B 7f9e351e8bd066d2e04c03ec4e3863595455767a3f1b5338cd34d77bbf522afc5785db74b3d6786af789b50874b687df1cb16f60f5ae2597609d0259b40eda22 SHA512 79792fa49fcfeebc388f7627c9cfefe3ca334ba864901849980d28cd6a90b3eef31b35c385a012472abe248339e955158459e9e92cf2ca3ddc2237584b1d3198
 MISC metadata.xml 527 BLAKE2B cc7db429f639eefca32141b0b3936964330508679f87cf2c75e3c5dd86e24e25cb8628d51f4da728bff784af983ebb33ee64cd8e3becd953033f8b35bcfe7f13 SHA512 422137d02e652646b6e1cc176d4b5209dd7831dcd63eb1c47ce58105aee6648817cd79b67c8dcc1002cb97c53112b0ec75957821af0935275ee5125013c7ff2e
diff --git a/app-portage/gentoopm/gentoopm-0.3.0.ebuild b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
new file mode 100644
index 000000000000..305f093bd468
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index e9de24d57a0a..96a9ef4eacfc 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc"
+IUSE=""
 
 RDEPEND="
 	|| (
@@ -22,26 +22,8 @@ RDEPEND="
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
 		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
-DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )"
 PDEPEND="app-eselect/eselect-package-manager"
 
-REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
-
-src_configure() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-	distutils-r1_src_configure
-}
-
-python_compile_all() {
-	use doc && esetup.py doc
-}
-
 python_test() {
 	esetup.py test
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-portage/unsandbox/Manifest b/app-portage/unsandbox/Manifest
deleted file mode 100644
index d4bc05baac34..000000000000
--- a/app-portage/unsandbox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unsandbox-2.tar.gz 891 BLAKE2B 7daabf3f5ae0bdd1fcbc9c61a098c6752a84f7e1ea9053ff4317760a6140d84bae541b802f738d1c11316c336ed67ebdd1d802ca4af467a4558fe14a940967e8 SHA512 d669a7119e397434219c7a86a5d10caeb0099fed841a3264ba09ed45c206621baf3f98104d3b6ff8239a79306177d6ebe0305ab67ab472e739f722e1823ab2c6
-EBUILD unsandbox-2.ebuild 369 BLAKE2B 2b7df2bde09003d681c93eb2137448a694f00be0f00b2f60aa176247dabfaf57cd6d40b0ec47600c0b61c68f8c53610bec74e592f1689b9a9893a72425e5ad58 SHA512 ab24e87b520139ea49e611781a1f40a2160bf47da6060e350b4d0e05e42594b8f66569d41a02ca7ddc2d3069306b6b07d398ecea605f3128002b2b53a4302993
-MISC metadata.xml 328 BLAKE2B a5cffa25c3b0f9094e74a51c45f97b624c95b0d0461f1da1b8a237815b774e39359436a82959ec9c9669bde7f0b6c8d17835233c01eb2354f58607bb4259bead SHA512 800ada1895db6c4dd907d24e7400046c8c5d9b919310b3bd7f394ba368b1261fafd1140d175e20830e406282c4088c3304f70a506461fc1ea0c86a8a3e783961
diff --git a/app-portage/unsandbox/metadata.xml b/app-portage/unsandbox/metadata.xml
deleted file mode 100644
index 6a495dd36abf..000000000000
--- a/app-portage/unsandbox/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mgorny/unsandbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/unsandbox/unsandbox-2.ebuild b/app-portage/unsandbox/unsandbox-2.ebuild
deleted file mode 100644
index 41773bc4e617..000000000000
--- a/app-portage/unsandbox/unsandbox-2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="The Sandbox escapist tool"
-HOMEPAGE="https://github.com/mgorny/unsandbox"
-SRC_URI="https://github.com/mgorny/unsandbox/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""