Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jackson-dataformat-xml/
Date: Sat, 26 Nov 2016 22:22:38
Message-Id: 1480198930.aee506975522af1ec217fd3108502754e29d5bb7.chewi@gentoo
1 commit: aee506975522af1ec217fd3108502754e29d5bb7
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 22:12:40 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 22:22:10 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee50697
7
8 dev-java/jackson-dataformat-xml: Remove old 2.5.{1,2}
9
10 Package-Manager: portage-2.3.2
11
12 dev-java/jackson-dataformat-xml/Manifest | 2 -
13 .../jackson-dataformat-xml-2.5.1.ebuild | 63 ----------------------
14 .../jackson-dataformat-xml-2.5.2.ebuild | 63 ----------------------
15 3 files changed, 128 deletions(-)
16
17 diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
18 index 6290dc4..46e9a57 100644
19 --- a/dev-java/jackson-dataformat-xml/Manifest
20 +++ b/dev-java/jackson-dataformat-xml/Manifest
21 @@ -1,3 +1 @@
22 -DIST jackson-dataformat-xml-2.5.1.tar.gz 90436 SHA256 e5281b076d11a689c485326a30eecd422c11c36578fcb344079ffbbe09f04aff SHA512 e780f28d650b843ab80710acd20ba67d74dc4c567633eb12e0b82102880bbd0d4cd2e9a0869587bb03a1038a1380076c174e04c7fdc1d1eaa2896bf36562967a WHIRLPOOL 8581d83343b09a009b9d9b0c3bb1e5f3e40e8c57a2dfd5eba7bdbd6804c52d2d1e35183995a7a6efcb61761843943f1231e0b61ef826d8d9190b216f4ca77f1a
23 -DIST jackson-dataformat-xml-2.5.2.tar.gz 90449 SHA256 bc74843a0dcebf36a2274b965d5fed73ffe42766861b171174945effdedcb457 SHA512 c9e7851749a7807f99c5f6fd8c0a8563a3607073f68aa8a366559ac6929d0f0e6808f8f0001626182ba3647b6f8baad12459246268d67c32885c957e1ce5c63f WHIRLPOOL 17f3b6fa867852365e7d9fa3e0a75bee60cd0729af2c6d26b5e8c5f756237e22f507d44e103f647803bd12f06471ff4f6830c39e2817cc69bf1ddd6eee4ddde7
24 DIST jackson-dataformat-xml-2.8.5.tar.gz 98385 SHA256 b28a3ebf380ce8eb6dbc48119fd827359519bd3e4311022983b595e572c92505 SHA512 ed93db9a44cacbe1638141b7336798ced03f7009da40e176b1eadcf38c83ac3bde3e2fa98efe3be1286a956db36393f925251b41a4adbc2b95d03ae6ef04b754 WHIRLPOOL 28ea218700c78e1b00f5eaea3b91d37cbcf3fc4aa602e410da1711ccd7070e347abc8ca2f2db809c3d8833fc8386a993e046b8de015e82421ff49ce60f107a83
25
26 diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild
27 deleted file mode 100644
28 index 5dd0c12..00000000
29 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild
30 +++ /dev/null
31 @@ -1,63 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="5"
37 -
38 -JAVA_PKG_IUSE="doc source"
39 -
40 -inherit java-pkg-2 java-pkg-simple
41 -
42 -DESCRIPTION="XML data format extension for Jackson"
43 -HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
44 -SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="2"
48 -KEYWORDS="~amd64"
49 -IUSE="test"
50 -RESTRICT="test" # Lots of failures, new Woodstox needed?
51 -
52 -CDEPEND="~dev-java/jackson-${PV}:${SLOT}
53 - ~dev-java/jackson-annotations-${PV}:${SLOT}
54 - ~dev-java/jackson-databind-${PV}:${SLOT}
55 - ~dev-java/jackson-module-jaxb-annotations-${PV}:${SLOT}
56 - dev-java/stax2-api:0"
57 -RDEPEND=">=virtual/jre-1.5
58 - ${CDEPEND}"
59 -DEPEND=">=virtual/jdk-1.5
60 - ${CDEPEND}
61 - test? (
62 - dev-java/hamcrest-core:1.3
63 - dev-java/junit:4
64 - )"
65 -
66 -S="${WORKDIR}/${PN}-${P}/src"
67 -JAVA_SRC_DIR="main/java"
68 -JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT},jackson-databind-${SLOT},jackson-module-jaxb-annotations-${SLOT},stax2-api"
69 -
70 -java_prepare() {
71 - sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
72 - -e "s:@projectversion@:${PV}:g" \
73 - -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
74 - -e 's:@projectartifactid@:jackson-dataformat-xml:g' \
75 - "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
76 - > "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
77 -}
78 -
79 -src_install() {
80 - java-pkg-simple_src_install
81 - dodoc ../README.md ../release-notes/{CREDITS,VERSION}
82 -}
83 -
84 -src_test() {
85 - cd test/java || die
86 -
87 - local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH})"
88 - local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
89 - TESTS="${TESTS//.java}"
90 - TESTS="${TESTS//\//.}"
91 -
92 - ejavac -cp "${CP}" -d . $(find * -name "*.java")
93 - ejunit4 -classpath "${CP}" ${TESTS}
94 -}
95
96 diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.2.ebuild
97 deleted file mode 100644
98 index 5dd0c12..00000000
99 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.2.ebuild
100 +++ /dev/null
101 @@ -1,63 +0,0 @@
102 -# Copyright 1999-2015 Gentoo Foundation
103 -# Distributed under the terms of the GNU General Public License v2
104 -# $Id$
105 -
106 -EAPI="5"
107 -
108 -JAVA_PKG_IUSE="doc source"
109 -
110 -inherit java-pkg-2 java-pkg-simple
111 -
112 -DESCRIPTION="XML data format extension for Jackson"
113 -HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
114 -SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
115 -
116 -LICENSE="Apache-2.0"
117 -SLOT="2"
118 -KEYWORDS="~amd64"
119 -IUSE="test"
120 -RESTRICT="test" # Lots of failures, new Woodstox needed?
121 -
122 -CDEPEND="~dev-java/jackson-${PV}:${SLOT}
123 - ~dev-java/jackson-annotations-${PV}:${SLOT}
124 - ~dev-java/jackson-databind-${PV}:${SLOT}
125 - ~dev-java/jackson-module-jaxb-annotations-${PV}:${SLOT}
126 - dev-java/stax2-api:0"
127 -RDEPEND=">=virtual/jre-1.5
128 - ${CDEPEND}"
129 -DEPEND=">=virtual/jdk-1.5
130 - ${CDEPEND}
131 - test? (
132 - dev-java/hamcrest-core:1.3
133 - dev-java/junit:4
134 - )"
135 -
136 -S="${WORKDIR}/${PN}-${P}/src"
137 -JAVA_SRC_DIR="main/java"
138 -JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT},jackson-databind-${SLOT},jackson-module-jaxb-annotations-${SLOT},stax2-api"
139 -
140 -java_prepare() {
141 - sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
142 - -e "s:@projectversion@:${PV}:g" \
143 - -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
144 - -e 's:@projectartifactid@:jackson-dataformat-xml:g' \
145 - "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
146 - > "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
147 -}
148 -
149 -src_install() {
150 - java-pkg-simple_src_install
151 - dodoc ../README.md ../release-notes/{CREDITS,VERSION}
152 -}
153 -
154 -src_test() {
155 - cd test/java || die
156 -
157 - local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH})"
158 - local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
159 - TESTS="${TESTS//.java}"
160 - TESTS="${TESTS//\//.}"
161 -
162 - ejavac -cp "${CP}" -d . $(find * -name "*.java")
163 - ejunit4 -classpath "${CP}" ${TESTS}
164 -}