summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2013-10-02 22:29:35 +0000
committerMatthew Marlowe <mattm@gentoo.org>2013-10-02 22:29:35 +0000
commitb8691d763b092de3f3cabd14f617b92db2e3b06a (patch)
tree7e04662d6fc7d15855a74bf8c822f5a7dfafac4b /net-analyzer
parentFixed trailing whitespace; maybe I need to make repoman bail out on warnings,... (diff)
downloadgentoo-2-b8691d763b092de3f3cabd14f617b92db2e3b06a.tar.gz
gentoo-2-b8691d763b092de3f3cabd14f617b92db2e3b06a.tar.bz2
gentoo-2-b8691d763b092de3f3cabd14f617b92db2e3b06a.zip
Added MY_PV bash variable to deal with _rc1 version numbers impacting naming of java jar files.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/zabbix/ChangeLog9
-rw-r--r--net-analyzer/zabbix/zabbix-2.0.9_rc1-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-2.0.9_rc1.ebuild)5
2 files changed, 11 insertions, 3 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 52a54dc8102b..cff1a486a474 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/zabbix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.132 2013/10/02 20:13:21 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.133 2013/10/02 22:29:35 mattm Exp $
+
+*zabbix-2.0.9_rc1-r1 (02 Oct 2013)
+
+ 02 Oct 2013; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.0.9_rc1-r1.ebuild,
+ -zabbix-2.0.9_rc1.ebuild:
+ Added MY_PV bash variable to deal with _rc1 version numbers impacting naming
+ of java jar files.
*zabbix-2.0.9_rc1 (02 Oct 2013)
diff --git a/net-analyzer/zabbix/zabbix-2.0.9_rc1.ebuild b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r1.ebuild
index 0f52bc34617b..898cab5b4f49 100644
--- a/net-analyzer/zabbix/zabbix-2.0.9_rc1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1.ebuild,v 1.1 2013/10/02 20:13:21 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1-r1.ebuild,v 1.1 2013/10/02 22:29:35 mattm Exp $
EAPI="5"
@@ -11,6 +11,7 @@ inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-f
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
HOMEPAGE="http://www.zabbix.com/"
MY_P=${P/_/}
+MY_PV=${PV/_/}
SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -370,7 +371,7 @@ src_install() {
/${ZABBIXJAVA_BASE}/lib
keepdir /${ZABBIXJAVA_BASE}
exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${PV}.jar
+ doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
exeinto /${ZABBIXJAVA_BASE}/lib
doexe \
src/zabbix_java/lib/logback-classic-0.9.27.jar \