summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Carlson <absinthe@gentoo.org>2003-04-07 16:02:35 +0000
committerDylan Carlson <absinthe@gentoo.org>2003-04-07 16:02:35 +0000
commit64442c5d20bcd9f35c4a1179d6b4496ed0dcf7bf (patch)
treec3a2d42530e4b043b70771e12ce14a6f54342788 /dev-java/commons-dbcp
parentFixed digest. (diff)
downloadhistorical-64442c5d20bcd9f35c4a1179d6b4496ed0dcf7bf.tar.gz
historical-64442c5d20bcd9f35c4a1179d6b4496ed0dcf7bf.tar.bz2
historical-64442c5d20bcd9f35c4a1179d6b4496ed0dcf7bf.zip
Patching build.xml to properly find MANIFEST and fixing digests.
Diffstat (limited to 'dev-java/commons-dbcp')
-rw-r--r--dev-java/commons-dbcp/ChangeLog6
-rw-r--r--dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild3
-rw-r--r--dev-java/commons-dbcp/files/commons-dbcp-1.0-gentoo.diff11
-rw-r--r--dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r23
4 files changed, 20 insertions, 3 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index 52bb94b6191d..cda5b229e19d 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for dev-java/commons-dbcp
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.5 2003/04/06 07:58:02 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.6 2003/04/07 16:02:35 absinthe Exp $
*commons-dbcp-1.0-r2 (06 Apr 2003)
+ 07 Apr 2003; Dylan Carlson <absinthe@gentoo.org> commons-dbcp-1.0-r2.ebuild,
+ files/commons-dbcp-1.0-gentoo.diff:
+ Fix to patch build.xml (thanks to lord in Gentoo Forums) and digest.
+
06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> commons-dbcp-1.0-r1.ebuild,
commons-dbcp-1.0-r1.ebuild, commons-dbcp-1.0-r2.ebuild,
commons-dbcp-1.0.ebuild, commons-dbcp-1.0.ebuild:
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
index fba91d927484..6f6ed9f5c506 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild,v 1.1 2003/04/06 07:58:02 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild,v 1.2 2003/04/07 16:02:35 absinthe Exp $
inherit jakarta-commons
@@ -20,6 +20,7 @@ KEYWORDS="x86 ppc sparc"
IUSE="doc jikes"
src_compile() {
+ epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff
echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
echo "commons-pool.jar=`java-config --classpath=commons-pool`" >> build.properties
cp LICENSE.txt ../LICENSE
diff --git a/dev-java/commons-dbcp/files/commons-dbcp-1.0-gentoo.diff b/dev-java/commons-dbcp/files/commons-dbcp-1.0-gentoo.diff
new file mode 100644
index 000000000000..b6ddabefb11e
--- /dev/null
+++ b/dev-java/commons-dbcp/files/commons-dbcp-1.0-gentoo.diff
@@ -0,0 +1,11 @@
+--- build.xml.orig 2003-04-07 11:52:18.000000000 -0400
++++ build.xml 2003-04-07 11:54:05.000000000 -0400
+@@ -282,7 +282,7 @@
+ <patternset refid="patternset-non-test-classes"/>
+ </fileset>
+ </copy>
+- <jar jarfile="${dest.jardir.jar}" manifest="${dest.conf}/MANIFEST.MF">
++ <jar jarfile="${dest.jardir.jar}" manifest="${source.src.conf}/MANIFEST.MF">
+ <fileset dir="${workdir}"/>
+ </jar>
+ <delete dir="${workdir}"/>
diff --git a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2 b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2
index 71aa2b2d168e..1e537321bb28 100644
--- a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2
+++ b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2
@@ -1,2 +1,3 @@
-MD5 9e8ad2e9a15157c7d8b359791c170e85 /commons-dbcp-1.0-r2.ebuild 1094
+MD5 8d3d0c335ace48bb40d643d0c6d275fb /files/commons-dbcp-1.0-gentoo.diff 472
+MD5 9fb768028f8c03e9f83f546aa039f144 /commons-dbcp-1.0-r2.ebuild 1138
MD5 85305821547f060fb6090f022c33e5f9 commons-dbcp-1.0-src.tar.gz 88939