gentoo resync : 14.05.2020

3 files changed, 27 insertions, 32 deletions

diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index aca310994141..f012a60f9126 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,5 +1,6 @@
 AUX bootchart2-0.14.7-sysmacros.patch 898 BLAKE2B 8529bdfc1a4e554a87673113b91e4a15e2b2f7efe8090eaa0de1b13cfe296cfe74c29f0bd90f05bb4853dd5ef12aff4dc576252004c7977d30e6b2e41592cd52 SHA512 60f703d29e133817439dcbaf7b59d51ae63e98c8fc03ff860f588c6ef3e3aa422c3c5132faf456dde3198f5c02afea9fbdeae43701e4af15de29155fb677dc0a
+AUX bootchart2-0.14.8-no-compressed-man.patch 802 BLAKE2B 0d09c6a2de65079c0c928e0b2617e5b493d0decbea9644f844752470942db09b199cea18be052a8160b3a59a8491f849e5bb2dc16b80c8e6f77a69b4bda1d30c SHA512 4e5c48a6a29bef5544f3ae491718531407d8ac47ae0439ccaa7dd0f7009e148437810f5d984a98b6623d9ea7bffbc514a31bd1c19ee57b8a17e02a2f5d2a7394
 AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
 DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
-EBUILD bootchart2-0.14.8.ebuild 1935 BLAKE2B 90ba86befeecec23552cc7d61155d07029ad9305e84541b1bb2fdd4d387892458aba2be976c2ada8930b5baa96124ea0241a0471ad066a180f9830381941c2bf SHA512 b27e62f18f3ebec481acd0d8b43abe1b1d47dcac1f4403ae3f4742188fa2e531a4d583ec9556f087d72b9175e4b258f45c733e236af4e992377bc7381d165462
+EBUILD bootchart2-0.14.8-r1.ebuild 1504 BLAKE2B 7e94059446d518143da9777071856eb4a6aa57be301c746ef6ff679bf7db27fead2aa7f6ff4fe4ab132f89628b6329d35221c6df19356fe33a2c85f8e09a9563 SHA512 aa90f3d8658f05e5be84b853e1aba550a713add56ee0cdc0e5af3367a435f2f46942dfa60c028febe75a760869f258900910dea7a49035c883a94e80077735ad
 MISC metadata.xml 304 BLAKE2B 171fff1d72aaecb2e11f9d712aae9b40aba252d315f63184036d3757a92843f3e898b7e723b617014bca29b95f928a720ec7115a564766704514e8bc5b826e4a SHA512 a32bf175ccbaf61207413ae249aa66e72c7704abc0e1c41e9a6eb5fbbc21ea143f45588490ef53bbc8a5ffa0145880de87308ed33df9354a1433016f6540f46e
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
index 9795de0b3bfe..6cb11cd3e6ea 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit linux-info python-r1 systemd toolchain-funcs
+inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="Performance analysis and visualization of the system boot process"
 HOMEPAGE="https://github.com/mmeeks/bootchart/"
@@ -14,43 +12,34 @@ SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 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 )"
+RESTRICT="test"
 
 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"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-sysmacros.patch # bug 579922
+	"${FILESDIR}"/${P}-no-compressed-man.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.14.7-sysmacros.patch #579922
+	default
 	tc-export CC
 	sed -i \
 		-e "/^install/s:py-install-compile::g" \
-		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
+		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_systemunitdir):g" \
 		Makefile || die
 	sed -i \
 		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
 		bootchartd.conf bootchartd.in || die
 }
 
-src_test() {
-	python_foreach_impl emake test
-}
-
 src_install() {
 	export DOCDIR=/usr/share/doc/${PF}
 	default
@@ -59,21 +48,11 @@ src_install() {
 	# 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/files/bootchart2-0.14.8-no-compressed-man.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.8-no-compressed-man.patch
new file mode 100644
index 000000000000..261e821a403e
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.8-no-compressed-man.patch
@@ -0,0 +1,15 @@
+--- a/Makefile	2015-12-17 09:12:57.000000000 +0100
++++ b/Makefile	2020-04-30 13:14:08.772369141 +0200
+@@ -107,9 +107,9 @@
+ 	install -m 644 -D README $(DESTDIR)$(DOCDIR)/README
+ 	install -m 644 -D README.pybootchart $(DESTDIR)$(DOCDIR)/README.pybootchart
+ 	mkdir -p $(DESTDIR)$(MANDIR)
+-	gzip -c bootchart2.1 > $(DESTDIR)$(MANDIR)/bootchart2.1.gz
+-	gzip -c bootchartd.1 > $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1.gz
+-	gzip -c pybootchartgui.1 > $(DESTDIR)$(MANDIR)/pybootchartgui.1.gz
++	install -m 644 bootchart2.1 $(DESTDIR)$(MANDIR)/bootchart2.1
++	install -m 644 bootchartd.1 $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1
++	install -m 644 pybootchartgui.1 $(DESTDIR)$(MANDIR)/pybootchartgui.1
+ 
+ install-service:
+ 	mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)