summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-12-25 19:22:45 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-12-25 19:22:45 +0000
commitf2373ba1c474313e9abc8fc528b54073786297fb (patch)
treef156572e0323da0986d43a6e24aae865df68b4c1 /dev-java/commons-jelly
parentStable on SPARC. (diff)
downloadhistorical-f2373ba1c474313e9abc8fc528b54073786297fb.tar.gz
historical-f2373ba1c474313e9abc8fc528b54073786297fb.tar.bz2
historical-f2373ba1c474313e9abc8fc528b54073786297fb.zip
taking over the world
Package-Manager: portage-2.1_pre2
Diffstat (limited to 'dev-java/commons-jelly')
-rw-r--r--dev-java/commons-jelly/Manifest14
-rw-r--r--dev-java/commons-jelly/commons-jelly-1.0.ebuild10
-rw-r--r--dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch3
3 files changed, 7 insertions, 20 deletions
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index 9c3cdd81d61f..c859f9460ae2 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 2efbc5efe22c0c646235d26d5102b5d8 ChangeLog 418
-MD5 bab81401803b22e3c66cd1cc5c25afdd commons-jelly-1.0.ebuild 1947
-MD5 02f70aa727e825f409b2893f3f165bc4 files/commons-jelly-1.0-gentoo.patch 2371
+MD5 cdf1bf611c80525d276bfe06d465e7d7 commons-jelly-1.0.ebuild 1913
+MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224
MD5 b8e360e5058c49cde7c1a2b1e7d09542 files/digest-commons-jelly-1.0 73
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrL94ndWRXhKOboURAlcLAJ9H5Y0sKrSfjDxd82a/QH8MBA2wmwCdFvly
-CakdcucDgFv2Ng2qgBMxK9Q=
-=RCVw
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-jelly/commons-jelly-1.0.ebuild b/dev-java/commons-jelly/commons-jelly-1.0.ebuild
index 4e708e76033d..c106a9ce1809 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0.ebuild,v 1.1 2005/12/24 02:24:06 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0.ebuild,v 1.2 2005/12/25 19:22:45 axxo Exp $
inherit java-pkg eutils
@@ -14,7 +14,8 @@ SLOT="1"
KEYWORDS="~x86"
IUSE="doc jikes junit source"
-COMMON_DEPS="~dev-java/servletapi-2.3
+RDEPEND=">=virtual/jre-1.4
+ ~dev-java/servletapi-2.3
=dev-java/commons-cli-1*
dev-java/commons-lang
dev-java/commons-discovery
@@ -26,6 +27,7 @@ COMMON_DEPS="~dev-java/servletapi-2.3
=dev-java/dom4j-1*
=dev-java/jaxen-1.1*
=dev-java/xerces-2*"
+
DEPEND=">=virtual/jdk-1.4
dev-java/ant-core
jikes? ( dev-java/jikes )
@@ -34,9 +36,7 @@ DEPEND=">=virtual/jdk-1.4
dev-java/ant-tasks
dev-java/commons-logging
)
- ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPS}"
+ ${RDEPEND}"
S=${WORKDIR}/${MY_P}
diff --git a/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch b/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
index cf12b4826e19..8fafca81ea79 100644
--- a/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
+++ b/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
@@ -1,4 +1,3 @@
-Only in commons-jelly-1.0-src-patched/: .build.xml.swp
diff -ru commons-jelly-1.0-src/build.xml commons-jelly-1.0-src-patched/build.xml
--- commons-jelly-1.0-src/build.xml 2005-06-16 10:39:44.000000000 -0400
+++ commons-jelly-1.0-src-patched/build.xml 2005-09-04 19:39:19.000000000 -0400
@@ -58,5 +57,3 @@ diff -ru commons-jelly-1.0-src/build.xml commons-jelly-1.0-src-patched/build.xml
-</project>
\ No newline at end of file
+</project>
-Only in commons-jelly-1.0-src-patched/: dist
-Only in commons-jelly-1.0-src-patched/: target