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.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 172 insertions, 21 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/Manifest b/app-benchmarks/bootchart/Manifest
index be039af2ad97..489860f362e0 100644
--- a/app-benchmarks/bootchart/Manifest
+++ b/app-benchmarks/bootchart/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX accton.patch 306 RMD160 5d9290a1db5edf3be0cc847485d173fad5903cb5 SHA1 2e5c064a513453cd1b759f90adc80218e1fd53ae SHA256 86cdc046f57c920298ea35120d5f47a64ea60060fe4a085fa4051b943a37a781
 AUX bootchart 158 RMD160 5729364e885d6f77ef67071edf24d23fc00ac9c0 SHA1 00c2bce14f62613e94ada34fc6df673a6457c748 SHA256 1e6dacfd95dc35808bce726a2a8517650095b4a6e7026d75de9a9eb3a2d7f898
 AUX bootchart-0.9-dev-null.patch 1171 RMD160 6f30f04169e9dc00ba01075d2b2373fc980abebc SHA1 fb327a52a459578a17d0754a02873ec228802070 SHA256 7d682b4038076b6f7f2b79791b586377a334efc96fd5597a628e339c334e4b31
 AUX bootchart-0.9-gentoo.patch 1409 RMD160 521904d9bdc04be31236bc27496d1ca55420f576 SHA1 4f9e4d38a4f9e96a609d386111e33ff07913b3fe SHA256 f629a2607763dc9a0b0c9238814d58c9f4359bde6477dedb198652bbd814cd71
 AUX bootchart-0.9-sh.patch 388 RMD160 dc99dca5e64adb27cbc1b1eb871a7393ac5708d9 SHA1 e80c6073d4e33e43a702500831c56f22ed174ef8 SHA256 a1b0b6154760c0cce10fde3a13e5a089bab0526a7aac3ed52ccbb09c4ad66dbf
 AUX profiling-functions.sh 1834 RMD160 d1b0b3c695b0f0aa8882af834d7703eb54cdfc15 SHA1 d81a72e9979a232a8d3bae81072575804f4ca39e SHA256 399f831b6fb0421c8e9f3f8fcbf2e240281145e6c061a84031a6f073a06dd7e8
 DIST bootchart-0.9.tar.bz2 222558 RMD160 c271bf634117c9bcd530055927abffead134b73a SHA1 3e74e4844e0616c5c6514f8152262638f36d72ac SHA256 7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
-EBUILD bootchart-0.9-r2.ebuild 3310 RMD160 0a92d0ef18e418b25cb841fa315979d1e35ae6a7 SHA1 7c79e10a0aed1f22a63f50ff5af8a8c7ff5ab1ca SHA256 f54f39a68b7c0a233b4d1992ef5843643cbbcfb4e24c8368c67c00204e0678ee
-EBUILD bootchart-0.9-r3.ebuild 3352 RMD160 b29125f4586070a95339f3810588e2043f5d0bbb SHA1 d52f06466fb435e3d8e11e003d0b36bbaf8e2117 SHA256 10d89b8bddfd2c04b7b5b22a0b2047433906fc0a3bc088ec439f5cf33479cb59
-MISC ChangeLog 2300 RMD160 d170d361589b97c8cc5b35d7a76dbd99609396cf SHA1 63ade1b82aed73f737510066c5897b26daced9e7 SHA256 bf4db81edc98e652a9b90941a70f996d55221c59fe28c92a7ed75210f7d2048d
-MISC metadata.xml 344 RMD160 59d9e188e23c88dd49c8e8c0c3b668014f0e2737 SHA1 e16bd56f387a7a5d78dc4247aae0cd2f1f7c8993 SHA256 153f74bdfe02fdd580fa2ef431ba7393e3ff71c1184d7da16b56aa4ecc73295c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrTfOoACgkQCRZPokWLroT80QCgtuhMr02clOgkF7uyMLiZtQhK
-qTQAnjfPh1LnZbl/MO7vPERvDMjJbGKk
-=nGMy
------END PGP SIGNATURE-----
+EBUILD bootchart-0.9-r2.ebuild 3465 RMD160 818a7a8bc409d027986e72db14b83b32189fca97 SHA1 e0354d53e08182fe22b3eeb78431d36d096ac6ed SHA256 4d5869dbaa367ae435ea847d0d3c1c27a314901b713029948e558c93efcc2676
+EBUILD bootchart-0.9-r3.ebuild 3509 RMD160 0a3c2604f122d43e991820bad22ffec4a3452b0d SHA1 189f62ce571e2834c467d86cbc6084905c06efcc SHA256 d1c0ed230cd9532f3724035085d14de089b065387181947712a41d54f424b0f2
+EBUILD bootchart-0.9-r4.ebuild 3579 RMD160 c605b4a99d997acfa453b27c913297f907cfb8e7 SHA1 dfdab82f344d8380126f55e50bdbc3ce7c7e8d17 SHA256 2561985db43308e9a8b5c9c281b555a333534df72ec791949d8e1c7491c21a57
+MISC ChangeLog 2811 RMD160 29993c817fe5b10ba084e3b1a13196ada62f3b93 SHA1 f7c0a94c3def8edeb4c634f1e3f0cfa2be552ae6 SHA256 06e739e8e9f688f73dee4b85b1333d93952fcb6c01942069dd072672a64e32f5
+MISC metadata.xml 585 RMD160 922fd30cfb57f3b42c2bfb58c541836215c49b48 SHA1 f78e343f0c3a7c45a534379af0e6ce5b9cc0770d SHA256 20075bfe2d099ae2ff374f3a055678ea63f070efdd75f5848ebda0d656607db7
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>