Fixed bug #514618, bumped 1.0 to EAPI=5

Version bump to 1.0.5

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

6 files changed, 224 insertions, 7 deletions

diff --git a/dev-java/ical4j/ChangeLog b/dev-java/ical4j/ChangeLog
index 7704770a67bf..3086abd340f0 100644
--- a/dev-java/ical4j/ChangeLog
+++ b/dev-java/ical4j/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ical4j
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ChangeLog,v 1.9 2007/08/26 14:14:39 betelgeuse Exp $
+# 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 $
+
+*ical4j-1.0_beta2-r1 (08 Jul 2014)
+*ical4j-1.0.5 (08 Jul 2014)
+
+  08 Jul 2014; Johann Schmitz <ercpe@gentoo.org> +files/1.0.5-build.xml.patch,
+  +ical4j-1.0.5.ebuild, +ical4j-1.0_beta2-r1.ebuild, ical4j-1.0_beta2.ebuild:
+  Fixed bug #514618, bumped 1.0 to EAPI=5 Version bump to 1.0.5
 
   26 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
   ical4j-1.0_beta2.ebuild:
@@ -38,4 +45,3 @@
   11 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> +metadata.xml,
   +ical4j-1.0_beta2.ebuild:
   Initial addition. Ebuild written by me. Fixes bug #167275.
-
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
index d78cfeba3661..975929fcfa7c 100644
--- a/dev-java/ical4j/Manifest
+++ b/dev-java/ical4j/Manifest
@@ -1,4 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-EBUILD ical4j-1.0_beta2.ebuild 1656 SHA256 81be3423d625a0707af9311092fa5aa52df588fa0b1271346e13ec6f6364caed SHA512 ccd33355d7dc68394e923e06fa454b19ece91e906b371234c37615f017746e8eb1909896a9916d3706580e5bfad7f8f54903620a91f448ca935459b1d3af98b4 WHIRLPOOL f237ab64ab9bc83c51a76365da3db95436156f6869d8b37ab68de638dac72c01ca381e31389f299faedc27dbd9d6265e99698fa831c1325ef1aebd04aa03fc76
-MISC ChangeLog 1349 SHA256 acfc70ec107260202fe537e9747f91656e55fe03a64f5d976616c6d6e2f4de02 SHA512 8f4c4cf16578e6ff9905c35c8fe868afd3236d7a1aa831e9e6a2dea43ab2630ffc2ae5836990595b7afbe28b68b87d5bdaece29ae091a2289cbb258e5d04dd83 WHIRLPOOL c667e2b751abf1a361d377999743bfc1843cbddad15cc74083c04274754d51113a267133a446de7ca8a7e525a1b6285c418c7b6fcdf5330b8a711714953d015c
+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_beta2.ebuild 1652 SHA256 0461709b28e2f17ae23228ac4eac04b41b322a87f5021f7af4a580a96ea5ecc8 SHA512 06a07c05003b0376a18a7c473ee3221228bba78acdde8892397c9ce32c655fe91cf04b7e2abbca6a7efe278298846b89e76024046a25478d079aa0f2acf02039 WHIRLPOOL c0e171f49cc605f921514dd702bcd0f46878d2be961f97ee619b884e2d6381200cb08ccb162152b8f0b450b594294b3cf46cbd18e26eb95a715fb2a8519799a8
+MISC ChangeLog 1630 SHA256 ac3b0993ed49ef004e81bd56d8383f7ad67ce909af55030f636aa6032091b7b7 SHA512 7f2b00f6524d18be585386147f91d7f6d5dc19b28326ba165cb288f2c07b739ecfddac7c6eddf698b3ce557f0ff7b022bf10e02934e23d08df5a2bc7937758a8 WHIRLPOOL 31255590e2b2836f01df276c7db83e0347e22583662146204c19879d40b10cc11c29ba1cbb0932e951ee1f8a7d128b15e128aaf2ec742b3937de9d499fd9b3b7
 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
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ical4j/files/1.0.5-build.xml.patch b/dev-java/ical4j/files/1.0.5-build.xml.patch
new file mode 100644
index 000000000000..7e68876616d8
--- /dev/null
+++ b/dev-java/ical4j/files/1.0.5-build.xml.patch
@@ -0,0 +1,80 @@
+diff --git a/ical4j-1.0.5/build.xml b/ical4j-1.0.5/build.xml
+index 512738c..be5aac9 100644
+--- a/ical4j-1.0.5/build.xml
++++ b/ical4j-1.0.5/build.xml
+@@ -14,7 +14,7 @@
+ 	<property file="build.properties" />
+ 
+ 	<!-- Project paths -->
+-	<property name="source.dir" location="source" />
++	<property name="source.dir" location="src" />
+ 	<property name="test.source.dir" location="test" />
+ 	<property name="output.dir" location="bin" />
+ 	<property name="package.dir" location="build" />
+@@ -99,7 +99,7 @@
+ 		<echo message="Compiling source from classpath: ${project.classpath}" />
+ 		<mkdir dir="${output.dir}" />
+ 
+-		<copy file="${source.dir}/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
++		<copy file="src/main/resources/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
+ 
+ 		<javac source="1.4" target="1.4" srcdir="${source.dir}" destdir="${output.dir}" debug="true" debuglevel="lines,source,vars" deprecation="true" classpathref="project.classpath" />
+ 	</target>
+@@ -123,7 +123,7 @@
+ 			<attribute name="Class-Path" value="commons-logging.jar,commons-codec.jar,commons-lang.jar" />
+ 		</manifest>
+ 		<jar basedir="${output.dir}" compress="true" jarfile="${package.dir}/${package.file}" manifest="etc/manifest.mf">
+-			<zipfileset dir="etc/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
++			<zipfileset dir="/usr/share/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
+ 		</jar>
+ 	</target>
+ 
+@@ -187,10 +187,8 @@
+ 			<instr instrpathref="coverage.classpath" destdir="${out.instr.dir}" metadatafile="${coverage.dir}/metadata.emma" merge="true" />
+ 		</emma>
+ 
+-		<junit printsummary="withOutAndErr" showoutput="yes" fork="yes">
+-			<!--
+-            <classpath path="${project.classpath}"/>
+-            -->
++    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
++
+ 			<classpath>
+ 				<pathelement location="${out.instr.dir}" />
+ 				<path refid="coverage.classpath" />
+@@ -198,22 +196,19 @@
+ 			</classpath>
+ 			<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
+ 			<jvmarg value="-Demma.coverage.out.merge=false" />
+-			<test name="net.fortuna.ical4j.AllTests" />
+-			<!--
+-            <batchtest>
+-                <fileset dir="${test.source.dir}">
+-                    <include name="**/*Test.java"/>
+-                </fileset>
+-            </batchtest>
+-            -->
+-
+-			<!--
+-            <test name="net.fortuna.ical4j.data.CalendarOutputterTest"/>
+-            <test name="net.fortuna.ical4j.model.component.VTimeZoneTest"/>
+-            <test name="net.fortuna.ical4j.model.component.VEventTest"/>
+-            <test name="net.fortuna.ical4j.data.CalendarBuilderTest"/>
+-            -->
+-		</junit>
++
++
++      <sysproperty key="basedir" value="."/>
++      <formatter type="xml"/>
++      <formatter type="plain" usefile="false"/>
++
++      <batchtest>
++        <fileset dir="${test.source.dir}">
++          <include name="**/*Test.java"/>
++          <exclude name="**/*Abstract*Test.java"/>
++        </fileset>
++      </batchtest>
++    </junit>
+ 
+ 		<emma enabled="${emma.enabled}">
+ 			<report sourcepath="${src.dir}">
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
new file mode 100644
index 000000000000..a8440a9f77aa
--- /dev/null
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -0,0 +1,58 @@
+# 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 $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a Java library for handling iCalendar data streams"
+HOMEPAGE="http://ical4j.sourceforge.net/"
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/commons-logging:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:2.1
+	dev-java/backport-util-concurrent:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/emma
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+	rm -v lib/*.jar || die "rm jar failed"
+	#mkdir bin || die "mkdir bin failed"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_ANT_TASKS="emma"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-codec,commons-lang-2.1,backport-util-concurrent"
+EANT_EXTRA_ARGS="-Demma.dir=/usr/share/emma/lib/ -Dsource.dir=src/main/java"
+
+RESTRICT="test"
+# two tests fail with maven, they work in HEAD
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc README AUTHORS CHANGELOG etc/FAQ \
+		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+	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
new file mode 100644
index 000000000000..861e628ed8f4
--- /dev/null
+++ b/dev-java/ical4j/ical4j-1.0_beta2-r1.ebuild
@@ -0,0 +1,55 @@
+# 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 $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a Java library for handling iCalendar data streams"
+HOMEPAGE="http://ical4j.sourceforge.net/"
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+COMMON_DEP="dev-java/commons-logging:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:2.1"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/emma
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	rm -v lib/*.jar || die "rm jar failed"
+	mkdir bin || die "mkdir bin failed"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_ANT_TASKS="emma"
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-codec,commons-lang-2.1"
+EANT_EXTRA_ARGS="-Demma.dir=/usr/share/emma/lib/"
+
+RESTRICT="test"
+# two tests fail with maven, they work in HEAD
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc README AUTHORS CHANGELOG etc/FAQ \
+		etc/TODO etc/standard_deviations.txt || die "dodoc failed"
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc source/net
+	use examples && java-pkg_doexamples etc/samples
+}
diff --git a/dev-java/ical4j/ical4j-1.0_beta2.ebuild b/dev-java/ical4j/ical4j-1.0_beta2.ebuild
index 63a1cb76d775..126547cf8236 100644
--- a/dev-java/ical4j/ical4j-1.0_beta2.ebuild
+++ b/dev-java/ical4j/ical4j-1.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.9 2007/08/26 14:14:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ical4j/ical4j-1.0_beta2.ebuild,v 1.10 2014/07/08 08:12:42 ercpe Exp $
 
 JAVA_PKG_IUSE="doc examples source"