diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-05-29 22:34:15 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-05-29 22:34:15 +0000 |
| commit | 61b3a6bc1c1b99f488afc988b84d78d436f2edca (patch) | |
| tree | a5ee639575a7dfa03f1ba32c714cf528213b88b4 /dev-java/jrobin | |
| parent | Workaround gcc-4.8 AVX bug #501386 by Thomas Capricelli and friends. (diff) | |
| download | gentoo-2-61b3a6bc1c1b99f488afc988b84d78d436f2edca.tar.gz gentoo-2-61b3a6bc1c1b99f488afc988b84d78d436f2edca.tar.bz2 gentoo-2-61b3a6bc1c1b99f488afc988b84d78d436f2edca.zip | |
Install rrdtool wrapper as jrobin-rrdtool to avoid conflicting with
net-analyzer/rrdtool. Closes bug #550522.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'dev-java/jrobin')
| -rw-r--r-- | dev-java/jrobin/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/jrobin/jrobin-1.6.0-r1.ebuild (renamed from dev-java/jrobin/jrobin-1.6.0.ebuild) | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-java/jrobin/ChangeLog b/dev-java/jrobin/ChangeLog index a072fdaab270..0390cffb5fc1 100644 --- a/dev-java/jrobin/ChangeLog +++ b/dev-java/jrobin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jrobin # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/ChangeLog,v 1.5 2015/05/25 20:58:14 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/ChangeLog,v 1.6 2015/05/29 22:34:15 chewi Exp $ + +*jrobin-1.6.0-r1 (29 May 2015) + + 29 May 2015; James Le Cuirot <chewi@gentoo.org> +jrobin-1.6.0-r1.ebuild, + -jrobin-1.6.0.ebuild: + Install rrdtool wrapper as jrobin-rrdtool to avoid conflicting with net- + analyzer/rrdtool. Closes bug #550522. *jrobin-1.6.0 (25 May 2015) diff --git a/dev-java/jrobin/jrobin-1.6.0.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild index 860f7486d70a..b7d757227a82 100644 --- a/dev-java/jrobin/jrobin-1.6.0.ebuild +++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/jrobin-1.6.0.ebuild,v 1.1 2015/05/25 20:58:14 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/jrobin-1.6.0-r1.ebuild,v 1.1 2015/05/29 22:34:15 chewi Exp $ EAPI="5" @@ -44,7 +44,7 @@ src_compile() { src_install() { java-pkg-simple_src_install - java-pkg_dolauncher rrdtool --main org.jrobin.cmd.RrdCommander + java-pkg_dolauncher "${PN}-rrdtool" --main org.jrobin.cmd.RrdCommander } src_test() { @@ -58,3 +58,8 @@ src_test() { ejavac -cp "${CP}" -d . $(find * -name "*.java") ejunit4 -classpath "${CP}" ${TESTS} } + +pkg_postinst() { + elog "The rrdtool executable has been installed as ${PN}-rrdtool to" + elog "avoid conflicting with net-analyzer/rrdtool." +} |