Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 496110 | Differences between
and this patch

Collapse All | Expand All

(-)commons-dbcp-1.4-r2.ebuild (-13 / +17 lines)
Lines 8-55 Link Here
8
8
9
inherit java-pkg-2 java-ant-2
9
inherit java-pkg-2 java-ant-2
10
10
11
MY_PN="${PN}2"
12
MY_PV="${PV%_*}"
13
MY_P="${MY_PN}-${MY_PV}-src"
14
11
DESCRIPTION="Jakarta component providing database connection pooling API"
15
DESCRIPTION="Jakarta component providing database connection pooling API"
12
HOMEPAGE="http://commons.apache.org/dbcp/"
16
HOMEPAGE="http://commons.apache.org/dbcp/"
13
SRC_URI="mirror://apache/commons/dbcp/source/${P}-src.tar.gz"
17
SRC_URI="mirror://apache/commons/dbcp/source/${MY_P}.tar.gz"
14
18
15
LICENSE="Apache-2.0"
19
LICENSE="Apache-2.0"
16
SLOT="0"
20
SLOT="0"
17
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
21
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
18
IUSE=""
22
IUSE=""
19
23
20
COMMON_DEP="
24
COMMON_DEP=">=dev-java/commons-logging-1.1.3
21
	dev-java/commons-pool:0
25
	>=dev-java/commons-pool-2.2
22
	java-virtuals/transaction-api:0"
26
	java-virtuals/transaction-api:0"
23
RDEPEND="${COMMON_DEP}
27
RDEPEND="${COMMON_DEP}
24
	>=virtual/jre-1.6"
28
	>=virtual/jre-1.7"
25
DEPEND="${COMMON_DEP}
29
DEPEND="${COMMON_DEP}
26
	virtual/jdk:1.6
30
	virtual/jdk:1.7
27
	test? ( dev-java/ant-junit:0 )"
31
	test? ( dev-java/ant-junit:0 )"
28
32
29
S="${WORKDIR}/${P}-src"
33
S="${WORKDIR}/${MY_P}"
30
34
31
JAVA_ANT_REWRITE_CLASSPATH="yes"
35
JAVA_ANT_REWRITE_CLASSPATH="yes"
32
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
36
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
33
37
34
EANT_BUILD_TARGET="build-jar"
38
EANT_BUILD_TARGET="build-jar"
35
EANT_GENTOO_CLASSPATH="commons-pool,transaction-api"
39
EANT_GENTOO_CLASSPATH="commons-logging,commons-pool,transaction-api"
36
40
37
src_test() {
41
src_test() {
38
	# depend on not packaged geronimo #348853
42
	# depend on not packaged geronimo #348853
39
	rm -v src/test/org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java || die
43
	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java || die
40
	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSource.java || die
44
	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java || die
41
	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java || die
45
	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java || die
42
46
43
	# fails :(
47
	# fails :(
44
	rm -v src/test/org/apache/commons/dbcp/TestJndi.java || die
48
	rm -v src/test/java/org/apache/commons/dbcp2/TestJndi.java || die
45
49
46
	java-pkg-2_src_test
50
	java-pkg-2_src_test
47
}
51
}
48
52
49
src_install() {
53
src_install() {
50
	java-pkg_dojar dist/${PN}*.jar
54
	java-pkg_newjar dist/${MY_PN}-${MY_PV}-SNAPSHOT.jar ${PN}.jar
51
	dodoc README.txt RELEASE-NOTES.txt
55
	dodoc README.txt RELEASE-NOTES.txt
52
56
53
	use doc && java-pkg_dojavadoc dist/docs/api
57
	use doc && java-pkg_dojavadoc dist/docs/api
54
	use source && java-pkg_dosrc src/java/*
58
	use source && java-pkg_dosrc src/main/java/*
55
}
59
}

Return to bug 496110