commit: c20af1adfcbe2ee048f50e43b6993c76d3dff5c0
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 22:16:09 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 22:22:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20af1ad
dev-java/jackson-databind: Remove old 2.5.{1,2}
Package-Manager: portage-2.3.2
dev-java/jackson-databind/Manifest | 2 -
dev-java/jackson-databind/files/real-cglib.patch | 29 ----------
.../jackson-databind-2.5.1-r1.ebuild | 66 ----------------------
.../jackson-databind/jackson-databind-2.5.2.ebuild | 66 ----------------------
4 files changed, 163 deletions(-)
diff --git a/dev-java/jackson-databind/Manifest
b/dev-java/jackson-databind/Manifest
index fb9edbd..2975826 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,3 +1 @@
-DIST jackson-databind-2.5.1.tar.gz 914121 SHA256
7673a6650d4cd353d3dadfea0afaae30e33a9416550c21772a16ecf36fca1fee SHA512
72792495612143a4601999036a40b67658df5af43c8dde1408c48d4b19581b770442f36bf448a22e19fbc31dbaec2e4cae61b5c7ee7c6c939478083ce1e24131
WHIRLPOOL
92a0fd63e1cdc03da89c024c60c1f6cd2134800d749945daecf2568f1b40db94c83641d6d6219f2d4d70425a8d07d191be39e18b07af9fe0176e1bcc595fde06
-DIST jackson-databind-2.5.2.tar.gz 919612 SHA256
960c0fedccf88d89affc6004e8b93200cfe56bff8e056f0346aad992a33c9492 SHA512
28aa0759de0d8936209425cade805299dca84707fa1d1a641289eff4f735617aa06d8dfab0deb5a2d177ec533ed9ceb3d85dc26dbcbed24155272351018ce19a
WHIRLPOOL
817a58345277aabd4a6759d1bda3ab477987879a287e7ad39a292d5f92bc53328e19f1bf1ab14d77262123af44cab7aacdab8784cdd50925142b72f563d4e829
DIST jackson-databind-2.8.5.tar.gz 1093933 SHA256
375f20c52fef47473c1b5ef414ebb5f1a38abbe69592d6193657a84709641d1c SHA512
6935b469804fc14a5d2e562c80449c4e3368256358b8ed2a0d5a0bf2bcea47385ef19a708b94f25e450f42f6f70e868d6fc79f22cdc2fb6f88a4faf35bfc3cb7
WHIRLPOOL
ced41007e87cd9d7b65e6421a5d2a8299ab87ad0ec333b3426e075e42e4b7fab10693f62eaa3b7718f704a3be347dbce24b56be5764dbe9b90a6cf6c46825223
diff --git a/dev-java/jackson-databind/files/real-cglib.patch
b/dev-java/jackson-databind/files/real-cglib.patch
deleted file mode 100644
index 15b7a65..00000000
--- a/dev-java/jackson-databind/files/real-cglib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2dbcc7408ff1104b84a982a5cde77ef11bc0dd93 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <ch...@gentoo.org>
-Date: Wed, 4 Mar 2015 23:07:36 +0000
-Subject: [PATCH] Use the real cglib, not the repackaged version
-
----
- .../java/com/fasterxml/jackson/databind/interop/TestHibernate.java | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git
a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
-index 48dc573..b7d89b6 100644
---- a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
-+++ b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
-@@ -3,9 +3,9 @@ package com.fasterxml.jackson.databind.interop;
- import java.lang.reflect.Method;
- import java.util.*;
-
--import org.hibernate.repackage.cglib.proxy.Enhancer;
--import org.hibernate.repackage.cglib.proxy.MethodInterceptor;
--import org.hibernate.repackage.cglib.proxy.MethodProxy;
-+import net.sf.cglib.proxy.Enhancer;
-+import net.sf.cglib.proxy.MethodInterceptor;
-+import net.sf.cglib.proxy.MethodProxy;
-
- import com.fasterxml.jackson.databind.*;
-
---
-2.0.4
-
diff --git a/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
b/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
deleted file mode 100644
index 1aca01e..00000000
--- a/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind";
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # 27/1306 failures :(
-
-CDEPEND="~dev-java/jackson-${PV}:${SLOT}
- ~dev-java/jackson-annotations-${PV}:${SLOT}"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}
- test? (
- dev-java/cglib:3
- dev-java/groovy:0
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${PN}-${P}/src"
-JAVA_SRC_DIR="main/java"
-JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
-
-java_prepare() {
- epatch "${FILESDIR}/real-cglib.patch"
-
- sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-databind:g' \
-
"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
- >
"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-
- # Requires newer JScience. Could be any class but they chose this!
- rm
"${S}/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java"
|| die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc ../README.md ../release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
- cd test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars
--with-dependencies cglib-2.2,groovy,junit-4,${JAVA_GENTOO_CLASSPATH})"
- local TESTS=$(find * -name "Test*.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-databind/jackson-databind-2.5.2.ebuild
b/dev-java/jackson-databind/jackson-databind-2.5.2.ebuild
deleted file mode 100644
index 1aca01e..00000000
--- a/dev-java/jackson-databind/jackson-databind-2.5.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind";
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # 27/1306 failures :(
-
-CDEPEND="~dev-java/jackson-${PV}:${SLOT}
- ~dev-java/jackson-annotations-${PV}:${SLOT}"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}
- test? (
- dev-java/cglib:3
- dev-java/groovy:0
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${PN}-${P}/src"
-JAVA_SRC_DIR="main/java"
-JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
-
-java_prepare() {
- epatch "${FILESDIR}/real-cglib.patch"
-
- sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-databind:g' \
-
"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
- >
"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-
- # Requires newer JScience. Could be any class but they chose this!
- rm
"${S}/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java"
|| die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc ../README.md ../release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
- cd test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars
--with-dependencies cglib-2.2,groovy,junit-4,${JAVA_GENTOO_CLASSPATH})"
- local TESTS=$(find * -name "Test*.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
