Removed needless die's; added :0 to emma dependency

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 21 insertions, 17 deletions

diff --git a/dev-java/ical4j/ChangeLog b/dev-java/ical4j/ChangeLog
index 3086abd340f0..9f924113d029 100644
--- a/dev-java/ical4j/ChangeLog
+++ b/dev-java/ical4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ical4j
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ChangeLog,v 1.10 2014/07/08 08:12:42 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ChangeLog,v 1.11 2014/07/14 14:37:55 ercpe Exp $
+
+  14 Jul 2014; Johann Schmitz <ercpe@gentoo.org> ical4j-1.0.5.ebuild,
+  ical4j-1.0_beta2-r1.ebuild:
+  Removed needless die's; added :0 to emma dependency
 
 *ical4j-1.0_beta2-r1 (08 Jul 2014)
 *ical4j-1.0.5 (08 Jul 2014)
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
index 975929fcfa7c..3570ea6c5f51 100644
--- a/dev-java/ical4j/Manifest
+++ b/dev-java/ical4j/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 AUX 1.0.5-build.xml.patch 3196 SHA256 460bef8c939ec8f3e357129efa7855768ce6d8ff78f2b5bf308a34e4009d7992 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34 WHIRLPOOL 9e32dca603201f9646cadb93b1e92c9ae29b991be79289efe4c74fd44515092d8c9e56b928e50f47292e75ed7b05e9c5bd2261de92821d5c0364aad04e3fbc5d
 DIST ical4j-1.0-beta2-src.tar.bz2 1328056 SHA256 c2ddf74c8f57d504816aa930e7a63498dd812c914ac77d19c24d9f36eb46afd6 SHA512 794799eaf2fd96783f51d0ac87eba2c250a9ff39e77f841f7fb948d93c0aba9a30c28aea09c04c78cf8ee42dac6514edd07a8d22ea18d6005787b86d9857949f WHIRLPOOL 50e0df0d482b8b0a63c86d519b30ea6b6c556a713663fd67b929054f3fe6e587822577de4b58fe9e07dc93642ebcf9a0611f368a24d55ce67eb423da0320ca68
 DIST ical4j-1.0.5-src.tar.bz2 9307268 SHA256 7fe8bd596489f3f015b904794fb9d9a346823e1750619ec71d6929ba870293f7 SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286 WHIRLPOOL 80b71c87bddbe5001f58203b2648a467d766f5dc8b16211d8f45f6770ec7037bab260165c1c526218bf73352884dd24be62b1d58c6d6278b06254fd651831b48
-EBUILD ical4j-1.0.5.ebuild 1596 SHA256 c7c902e9be3f9b235f9cd52c740255ac774faabf2e52e19dc762458f23a09052 SHA512 f8194d1590690743725c323161aa98ca1a929486817515fc969ca80d7d193800931dfeb9b50bdf258f4fe4392fffff8b763d20ae99e09fd2153b55c5aa7f28e1 WHIRLPOOL 272b61388969988b2f3d509406245f6c27b4a2c46e8cf3f3cdaec5d18c06d7dbcf573403e02ab840dee000ad75ac0bdbbe6f6746092fc8ed091fbbe99598a463
-EBUILD ical4j-1.0_beta2-r1.ebuild 1460 SHA256 df17e078a4433d9e8e74a76c458c40fcae216ad039bebe0e5accdde49dcddf04 SHA512 f5f24fc9f83317cd4647f637e04c0a2a653bc16103e18020bef95c8551e66969a54eaba44043922af7c47597f4e5811fae0120063ff4c0d89917a2fe0e3c5a9a WHIRLPOOL 4cf2d04d16164cac4a3101469f21d2a29159c5782b44112431602d5c0b8e4fdf7504bef5d795ebe20bb9915e5bfa84260adf99312904f016e9b6712f96fead10
+EBUILD ical4j-1.0.5.ebuild 1576 SHA256 1a49b85dca61b756a443b60edfc833efbf3d4e6f437f84d5faca4deb96c4d061 SHA512 4bbc95c5e3420f97233d669e8dad9b8e58f0ebe66ce1d7134c76ee9828494371ae3a8772d31bdd1dff06e1f14a66a9b504c57fdac73d5a3afc7c1e663a1c6de2 WHIRLPOOL 694859773905a6da63ac8a8213f921c123dcf3a8b1577455e1c1bf5d9df935117f2d23972df3e21fd9d74da034a0edf243961352974458e543ff9edb5f898c49
+EBUILD ical4j-1.0_beta2-r1.ebuild 1440 SHA256 18eebe7807fb6d6cb161e9c53b1f42b8aafaccef3af4315d2244cb1f0d7a9f76 SHA512 a81b07bf986ec8d89a56b3d0680f86a41423717b0772bcc4b26210cdd99140363c02b8172cd8b97893addf51b23276db916f08a6241955257f355e31d78a385c WHIRLPOOL d8f877412c880836ab261987e66bfa4eea33fe684dcaf4eeb77d6dcfdc29ec76189904faf35211ce6f7fdca39e9345ed4a3c3948c4dc4cf8c3d6178760c2f591
 EBUILD ical4j-1.0_beta2.ebuild 1652 SHA256 0461709b28e2f17ae23228ac4eac04b41b322a87f5021f7af4a580a96ea5ecc8 SHA512 06a07c05003b0376a18a7c473ee3221228bba78acdde8892397c9ce32c655fe91cf04b7e2abbca6a7efe278298846b89e76024046a25478d079aa0f2acf02039 WHIRLPOOL c0e171f49cc605f921514dd702bcd0f46878d2be961f97ee619b884e2d6381200cb08ccb162152b8f0b450b594294b3cf46cbd18e26eb95a715fb2a8519799a8
-MISC ChangeLog 1630 SHA256 ac3b0993ed49ef004e81bd56d8383f7ad67ce909af55030f636aa6032091b7b7 SHA512 7f2b00f6524d18be585386147f91d7f6d5dc19b28326ba165cb288f2c07b739ecfddac7c6eddf698b3ce557f0ff7b022bf10e02934e23d08df5a2bc7937758a8 WHIRLPOOL 31255590e2b2836f01df276c7db83e0347e22583662146204c19879d40b10cc11c29ba1cbb0932e951ee1f8a7d128b15e128aaf2ec742b3937de9d499fd9b3b7
+MISC ChangeLog 1785 SHA256 fef58c96efd02c38c5227956e6033c7d42bbdf1ec4a9614eb28053e91b85b0e5 SHA512 ec7faa09ca7bd7fb43c4d78c8f8953262b89a6c86419bfa14c98b78a7e2c553eafd7aaeb17f01961ca8af39324ac22dc7132a3f09e2737c08cb59ca10a15e2c8 WHIRLPOOL bd8a2e8c0242b70f71f7c9a8fb4bfc8ae0103aa1fb73eab4706caeb6be7c95e2ab0eeee7d5490b6c3c481412c19c1592c2ea856c412757646d63dc8db3e0d893
 MISC metadata.xml 830 SHA256 1970061c273c049c1f541f368176c373daf594d9ed1eb1a91d8943b2ccaed8c9 SHA512 b789b8d94b16016c475ef29aff1fd0f795db9990410ef8bced5616d7a1725b3280b33c61cd9de6030385931eef9296a614fcb275657c14e0c1e6c7488b6cdb0b WHIRLPOOL 674b60fedfc72cc2dbd89d8b68b30ce863d3fc73c10d95b19045abae7bee27469b5ebd790abb55456360b34bb28ad5851e1eea6939d0ddf949c47a5cf3d2be06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTu6gBAAoJEKCEBkJ3xQHtpHAIAKngOnOZbsfHy9L/EEotT7qr
-pbbEKJ6xDjXES4+lhGt4GTyphz5oU1WyervZslPJvSslF8G3rJIgMdXaEoNBrlzB
-UarC8HefGXJw2W2xzRsHTtHtcU+/MR946poWSOtKArwrMAUizYJ1FxzSjfymDRYw
-p9f/95MsRNkdXo+cZDHIG9Q/9dM1dAx8NkUsU50CjntgNT6kokddUDf95ZIaGTE9
-U5sTQhqMaF+SpDJq82oEpPrkF98KomR4NF0aWd6JlfHaBzHqKsTfDmHx29631g2K
-+qj5NB/2XTQOaF2vimYoPqEvNaay3cWhmncGtQ3sRwcfw5nAq1Z4xid3FdM1IGQ=
-=HBp1
+iQEcBAEBCAAGBQJTw+tLAAoJEKCEBkJ3xQHtpv8IAJcky61JrQ2SYQWRv8rdOkyc
+moAAQxy1b/BNWSq4ZvHa+J/hgzduB32ziYgOWa//PdTg4k615KPM0RVvD9aLPbGV
+h4kl7MYI7C3Bn08zmz/kGdlVfWW8nTjjTf4WkrlzdqpmenEaTJ977pTbzAX03S20
+S0/ZV+jWUTz9O/dU/9vkRBZZ09IS/jwSzvFrIwKXqpWCLBMFm9mYW+2kYr3SUBDi
+Y+JmhuRxWTu4sMUW2lqCtF7LzhnCb+91crE7nLDOv+uCKCvsXGqcguPJzGq/RdM1
+tCPbwB1BNkjIQ7kLesEBlII0UebhHkozsSeT5o32MTNYJVNlvYE2C8PH90ACWcE=
+=Ymk/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
index a8440a9f77aa..937747879c15 100644
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0.5.ebuild,v 1.1 2014/07/08 08:12:42 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0.5.ebuild,v 1.2 2014/07/14 14:37:55 ercpe Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/emma
+	dev-java/emma:0
 	${COMMON_DEP}"
 
 S=${WORKDIR}/${MY_P}
@@ -51,7 +51,7 @@ RESTRICT="test"
 src_install() {
 	java-pkg_dojar build/*.jar
 	dodoc README AUTHORS CHANGELOG etc/FAQ \
-		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+		etc/TODO etc/standard_deviations.txt
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/main/java/net
 	use examples && java-pkg_doexamples etc/samples
diff --git a/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild b/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
index 861e628ed8f4..ceaa4ff977cf 100644
--- a/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
+++ b/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild,v 1.1 2014/07/08 08:12:42 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild,v 1.2 2014/07/14 14:37:55 ercpe Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ COMMON_DEP="dev-java/commons-logging:0
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/emma
+	dev-java/emma:0
 	${COMMON_DEP}"
 
 S=${WORKDIR}/${MY_P}
@@ -48,7 +48,7 @@ RESTRICT="test"
 src_install() {
 	java-pkg_dojar build/*.jar
 	dodoc README AUTHORS CHANGELOG etc/FAQ \
-		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+		etc/TODO etc/standard_deviations.txt
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc source/net
 	use examples && java-pkg_doexamples etc/samples