From 26658eeada9fe05d8f0300a8936e9573f2aea5ad Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Tue, 16 Feb 2016 21:07:47 +0000
Subject: dev-java/commons-dbcp: Remove old

This allows us to kill off Java 6.

Package-Manager: portage-2.2.27
---
 dev-java/commons-dbcp/Manifest                   |  1 -
 dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild | 55 ------------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild

diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 644dfb9bd3ec..bd819385ed83 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,2 +1 @@
-DIST commons-dbcp-1.4-src.tar.gz 932507 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283 SHA512 70f32ea36bae46290dc376e6040539562de98906810bd4e1985667c336e6215dc5536278000fee5d9f200cc4b97ea0a6cff74a871e962b61203741814a9c5e7b WHIRLPOOL c917bd417d95e7fc2448c87d949f440ad829ea794b943e707a23154fafaf9eeccaa2900ae7ccb27cf03c56d7e0727177e56c47f157ee85ab1be7c67d18702b26
 DIST commons-dbcp2-2.1-src.tar.gz 580017 SHA256 e1a75021dc3a5314cfa0a0c65bf0bf3d8f95a289b833cf5e391149cf29367708 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d WHIRLPOOL d4efd240eae5d891c98ad3a2fa76756fabdfa93bc17ec9d4e0b046f6dcb8e61579acfb899f338131472960aaddf25457d3a82ca00486242097319e9f7617462a
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
deleted file mode 100644
index 661b176c5e98..000000000000
--- a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jakarta component providing database connection pooling API"
-HOMEPAGE="http://commons.apache.org/dbcp/"
-SRC_URI="mirror://apache/commons/dbcp/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-pool:0
-	java-virtuals/transaction-api:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_BUILD_TARGET="build-jar"
-EANT_GENTOO_CLASSPATH="commons-pool,transaction-api"
-
-src_test() {
-	# depend on not packaged geronimo #348853
-	rm -v src/test/org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java || die
-	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSource.java || die
-	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java || die
-
-	# fails :(
-	rm -v src/test/org/apache/commons/dbcp/TestJndi.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}*.jar
-	dodoc README.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-- 
cgit v1.2.3-65-gdbad