Fixed dependency as per bug #503066. Updated copyright.

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

3 files changed, 107 insertions, 9 deletions

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index 0f4984d8bf35..0879d266d226 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.44 2014/02/07 15:38:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.45 2014/03/02 16:44:15 ercpe Exp $
+
+*jaxme-0.5.2-r1 (02 Mar 2014)
+
+  02 Mar 2014; Johann Schmitz <ercpe@gentoo.org> +jaxme-0.5.2-r1.ebuild:
+  Fixed dependency as per bug #503066. Updated copyright.
 
   07 Feb 2014; Tom Wijsman <TomWij@gentoo.org> -jaxme-0.3.1-r4.ebuild:
   Remove old.
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index b30b7ee60457..2d0fcc6af64c 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -5,17 +5,18 @@ AUX jaxme-0.3.1-base64.diff 1197 SHA256 47e26e354f17af945728c70ea5a5c715f7f373e4
 AUX jaxme-0.3.1-gentoo.patch 1771 SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa SHA512 ee947e5f0aa48158c3c11dd4cd371e524e2f185669c72cb4b9da3e09daf57a5668266e8c918b82bf27afee7d66ec9863d448ea0a69a9e62fd4424fbce3615f17 WHIRLPOOL 15f04a89b3f50c684baeb2f4c6f3f41b7442232e79dedb7313fd4d1ef988748a0d607a3b80f1089013b3c43389d0e86d5494c5e1e442faf3b7339f14281c265f
 AUX jaxme-0.5.2-fix_marshallers.patch 1600 SHA256 82f1474b8416a625577fa3e171e4922c24029da7ba513ca7ac8c47df802e1a33 SHA512 ed394565ab3fe55a3a70a925cb8a93e02499d3d800e8890a1b0c2fc0262fa9b5e77e0777e417f9b03ad047abfb64834af4d2130fcdaa12b75b5a1e4772224247 WHIRLPOOL 074dad08d29932d460280e0189d2666e4cb9521fa03b17be7e0241ab65b35c08d570a3002ea1dd707ad81dd61f3a0b6559d5cce33a88f8d8466e189b0386323d
 DIST ws-jaxme-0.5.2-src.tar.gz 5478402 SHA256 0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc SHA512 f41e0e66f8c017efb55a3d4e002caaf8e4978ca52fa2c66ed25daf8c22a0643d1865a8a7313b72326926cc08ae79d08136d662ae83a6e1cdc6eb4d9bc7fbacdc WHIRLPOOL b7815c1e7dbace025a8980a6e4571abfa6976f50fff988d7686f6c0e7c2316aeef47b5e788323298861d3218852b8c57f56ad4ec610b2ef4905471f644f11b22
+EBUILD jaxme-0.5.2-r1.ebuild 2643 SHA256 936ad7cf799947e8336e7214ace67ec121d36d8852bb2511b760df055e28c8fd SHA512 8cf83d10df67bc81fde6f49fa1dfbc4a0d02232b142bba6c53e846e3a693d2ce3e4ab74769648314c1861d3172a84c8a936cb2f5d7764554b9aa480724ac4f4b WHIRLPOOL 9f78228b8c0f6b1c88f2d9ce0ecb552f3ef6e8d631afa1153566bad64a5d5150e8fd0ffaa9fba8ed004322955da28b819db8e2699f2662fda2810e2877946698
 EBUILD jaxme-0.5.2.ebuild 2638 SHA256 7a7f594c0196068c33f8c51c8dc71a79a211f9cb944c877b2dc2b0dde8979dd1 SHA512 03a2014910fd738be5ef962f50d780f5ff76e69f0b6c6abde57839e291ff7b4fe33ee2cb6cc89a787a7b081548d84db39feda77a14fde65cf71caabb7530331d WHIRLPOOL 97e8dbd78440b4b3c26eaa69810b3ff33a86a423a0bcf4cb86a5bd365bd035075b773ed7c2d6a43f66016b1b10f6c57bed5d73adf5525b388e524c99088f9263
-MISC ChangeLog 5917 SHA256 fd99b292e3cb1339b49e7f6aa6b43f70589968c7b2e7503712a4a234c2e1d5be SHA512 31689c9aa44ca54712f5307d228708db258463accad74a6853f76bb1b8a6b0144227ad830446d4036c49692cfd4e31363bf05301c10e365b7de7881635d7c76f WHIRLPOOL c57cd56bf4f90be2fef39cfff3eba907b9cb003bf9e2667947d3b16ff65a6744e6b88318347630b97e8cc638d4d41424d52b713c7d695596370685a008327141
+MISC ChangeLog 6079 SHA256 a1d00584beeed6327db2dae355e7fad75f28dcbdb97a3e9251abddc86b2a1a9c SHA512 8e3328b756db8a84af271a3950d9dba2d8e311f63565f43ffc0abf2aa09399ad02ff2debddf64b8b87d5571d8f9be023a7c88791729cbcaa1622b6c4bce3f4b0 WHIRLPOOL d91e8e60c51a5a1616f7749d56f5072d785d93895e48f0b74e6183ccd87d493e208f60c0ffd78d6489b9a618312fd2d680e46556e2f7b3d4963746f0beaee7d2
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS9P2wAAoJEJWyH81tNOV9PWgIALQDwEyJSQw/ufUh4gUjFsjI
-s6815X4ATrWN0ImSjjUdEzWBSHKtkOmd1LQXbfhATaAZ7Me8XRg5TqmPqppgn7M/
-3dRv+LACkAoA1Wmj/TJUllzDNIm5vi1UF2f/feryBtT1xBqK/1Gm/7yUF2NU7F7G
-OKhLsQjWS8eVPnUZ3KE1OrPEoHDD/CJvdjko29TzTRZZ+b81hVWidGuw4rs7Rjot
-La7Sr6xetUEz6wm+8vBqexNrOFwiFsCOSPzc5W9OR6a422Cjmjnhv7Nc1w6oVtDu
-+QiUNljtB2b10T2bAHQyd0aqBFyqaiXEQC/L0d3Gu8JDY4/0+50He31cAKfDhfk=
-=EG4w
+iQEcBAEBCAAGBQJTE1/jAAoJEKCEBkJ3xQHtVjMIAIIyyNMFVJJ3iecp9Hk3ESuX
+9XWSRg9/d8DcmVhBfoI61olD+fQl5VoO3dFwpJ18deiPHRyo0O8G89ZFH3K47J3i
++fowtXJvQccAAFzu1BAFUUBOnx0eManWdxL9e3fBIw6KWnSG3MkjMVANLOB7GJ2J
+Kn3uI46AFUBmA9Qqh96oBHAnmMX3cP3KSxwBY74JtJJBWVBH1xyRDgE5/qhb78sx
+aY2JQ00Df8p8NXTg9LqFeZ/F0QQvAcvu/jZOrdm1xEs6e7+LOki2WNHVv38+7AJ3
+UZTsJS6r3GZkBM68c5nlaRRN5TRzfyN9/SkTv5KZ14skVmRBHC5GDPSkOx+fVBU=
+=0qQw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..5c80bbee6a87
--- /dev/null
+++ b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2-r1.ebuild,v 1.1 2014/03/02 16:44:15 ercpe Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN=ws-${PN}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding."
+HOMEPAGE="http://ws.apache.org/jaxme/index.html"
+SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/antlr:0[java]
+	>=dev-java/xerces-2.7
+	=dev-java/junit-3.8*
+	>=dev-java/log4j-1.2.8:0
+	dev-java/xmldb:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	dev-db/hsqldb:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+# We do it later
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	cd "${S}/prerequisites"
+	rm *.jar
+	java-pkg_jarfrom antlr
+	java-pkg_jarfrom junit
+	java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
+	java-pkg_jarfrom xerces-2
+	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
+	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
+	# no linking to it, should be used for tests only but used to generate stuff during build anyway
+	java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
+
+	# Special case: jaxme uses ant/*.xml files, so rewriting them by hand
+	# is better:
+	cd "${S}"
+	for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
+		java-ant_bsfix_one "${i}"
+	done
+
+	# Patch marshal classes to be abstract for build to succeed
+	epatch "${FILESDIR}/${P}-fix_marshallers.patch"
+}
+
+EANT_TEST_ANT_TASKS="hsqldb"
+
+src_compile() {
+	local ant_target="all"
+	local ant_args=""
+	if use doc; then
+		ant_args="-Dbuild.apidocs=dist/doc/api"
+		# The javadoc target depends on all so it is enough. Passing both results in two builds,
+		# where the second pass fails due to hsqldb lock - bug #310311.
+		ant_target="javadoc"
+	fi
+
+	eant ${ant_args} ${ant_target}
+}
+
+src_install() {
+	pushd dist > /dev/null
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar/-${PV}/}
+	done
+	popd > /dev/null
+
+	dodoc NOTICE || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api
+		dohtml -r src/documentation/manual
+	fi
+	use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
+}