gentoo resync : 15.01.2020

3 files changed, 3 insertions, 84 deletions

diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index 7719bf064865..aca310994141 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,7 +1,5 @@
 AUX bootchart2-0.14.7-sysmacros.patch 898 BLAKE2B 8529bdfc1a4e554a87673113b91e4a15e2b2f7efe8090eaa0de1b13cfe296cfe74c29f0bd90f05bb4853dd5ef12aff4dc576252004c7977d30e6b2e41592cd52 SHA512 60f703d29e133817439dcbaf7b59d51ae63e98c8fc03ff860f588c6ef3e3aa422c3c5132faf456dde3198f5c02afea9fbdeae43701e4af15de29155fb677dc0a
 AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
-DIST bootchart2-0.14.7.tar.gz 1175145 BLAKE2B dfe56572eb2f85b68e0ad871c939ef16c48b0ee11ca881f03914d6773b86050091b232d80706f0df1d094c2e069c252609a0266d1cfa5159a6a0916321ea1dcf SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541
 DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
-EBUILD bootchart2-0.14.7-r1.ebuild 1926 BLAKE2B 0c27ff152fd97960e84022a8489e4b34f402c86a3574cbf54bdbe4de55a1cabdf53a913a6f691ffe6cfec2cd7f1977e86713f57e899e985ff0691bbd42540604 SHA512 b36e58b69de89ceb2c69be227c8e982731443f76b53b2d53d3163e17dd7166d112d7e73dd950f21662c228e0fa32910f8d71c1fb77287439c9615d158248b2c5
-EBUILD bootchart2-0.14.8.ebuild 1939 BLAKE2B 2b149eb86c5ec8b4738f16b3280f856d2663b634b469d5d684183133999d9748fd4a5aed0b77cc26f77e5aed97a7bc9aacc6ae02ea6438e3a8f3146be1a121a3 SHA512 7ced0bd55f4ceccb87704559fc158d6ac5014e930dd1b2d4581776b78e7bd1707f2d68f13927e86f739af5ce0525044f8dd639665592a9aa3babd373700ac170
+EBUILD bootchart2-0.14.8.ebuild 1935 BLAKE2B 90ba86befeecec23552cc7d61155d07029ad9305e84541b1bb2fdd4d387892458aba2be976c2ada8930b5baa96124ea0241a0471ad066a180f9830381941c2bf SHA512 b27e62f18f3ebec481acd0d8b43abe1b1d47dcac1f4403ae3f4742188fa2e531a4d583ec9556f087d72b9175e4b258f45c733e236af4e992377bc7381d165462
 MISC metadata.xml 304 BLAKE2B 171fff1d72aaecb2e11f9d712aae9b40aba252d315f63184036d3757a92843f3e898b7e723b617014bca29b95f928a720ec7115a564766704514e8bc5b826e4a SHA512 a32bf175ccbaf61207413ae249aa66e72c7704abc0e1c41e9a6eb5fbbc21ea143f45588490ef53bbc8a5ffa0145880de87308ed33df9354a1433016f6540f46e
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
deleted file mode 100644
index e9a732d78843..000000000000
--- a/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit linux-info python-r1 systemd toolchain-funcs
-
-DESCRIPTION="Performance analysis and visualization of the system boot process"
-HOMEPAGE="https://github.com/mmeeks/bootchart/"
-SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="svg test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	X? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X )"
-
-RDEPEND="
-	!app-benchmarks/bootchart
-	X? (
-		dev-python/pycairo[svg(+)?,${PYTHON_USEDEP}]
-		dev-python/pygtk[$(python_gen_usedep 'python2*')]
-		${PYTHON_DEPS}
-		)
-	sys-apps/lsb-release"
-DEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}"/${PN%2}-${PV}
-
-CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #579922
-	tc-export CC
-	sed \
-		-e "/^install/s:py-install-compile::g" \
-		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
-		-i Makefile || die
-	sed \
-		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
-		-i bootchartd.conf bootchartd.in || die
-}
-
-src_test() {
-	python_foreach_impl emake test
-}
-
-src_install() {
-	export DOCDIR=/usr/share/doc/${PF}
-	default
-
-	# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
-	# just change it. Since no libraries are installed, /lib is fine.
-	keepdir /lib/bootchart/tmpfs
-
-	installation() {
-		python_domodule pybootchartgui
-
-		python_newscript pybootchartgui.py pybootchartgui
-	}
-	use X && python_foreach_impl installation
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-}
-
-pkg_postinst() {
-	elog "If you are using an initrd during boot"
-	echo
-	elog "please add the init script to your default runlevel"
-	elog "rc-update add bootchart2 default"
-	echo
-}
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
index b1bd77ccf8fb..9795de0b3bfe 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit linux-info python-r1 systemd toolchain-funcs