From b88133e75ea8e6b18bcc743949285731cb5156f0 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sat, 11 Apr 2015 21:58:43 +0000 Subject: [PATCH] EAPI 5 bump and SLOT bump from dev-java/cglib:2.2 to :3 wrt bug 546288. Signed-off-by: monsieurp@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8 --- dev-java/castor/ChangeLog | 11 ++- dev-java/castor/Manifest | 18 ++++- dev-java/castor/castor-0.9.9.1-r7.ebuild | 72 +++++++++++++++++ dev-java/castor/castor-1.1.1-r3.ebuild | 98 ++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 dev-java/castor/castor-0.9.9.1-r7.ebuild create mode 100644 dev-java/castor/castor-1.1.1-r3.ebuild diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog index 1007ab9d1969..c3f6857742fc 100644 --- a/dev-java/castor/ChangeLog +++ b/dev-java/castor/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/castor -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.56 2010/04/05 22:49:32 caster Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.57 2015/04/11 21:58:31 monsieurp Exp $ + +*castor-0.9.9.1-r7 (11 Apr 2015) +*castor-1.1.1-r3 (11 Apr 2015) + + 11 Apr 2015; Patrice Clement +castor-0.9.9.1-r7.ebuild, + +castor-1.1.1-r3.ebuild: + EAPI 5 bump and SLOT bump from dev-java/cglib:2.2 to :3 wrt bug 546288. 05 Apr 2010; Vlastimil Babka -castor-0.9.9.1-r5.ebuild: diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest index 520a2d093c48..2d2108cb9f55 100644 --- a/dev-java/castor/Manifest +++ b/dev-java/castor/Manifest @@ -1,8 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 0.9.5.3-jikes.patch 1316 SHA256 e6e7b56cdf09eedef1e09bb4599d60837af1cc4251cfa0ac637c3994a135519f SHA512 ad39d5fedb2f1fbe2d7457ba6d4eaec0ec1215f388aa4921ecc866260ac6729a791340d3230ef14d36f1d282570ab7146ea69b04d1774530e9f83574d9f599cb WHIRLPOOL a34fc1d0f63f16d2efeb68999c5359637593e9da6af0f26299a254a7b25f74b1317edae00c294c62188743fabe4d8a8023b963e2feaf31b0dadf1bf8aefefb65 AUX 1.1.1-jdk-1.4.patch 1403 SHA256 5d49640c380ffedbc54223944226f6320636a9996e328abe280b8de9344248dc SHA512 b24b648c6cf4d9a0b2d7c11a6dd41e963c8a6581839d4ee1a2a708776bb0a6f04209e5bbaa48212c4bf6bccd1e9be18c1304385b7500f2273ca1bc5cac62a7fe WHIRLPOOL eb6bf05b7025e88db86e8b0e22cbe314e6fc45bafc35854a1a5f4e9701911e50d301c7b1db5aec2458d8bed7babfac88a386992122e0204f71ea446622722809 DIST castor-0.9.9.1-src.tgz 6794995 SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 SHA512 d3150af0fdccf4c477b401fe24c7b429d7573693f697f7e6e2e88a13573ca9aa43749c8ee0d381e5a4fd9cc729719f04cc6efadb3c20426a609fa8217bbc45da WHIRLPOOL 01aa718cc1d819103dbf2c6d52f2301e8144ee941ff7d4e3c5c9548898c7a1e7c3587982183851569c67032b612efdb79ac3068bd72546f5251b405b9df5a41a DIST castor-1.1.1-src.tgz 9067936 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda SHA512 ec066a227e71c1884e168dea8f7a3bfbfd3275e4c7b83a07e9673b3f84dc52c734c337694bd725de1db5c7a803cc2dadbdd3d1f7507fadc93687d5c05e3a26d5 WHIRLPOOL 2d5312a5ae2ab6bb86b960d3f9c2cc6e6d9de823ed3b0ce6ffa03570ffcf931b59b67d4ef2e5ddf32f6ae1f791b2e0e7ca51935379a0b54f30959ad844768367 EBUILD castor-0.9.9.1-r6.ebuild 1815 SHA256 f611daa917beba3e9128ec0a6360d6bb228cae3d26dba186ad468a21a2937f20 SHA512 64a2b87cdeb8966c3ec9a203f62d4d13ee01bc7482cd474c3d6ba5c28c7c58ade5aeb38f382a0d84c785450e23cf500651db5e73b1e81f2b175ea3ab60639b6c WHIRLPOOL ae3a6469bc0453875f5d1dfee0071b765e0bd551bec351eeb820d192b91cbb085eb28781a8ae81c15f7b02d1fec3ecc79bdd3bb668d8ff7ad0cce7cee8ebc4ee +EBUILD castor-0.9.9.1-r7.ebuild 2119 SHA256 055ba25b2ce888c61a1cabf7c93f38fd835d5245369beb2f65c401409cce5658 SHA512 2a4287af63a04ef45cf677494de6f3de135376ccec69e14367cb59b329998a2d7d0b89af4c0f6e58931c7b050896e84d0a1b0ed1e9a6d54a309630292bef0e06 WHIRLPOOL e59d1aefbcfd7c36e65fd3bcefe48af20f0a77a322e8fca91ca0980d79b801e483c8ae44cfa8b65f9f31788407f8d2d0f28786788f5ebedfb7c6cd7108eb5897 EBUILD castor-1.1.1-r2.ebuild 2483 SHA256 c647f145f0662f5dbf3aeba63ce6272a71fb2490e2972ae423f96af11526540e SHA512 83b2c08e2043878873c27d83b5696e40d2c7d48f3c1e74ecd2c3822a7540e3e9b3779598b2077ad28c8d71ba8923a951f8d6d35c1c77c9b0a9200869d6ec1894 WHIRLPOOL f7deb9f08cde940d14cca7e5be144f38d313c8bb2cfd01835378da12ae89d6a71e20ec408893cbb38f0f827680875ddae196b310f7fe1aa596bdae7359fe8673 -MISC ChangeLog 7368 SHA256 3d875f7cc33bc990f6e5d68e11a6954c9abc1d1f7a60aceaa27178d433b59bc7 SHA512 e5a8215434d15a2ed4b18103157af892d638cf755a8762b2ca8ddfdd25b9adb899caf76bdd2c8fc99721124962dbc159c6dca250c9ce0902ca72efff55748873 WHIRLPOOL fbad3cff937f0b0e07922498b41a9892792324b3e17272c5a66c71a050e0cadd57e03ca9f421f33713a2e7a12daa64ab568ed9151d280656bb2c0e70a39a1815 +EBUILD castor-1.1.1-r3.ebuild 2488 SHA256 4c1ed9d4b600c40d557f0701a6001b7f342e8fbff87cbadebab3e57a87fe8617 SHA512 f724d31193441386de6ed0a1fb4cbb3ad7c25e6892d4a6d6ab381a3226b1028cbe3151e402bf40601cbab878d7de9b6d02560693d996759557f3eb26727c5998 WHIRLPOOL a5918cf7817df1db5e38b122dc04b0d62dff0ceb0063c2d5d191532eab26f55532e9a38d7629fff3a2162acb3a71ca1e8cf044b4df45bffe95b01977a08df3ef +MISC ChangeLog 7619 SHA256 cc79a353538c06f207aff52956d8719cff1e0ce6e2884638c4bf45625fb85fcb SHA512 3059db95fa84d8d3b16686fe7c91f78d77e2dbedc3dda8b48aa60962aae9fcb0b0429904f583bae3090ecff2235ad169b95eabd091f51753dd88fe6c23fa82f9 WHIRLPOOL 127d9318ef2bc5c97e3acfde2bafcf28e92481333a0dcb53f28cca22f1559bc9b23201a37977e798c90dedc9c3846a3bbb3f92967628d4f37a7bfd3181ed7b65 MISC metadata.xml 414 SHA256 fc981b706c1199b5fdd5636a4514f7e214c5a504e9f44c2a4dcd6ca17946c575 SHA512 0e61c76e21f9c7155b8f0236a0e0e52b05cfd7b6a620d6e406d6fcb54e8a4a857a9822c682363b4e76527d119500f24722454d330692f99dc90d9e20a4d49afd WHIRLPOOL 50e69dc8fef6f1fd7c40c1c09ace4eab370e02f19649859c279dc695bac89c6381edad6d78cabb1ca0034dbe95adc0f12e51dff93215cc17b31a189e812dcb42 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAEBCAAGBQJVKZkNAAoJEJGRpfGTSRu4OmAIAKspia+vZfN8pWsJcVq18+4M +iMId5Aie2hriyvbM/pktRLFAbA50OiuiwOxDXvJ+mOIVlca6HtzKomhzCNWkEFIU +DkqD0U23KNutS2OsxMSXJ2OZrW8AWumfOeqko6dy3lk2/mZotSbANNELgEH+tCcb +GrXHbdxDvCl8P8UYwvM63SbesJXJ2QuuxODx9thI/L0UJ1ixUiCbYwxx67567to+ +C0hFIMn2hKf7SM/5TXp0vQB6j8ectbhnEoxt1Pf7sh5IFoTcLBcotYyehhKOQ7g5 +E+zZPQpk1abTwf8TEeFlPpeikNpp88NxiCLC7oh59mApgTCoebuWO6/KLY8zjYQ= +=cw7O +-----END PGP SIGNATURE----- diff --git a/dev-java/castor/castor-0.9.9.1-r7.ebuild b/dev-java/castor/castor-0.9.9.1-r7.ebuild new file mode 100644 index 000000000000..9d612cc1a2dd --- /dev/null +++ b/dev-java/castor/castor-0.9.9.1-r7.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r7.ebuild,v 1.1 2015/04/11 21:58:31 monsieurp Exp $ + +EAPI=5 + +JAVA_PKG_IUSE="doc examples source" +JAVA_PKG_WANT_BOOTCLASSPATH="1.5" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Data binding framework for Java" +SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz" +HOMEPAGE="http://www.castor.org" +LICENSE="Exolab" +KEYWORDS="~amd64 ~x86" +SLOT="0.9" +IUSE="" + +COMMON_DEP=">=dev-java/commons-logging-1.0.4 + dev-java/jakarta-oro:2.0 + dev-java/jakarta-regexp:1.3 + dev-java/ldapsdk:4.1 + dev-java/xerces:1.3 + dev-java/cglib:3 + java-virtuals/transaction-api" +RDEPEND=">=virtual/jre-1.6 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.6 + ${COMMON_DEP}" + +java_prepare() { + # TODO this should be filed upstream + epatch "${FILESDIR}/0.9.5.3-jikes.patch" + + # Does not like Java 1.6's JDBC API + java-ant_rewrite-bootclasspath 1.5 src/build.xml + + cd "${S}/lib" + rm -v *.jar || die + #FIXME: uses these bundled classes + rm -v tests/*.jar || die + java-pkg_jar-from --build-only ant-core ant.jar + #Only used by examples and tests and we aren't building them + #java-pkg_jar-from adaptx-0.9 + java-pkg_jar-from commons-logging + java-pkg_jar-from cglib-2 + java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar + java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar + java-pkg_jar-from xerces-1.3 + java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar + java-pkg_jar-from transaction-api + + # Remove special characters + cd ../ + + ebegin 'Removing special characters' + perl -i'' -npe 's/S.bastien/Sebastien/g;' src/main/org/exolab/castor/types/DateTimeBase.java + perl -i'' -npe 's/.actual value./actual value/g;' src/main/org/exolab/castor/xml/schema/reader/ImportUnmarshaller.java + eend $? +} + +EANT_BUILD_XML="src/build.xml" + +src_install() { + java-pkg_newjar dist/${P}.jar + java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar + + use doc && java-pkg_dojavadoc build/doc/javadoc + use examples && java-pkg_doexamples src/examples + use source && java-pkg_dosrc src/main/org +} diff --git a/dev-java/castor/castor-1.1.1-r3.ebuild b/dev-java/castor/castor-1.1.1-r3.ebuild new file mode 100644 index 000000000000..3ca5a9b2adaf --- /dev/null +++ b/dev-java/castor/castor-1.1.1-r3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-1.1.1-r3.ebuild,v 1.1 2015/04/11 21:58:31 monsieurp Exp $ +EAPI=5 + +JAVA_PKG_IUSE="doc examples source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Data binding framework for Java" +HOMEPAGE="http://www.castor.org" +SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz" + +#SRC_URI="mirror://gentoo/${P}.tar.bz2" +# svn co https://svn.codehaus.org/castor/castor/tags/1.0.3/ castor-1.0.3 +# cd castor-1.0.3 +# mvn ant:ant +# do some magic to build.xml +# rm lib/* +# cd ../ +# tar cjvf castor-1.0.3.tar.bz2 --exclude=.svn castor-1.0.3 + +LICENSE="Exolab" +SLOT="1.0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# tests and full documentation when support will be added +# dev-java/log4j +# ~dev-java/servletapi-2.4 +# dev-java/junit" + +CDEPEND="dev-java/cglib:3 + dev-java/commons-logging + =dev-java/jakarta-oro-2.0* + =dev-java/jakarta-regexp-1.3* + java-virtuals/transaction-api + =dev-java/ldapsdk-4.1* + dev-java/ant-core" + +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +src_unpack() { + unpack ${A} + + java-ant_rewrite-classpath "${S}/anttask/build.xml" + + cd "${S}/lib" + rm -v *.jar tests/*.jar + java-pkg_jar-from cglib-2.1 cglib.jar + java-pkg_jar-from commons-logging \ + commons-logging-api.jar commons-logging-1.1.jar + java-pkg_jar-from jakarta-oro-2.0 + java-pkg_jar-from jakarta-regexp-1.3 + java-pkg_jar-from transaction-api + java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar + java-pkg_jar-from ant-core ant.jar + + # These are only used for tests or documentation + #java-pkg_jar-from junit + #java-pkg_jar-from adaptx-0.9 + #java-pkg_jar-from log4j + #java-pkg_jar-from servletapi-2.4 servlet-api.jar + use doc && mkdir "${S}/bin/lib" + java-pkg_filter-compiler jikes +} + +#src_prepare() { +# # http://jira.codehaus.org/browse/CASTOR-2008 +# epatch "${FILESDIR}/1.1.1-jdk-1.4.patch" +#} + +# clean target is borked +# http://jira.codehaus.org/browse/CASTOR-2009 +EANT_BUILD_XML="src/build.xml" +EANT_GENTOO_CLASSPATH="ant-core" + +# Needs for example mockejb which is not packaged yet +#src_test() { +# cd "${S}"/src/ +# eant tests +#} + +src_install() { + cd dist + for jar in *.jar; do + java-pkg_newjar ${jar} ${jar//-${PV}} + done + cd .. + dodoc src/etc/CHANGELOG || die + java-pkg_register-ant-task + use source && java-pkg_dosrc */main/java/org + use doc && java-pkg_dojavadoc build/doc/javadoc + use examples && java-pkg_doexamples src/examples +} -- 2.26.2