Added MY_PV bash variable to deal with _rc1 version numbers impacting naming of java jar files.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 20 insertions, 12 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/Manifest b/net-analyzer/zabbix/Manifest
index 4eb0d972f650..56a2a7f5b4ef 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -34,17 +34,17 @@ AUX zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c516
 DIST zabbix-2.0.8.tar.gz 13457936 SHA256 c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a SHA512 5a65c7fcce33d98a0f441798ca83f16bb6ed31b8a1b025f39c4003a0906c148ed5ff9db41aec591f053083b6bacd3ea1a1c8b96c007c44da092bfa179693e403 WHIRLPOOL 8ae2815014a28895689e8083f21e26f8c0afd7bb5f12a177f8487d563a889941e15db5991668c56a2dad62bf1060a77195057fea6283059a8c4dcd39ff709c05
 DIST zabbix-2.0.9rc1.tar.gz 13648577 SHA256 474ac3a0fb47a0f2dc43667948ae40fbe895ae754ae71377ff084cb33c716db3 SHA512 2d67f5850066c6c932b42a2ca371def9bbc77a52b29e8f98bb116261a94df5aa13160f45a5d5c18a856c5c61a0cdb18d73178701e1ee80e476ad6eeb36110963 WHIRLPOOL 44edc34c4b8f81899e55c4d4b9f68bf6b604df3acd15c1d1a5468c5ac2cca9394cc9091e37dfbe0ca71278aebb7d1df9e622ef799bd8e84944f391b0ff5b058b
 EBUILD zabbix-2.0.8.ebuild 10573 SHA256 0e5969036f51ec7d410a57f817752216d807da506a5ad17c674956e63f4f62dc SHA512 7e7625ea7fe731e490d0a66f12f7b40cbd71b4d262a52010f1ec2914c5e73af40127b51f983a8202f8264cae9ae56f77942d233bbb34cb53ef0cdd488f8e774e WHIRLPOOL 9fd66f46301119ac52fbe0e0145b0e33036ee12677b9532ed2cfe71934553476971cca6c857b86c8b711e5d6a52161e948ec5b9653f9870ce04b183e64dd011c
-EBUILD zabbix-2.0.9_rc1.ebuild 10570 SHA256 4f2132e57552ec7b9feab4f0c6a297bbadc1018c150baeaa658554c523ea216c SHA512 75dea8b7fafcd1e4c7f1e782f9d4f8c4ac30641c59e43492efa1c41d854ad824a62cb11754c60800ffc1594130ad51cee3c1e9d069676e98d621e0e7b561ecdd WHIRLPOOL d6e04db08e47681d4cfd6e35ec0e4eec2a2e056c850b9e75f37a5f056e558c764d8ebcf2588575ba52a0e353f4328698b45b3ef8f026f9cc8d5b32c764192c9a
-MISC ChangeLog 30967 SHA256 3bea35b8092372485c6418d255f3bd3c3eae57fe2a79d750bf836aaf2334d6a8 SHA512 ffdaa9c2400688468bc192cd582c289c1392e5f1b75574048b7999dbfa10901b9cac70092f8524ac4cfd6fa8bfe5726ec9e808f6257e17324cf6a0c6eddc90fe WHIRLPOOL ac9244c3612b6f1eae118d9c7b8c1bae6a4c5e1b93ae95e376bd095b37ef0ce07f49c1fc96ca1daadc4e7cf0b2fb16bb6a8af8b75a50f7983e9524e58cb39c57
+EBUILD zabbix-2.0.9_rc1-r1.ebuild 10591 SHA256 8d1aa7404139739c3672eb198a117e868823a991f043ea5cf4f8f8817e0d69cf SHA512 fe8b5b25a1a9288f7cc37d8520786670732d2cf38cf4bc04bf29becba5233aa0ff88a758fda7a6ff13c9c9c3f808a048b27e4a0bfdc6493f1d64cc0728f7038a WHIRLPOOL 02db58dda8e041b5221402119daf5443ae5c1f211d947fb2e6ae5d37b19675ec2f3e94971fa4864cf55f8e3dd979414c071fd8100f21496a049b3889efa6f00d
+MISC ChangeLog 31211 SHA256 d081aa6f1f87ed79f644e3650628dff183b053ce55f3d75796b0156523b36589 SHA512 69fc98846c17730646d5a5088ebc7589392a4807b7147cc5bda2969b35aac35d242fcc9f8b0fe0129288c135b6648de81a6f1b116577fde321c2d797cd037a0c WHIRLPOOL b7dd6e1c6ec96a4d9db8b4bcf0c81fa27af34b7129066db3811e6ec47066b9b8ec2f14df4a4da331f67c3cd4b4aa939de202ff1f70dea67f4770d0aa7b97c546
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSTH5oAAoJEC1LWXx4YDennXIH/A8kN8Oj4DtQK5SoAg/T5Jbu
-JVTrsSd2fOykyrS38F20R+WQvxkikkNjt1glPopfjpUS2UtxP8dj2aIx1akB1KY8
-vLAe0mWb70SNqwAJ5ACpWZIMAt6T3B+grKV/Kf19Vr6+P0aXyWjKc/jQ+SqEK9qF
-K8d05sqfEm64TYCLcetnkUTYTGoanV3mgtD6vdz4RZtTwnh3go/pEU5iD92rNn0u
-v9y5I+DqRBL/uagRwIpmoTzqp5Z5k+F8v3pSjgah3t+i4nCN2TdpMaHk12MlyMgC
-ThAsKPV+bu90Qq/98ZFr6Z7/YbkocKY4rbfaDupYyWytXAi1U1e4Kb+SBIRAwtc=
-=paGC
+iQEcBAEBCAAGBQJSTJ5XAAoJEC1LWXx4YDenT3UH/0lJsupRsffZblS767jgxpZK
+Wr/lsIvOj4AIlHzp6dVmzBz8febdzMUpYqQ23oEAFN7ZFXNYrWS0RwZRlS4PvNT7
+PA2cct5a96Zk0UPeCxyDsYeTSKosWvKuHuaa890n6UG6SSCCl1E5qunpWAIFTFnq
+weFC7hGmeplv2BvFP/xo4TAP3rSfo4s1ixIrTm72QjSDiKSDkWZmSD9FTuK6JhuM
+CGAoj2mWtauxxsr62nfy67VS/XctFL9ezGkRm9ZpPANBPjy+qJjzSdx2Af+ePFOs
+yeKIZH/CO4GbidvprQCbTKm6TtSytfc75FyQZFkCvXaw33pvoAtryCS12lAfdyI=
+=n1tA
 -----END PGP SIGNATURE-----
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 \