summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-04-27 13:10:56 +0000
committerVlastimil Babka <caster@gentoo.org>2010-04-27 13:10:56 +0000
commitdc4245876eebef7c4839da61748efd6b2313818e (patch)
tree737272b44a95e8dc0780c89d855bff3e34f831e7 /app-benchmarks
parentRemove old testing (diff)
downloadgentoo-2-dc4245876eebef7c4839da61748efd6b2313818e.tar.gz
gentoo-2-dc4245876eebef7c4839da61748efd6b2313818e.tar.bz2
gentoo-2-dc4245876eebef7c4839da61748efd6b2313818e.zip
Revbump to fix USE=acct, bug #317451 thanks to Christian Ruppert <idl0r@gentoo.org>. Update postinst message for genkernel case, bug #275251. Move to EAPI=2 and improve usage of java eclasses. Add maintainer-needed to metadata, as java is only optional here and a dedicated maintainer would be better.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/bootchart/ChangeLog15
-rw-r--r--app-benchmarks/bootchart/bootchart-0.9-r2.ebuild8
-rw-r--r--app-benchmarks/bootchart/bootchart-0.9-r3.ebuild6
-rw-r--r--app-benchmarks/bootchart/bootchart-0.9-r4.ebuild128
-rw-r--r--app-benchmarks/bootchart/files/accton.patch11
-rw-r--r--app-benchmarks/bootchart/metadata.xml5
6 files changed, 166 insertions, 7 deletions
diff --git a/app-benchmarks/bootchart/ChangeLog b/app-benchmarks/bootchart/ChangeLog
index f623983df3bb..0e0ab7d0f94c 100644
--- a/app-benchmarks/bootchart/ChangeLog
+++ b/app-benchmarks/bootchart/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for app-benchmarks/bootchart
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/ChangeLog,v 1.13 2009/10/12 19:00:52 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/ChangeLog,v 1.14 2010/04/27 13:10:55 caster Exp $
+
+*bootchart-0.9-r4 (27 Apr 2010)
+
+ 27 Apr 2010; Vlastimil Babka <caster@gentoo.org> bootchart-0.9-r2.ebuild,
+ bootchart-0.9-r3.ebuild, +bootchart-0.9-r4.ebuild, +files/accton.patch,
+ metadata.xml:
+ Revbump to fix USE=acct, bug #317451 thanks to Christian Ruppert
+ <idl0r@gentoo.org>. Update postinst message for genkernel case, bug
+ #275251. Move to EAPI=2 and improve usage of java eclasses. Add
+ maintainer-needed to metadata, as java is only optional here and a
+ dedicated maintainer would be better.
12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> bootchart-0.9-r2.ebuild:
QA fixes; remove useless dodoc COPYING
diff --git a/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild b/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild
index 34e573ccd8f9..cb81d5aa48b4 100644
--- a/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild
+++ b/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild,v 1.5 2009/10/12 19:00:52 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild,v 1.6 2010/04/27 13:10:55 caster Exp $
inherit multilib eutils java-pkg-opt-2 java-ant-2
@@ -100,7 +100,9 @@ pkg_postinst() {
else
elog "To generate the chart, append this to your kernel commandline"
elog " init=/sbin/bootchartd"
- elog "and reboot"
+ elog "and reboot."
+ elog "Note: genkernel users should replace init= with real_init= in the above"
+ elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
fi
elog
diff --git a/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild b/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild
index 5186d21a82f6..c0e960633efe 100644
--- a/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild
+++ b/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild,v 1.1 2009/03/10 11:55:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild,v 1.2 2010/04/27 13:10:55 caster Exp $
inherit multilib eutils java-pkg-opt-2 java-ant-2
@@ -102,6 +102,8 @@ pkg_postinst() {
elog "To generate the chart, append this to your kernel commandline"
elog " init=/sbin/bootchartd"
elog "and reboot"
+ elog "Note: genkernel users should replace init= with real_init= in the above"
+ elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
fi
elog
diff --git a/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild b/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild
new file mode 100644
index 000000000000..a30509b3bb3f
--- /dev/null
+++ b/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild,v 1.1 2010/04/27 13:10:55 caster Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit multilib eutils java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="http://www.bootchart.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acct debug doc java"
+
+DEPEND="
+ java? (
+ >=virtual/jdk-1.4
+ dev-java/commons-cli
+ )
+"
+RDEPEND="
+ java? (
+ >=virtual/jre-1.4
+ dev-java/commons-cli
+ )
+ acct? ( sys-process/acct )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}"-gentoo.patch
+ epatch "${FILESDIR}/${P}"-sh.patch
+ epatch "${FILESDIR}/${P}"-dev-null.patch
+ # bug #317451
+ epatch "${FILESDIR}/accton.patch"
+
+ # delete the included commons-cli and use gentoo's instead
+ # The rest of lib is also bundled but a bit problematic to
+ # package https://bugs.gentoo.org/show_bug.cgi?id=162788
+ rm -rf lib/org/apache/commons/cli lib/org/apache/commons/lang
+
+ if use java ; then
+ java-ant_rewrite-classpath
+ sed -i -e 's,AUTO_RENDER="no",AUTO_RENDER="yes",g' \
+ script/bootchartd.conf || die
+ fi
+
+ if use acct ; then
+ sed -i -e 's,PROCESS_ACCOUNTING="no",PROCESS_ACCOUNTING="yes",g' \
+ script/bootchartd.conf || die
+ fi
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_compile() {
+ if use java ; then
+ local antflags="jar -Dcompiler.nowarn=true $(use_doc)"
+ use debug || antflags="${antflags} -Dbuild.debug=false"
+ eant ${antflags} \
+ -Dgentoo.classpath="$(java-pkg_getjars commons-cli-1):./build"
+ fi
+}
+
+src_install() {
+ dodoc README README.logger ChangeLog TODO || die
+
+ # No need for this with baselayout-2
+ if has_version "<sys-apps/baselayout-2"; then
+ insinto /$(get_libdir)/rcscripts/addons
+ doins "${FILESDIR}"/profiling-functions.sh || die
+ fi
+
+ into /
+ newsbin script/bootchartd bootchartd || die
+ into /usr
+
+ # This dir is normally empty, but is used to bind to the
+ # temporary dir bootchart normally makes. We do this so
+ # that our profiling script can write to a fixed location.
+ keepdir /lib/bootchart
+
+ insinto /etc
+ doins script/bootchartd.conf || die
+
+ if use java ; then
+ java-pkg_dojar "${PN}.jar"
+ use doc && java-pkg_dojavadoc javadoc/api
+ use source && java-pkg_dosrc src/org
+ java-pkg_dolauncher ${PN} \
+ --main org.bootchart.Main \
+ --java_args "-Djava.awt.headless=true"
+ fi
+}
+
+pkg_postinst() {
+ if has_version "<sys-apps/baselayout-2"; then
+ elog "To generate the chart, set RC_USE_BOOTCHART=\"yes\""
+ elog "in /etc/conf.d/rc and reboot"
+ else
+ elog "To generate the chart, append this to your kernel commandline"
+ elog " init=/sbin/bootchartd"
+ elog "and reboot"
+ elog "Note: genkernel users should replace init= with real_init= in the above"
+ elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
+ fi
+ elog
+
+ if use java; then
+ elog "The chart will be saved as /var/log/bootchart.png"
+ else
+ elog "Post the file /var/log/bootchart.tgz here:"
+ elog " http://www.bootchart.org/download.html"
+ elog "to render the chart"
+ fi
+
+ elog
+ elog "For best results: "
+ elog " Enable BSD process accounting v3 in the kernel"
+ elog " This will produce more accurate process trees"
+ elog " Set AUTO_RENDER_FORMAT to svg in /etc/bootchartd.conf"
+ elog " and view /var/log/bootchart.svgz with batik or"
+ elog " Adobe SVG viewer. This will give you additional"
+ elog " information about the processes in tooltips"
+}
diff --git a/app-benchmarks/bootchart/files/accton.patch b/app-benchmarks/bootchart/files/accton.patch
new file mode 100644
index 000000000000..913507964e1b
--- /dev/null
+++ b/app-benchmarks/bootchart/files/accton.patch
@@ -0,0 +1,11 @@
+--- ./script/bootchartd.old 2010-04-27 12:42:10.182669159 +0200
++++ ./script/bootchartd 2010-04-27 12:42:30.276764465 +0200
+@@ -154,7 +154,7 @@ stop()
+ # Stop process accounting if configured
+ local pacct=
+ if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
+- accton
++ accton off
+ pacct=kernel_pacct
+ fi
+
diff --git a/app-benchmarks/bootchart/metadata.xml b/app-benchmarks/bootchart/metadata.xml
index 032ec6cab210..32b8bf3a5ec3 100644
--- a/app-benchmarks/bootchart/metadata.xml
+++ b/app-benchmarks/bootchart/metadata.xml
@@ -2,6 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ <description>Java is just optional in this package. A dedicated maintainer would be preferable.</description>
+ </maintainer>
<longdescription lang="en">
Performance analysis and visualization of the system boot process.
</longdescription>