Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

5 files changed, 57 insertions, 148 deletions

diff --git a/dev-java/jackson-annotations/ChangeLog b/dev-java/jackson-annotations/ChangeLog
index f3924e29f8ba..a7f16c35e0d4 100644
--- a/dev-java/jackson-annotations/ChangeLog
+++ b/dev-java/jackson-annotations/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jackson-annotations
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/ChangeLog,v 1.1 2014/01/12 18:26:21 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/ChangeLog,v 1.2 2015/03/04 23:20:10 chewi Exp $
+
+*jackson-annotations-2.5.1 (04 Mar 2015)
+
+  04 Mar 2015; James Le Cuirot <chewi@gentoo.org>
+  +jackson-annotations-2.5.1.ebuild, -files/2.3.0-build.xml,
+  -jackson-annotations-2.3.0.ebuild:
+  Version bump.
 
 *jackson-annotations-2.3.0 (12 Jan 2014)
 
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 619ce288a731..325009921899 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2.3.0-build.xml 4552 SHA256 adac7635820206130910950a835be4ed5162d29216134084918059b3d2517679 SHA512 e4c0d5ab73125aa5d39873a175eadb01c26f5fb7bf1f9280028411988e44f6ce4d1ed4b3853bd913b0e6f3acf68cbe187af92e7f0c94783f27fcdeca2ab49e8c WHIRLPOOL 8858a5b711747d33f3d85ddd8ff8da7cb621d27b7b6db06bece33ef32138cb374c89f5d0c9788392c0fab8804afc79efeca6cdfb33b430b245cc796e5d12dd92
-DIST jackson-annotations-2.3.0.tar.gz 25784 SHA256 31075d438e9c289b88949c599eb117bf0df7be1b32a821cf9bcef85a94f38f54 SHA512 533c0a798e79d89395e803bb96cf3bc8d21ddbe9a1c35194350e3f61d1fe1b85683cbb6cd7d80c42ac014007cc86ac54a3c6702e55eeebebf359cf2c66254499 WHIRLPOOL 2079e689f3bc795e96bdfc88643c82901e09e6e288b36945b463e5f1c5b4df54d70b99d4898d2108abf29ea5e6628bde9ee6e913e5b0fa2e45d297550229b1bf
-EBUILD jackson-annotations-2.3.0.ebuild 866 SHA256 05073e2507dae08c31bf7f37baeed7680aa505d6113eb1cf31245829af82b450 SHA512 d251032d6c4d9c9af9e67196c84a62faf7a70c1a61355bdc2c60d77d24667258d282a54570be286db1174eebf07e16cdec135c13686df5b36eb6fa969079d8ae WHIRLPOOL aa0730f34ea0a02a4094f72918caa16c0a9654f05ddf60ac476b5e6821210a47ac2f87e1594a144e5fde2587053eaef5d68fc5ce6e69b5be815f7f743e3927f9
-MISC ChangeLog 458 SHA256 479dd021db9a3e188fbd08b3f4557f26f3a1dd591ddf11cc5838e42066ea5427 SHA512 d61e724aa1f09d7c98eaa794fc66882abf8433f1fe05bf944decd0c68f3f1addd352712b5e741d8f939ef8168b8a8ca32da4fd7cbf20f27571e93ac648300d5a WHIRLPOOL 1bfd10c1ce3f8e68899f452b6fdfe5873707fa3e50382fc7946625c65fb6cc457ed5d992e1db2d89738079ac9970024f3ff86fda4da8dfc65d53950c921812f2
+DIST jackson-annotations-2.5.1.tar.gz 30360 SHA256 420d3ec38878c63d674500878539d1f32917e3aac1b9d53461020c01629d9f18 SHA512 3ff90be8927db847379371c5997a7f37bd55b368cd884b50913f454c704e10ac7819072409533cc6b8441dcb239c3694332ae8e800590d2b9c6701cccdc65364 WHIRLPOOL 04a484acf05db44e599da61388b288e5a9f9fff7289740d8620d8b4b1b6201fa4bc3722c5266904b28ab97caca84e7a4bcb67864c1b52b91ba96bc0c92ad3ef5
+EBUILD jackson-annotations-2.5.1.ebuild 762 SHA256 ce71788330721f73366556f41129d69bbe1d925a7f20cf088ddb5fb14e687ca2 SHA512 4d83bf0c8a14d3d484ad915ee21130a4ace1602c61d4dafaed73aeaa8da0f4e8ead8d2891bb43b098aa083cdc2c7141ad93088841780298e2945e6b4eb34f245 WHIRLPOOL 6a69e23288a9569425e3ffa53a7941650a64545921e5ebc1756775cfae4142f83291cdf105f7170390bdf04ae0624d110601aadf0b73e9390aa50a073436b232
+MISC ChangeLog 665 SHA256 987fbddf16bb3d250184bd7348c6298181b473defb98caaf2c0c9684d3e7514b SHA512 8f7bf5ae9911716dba1f885962eb0ed80aacd28a59086c0e809009a8c529aa5eac8c523c569e8b12c08a0452f0f23dfbb5508e406cc5272fe77db5f3f1352f96 WHIRLPOOL 9e24e1d723179e904fdd04c0dbca44acc9c5944cb2146852e9475ac59ba22cadb7921bb2651ea4923c0edeb12fdad99475447ddf16b481ef5554eef9bca4dbd5
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJS0t5SAAoJEKCEBkJ3xQHtPBkH/0yr9eRDcBl1G8frVG7Px9i2
-bcljBFng/GvahIV6AxBruZxOWwRapbmk8dpEgRDCOO8TKsVp1pyrVCD6M+Ux2u0h
-G9npk3Ov+jv+od4xr4CRzcMIE4u49zlRw2ti3AZkBbDzYU2B8YhSxYs1eczG8n4C
-Ojp36WdxqdU02h6ejLU7PD7x3bmOXP5Ui+/qxqvIGgRNNjTnpwtjooQEVSCMRx/G
-PfZ1Q/h8Cj3+8U+Pd4zIaIgNKavd8TCmEQ+9LaJxaXMjYHT6c0YX89U1Rk0RntDM
-8XCajU3imNIy+FBjEeyojtuOofTTC5nbe75ZL4mb3WbyF3nlbZ1mgYctUJdnVi0=
-=j9Su
+iQJ8BAEBCABmBQJU95MwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3krEcP/284e8uq93rbqGehP0Rb4E5Z
+QeC6p54m0a2C8De4Bei60Db1M1Lm4okJuilopC+pw5oV+88lbsqvwtjdL8sP3hG5
+2tv8AQs2skiwShecrftKDynxbm38zxCnS7AWXwtZD0OkF/dqd2d6dyI+xWN3yoy/
+7uDmggw7AYIGqLnfJCQl5QPg0Kut0XKStDPwKotfXBX5IE2H9VXKuo3j2s5ujas+
+9UTA77AuQwWPeD1ngil5twcXZ9v74SzepFZwd9N5iAgQI5To9wJCHHbse/GdGR0i
+zDGDel6wAqBAOVwIH/lNlRV5Z825FAlc5VXgxJemfIkje9+lo1cm9Wx08Kfjht1Y
+AXsO3NWGz52Sbl2DG5xwqNxdbvSDVSR7qyk2vdD6NLDKYY6pQ9OsjL70Em8PY2o0
+l6qP+2r64aMO9sRO4VcmevL56CBScKf3ewvvKUfhU3dL3fCFsOLxiOg7KpRVl2w9
+YXrWN7PnXvK/HBu9jr4xYiebBIU4lodWy8eQnK31Ktm+j+D5JQwf/kjm6IyNtlUS
+LTfYeFK3IWDpwXR93jLPFbfFXBORfmpWCmyg/IbLcOv5eliLCAnE7dT7/lVn8Dc0
+jB8swSbX6C98QOYu523//9sfaP55ZnKBBFc696JbKHEyu2Y9c3mipxNpm0Xz96YH
+ycAaCaXv4HqI9S7A2U8q
+=LMVB
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jackson-annotations/files/2.3.0-build.xml b/dev-java/jackson-annotations/files/2.3.0-build.xml
deleted file mode 100644
index ce8ae1e304ec..000000000000
--- a/dev-java/jackson-annotations/files/2.3.0-build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="jackson-annotations" default="jar" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="${ant.project.name}" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath">
-	</path>
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-	</target>
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.0}" />
-		</copy>
-	</target>
-
-	<target name="test" depends="compile-tests" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/*Abstract*Test.java" />
-					<exclude name="**/BaseTest.java" />
-					<exclude name="**/ConcurrencyReadTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/*Abstract*Test.java" />
-					<exclude name="**/BaseTest.java" />
-					<exclude name="**/ConcurrencyReadTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="UTF-8" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.6" linksource="false" breakiterator="false" maxmemory="1g">
-		</javadoc>
-	</target>
-
-	<target name="jar" depends="compile" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-
-</project>
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.3.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.3.0.ebuild
deleted file mode 100644
index ec81446545ca..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/jackson-annotations-2.3.0.ebuild,v 1.1 2014/01/12 18:26:21 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="http://jackson.codehaus.org"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs/
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild
new file mode 100644
index 000000000000..976e45bfe456
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild,v 1.1 2015/03/04 23:20:10 chewi Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/VERSION
+}