bootchart2: upgraded package to upstream
Upgraded app-benchmarks/bootchart2 to version 0.14.8-r1 on amd64
BUG=chromium:1111336
TEST=CQ-passes
Change-Id: I87822b499839e2bfb3f84aa752549ea5e39b5eca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2328826
Tested-by: Allen Webb <allenwebb@google.com>
Auto-Submit: Allen Webb <allenwebb@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index b9252d7..34f275c 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1 +1 @@
-DIST bootchart2-0.14.8.tar.gz 1175527 SHA256 1f057d0590fceedf2732461785d9c6669d4b42cfd0c470d93cdf106749969c8b SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0 WHIRLPOOL e0e45366002d7aaf6f13e37f69fb4df889de3b93ac89f52dd4cca1a4e5a321e789fdc18edf8dedbd36bccaadef2d4c009c5627a4203e1281c85da993c5db1fcd
+DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
similarity index 61%
rename from app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
rename to app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
index a5c30ac..ea25ede 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-2018 Gentoo Foundation
+# 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_{4,5,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,42 +12,34 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="*"
-IUSE="svg test X"
-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
@@ -58,21 +48,11 @@
# 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 0000000..261e821
--- /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)
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
deleted file mode 100644
index 05a03cd..0000000
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig
-DESCRIPTION=Performance analysis and visualization of the system boot process
-EAPI=5
-HOMEPAGE=https://github.com/mmeeks/bootchart/
-IUSE=svg test X kernel_linux python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) sys-apps/lsb-release
-REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_6 ) ) test? ( X )
-SLOT=0
-SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
-_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 eutils 06133990e861be0fe60c2b428fd025d9 linux-info 327865b9921771330775d971263dc234 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 931c328767d245c08a16a3f87be9ce9c systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a4fafb1d6848ebc1bf9f03049605d3c4
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
new file mode 100644
index 0000000..3925c61
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Performance analysis and visualization of the system boot process
+EAPI=7
+HOMEPAGE=https://github.com/mmeeks/bootchart/
+IUSE=kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=!app-benchmarks/bootchart sys-apps/lsb-release
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
+_eclasses_=linux-info 327865b9921771330775d971263dc234 multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=228e96aa650c2f02b3aaa80a664ff20a
