summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Carlson <absinthe@gentoo.org>2003-04-30 13:58:33 +0000
committerDylan Carlson <absinthe@gentoo.org>2003-04-30 13:58:33 +0000
commit0cdba31b77cff13aece4babc6a94c232f0c23dee (patch)
treee10e8337c81b12c873951da25a9984c57a459835 /net-www/resin
parentresin and resin-ee now block each other. (diff)
downloadgentoo-2-0cdba31b77cff13aece4babc6a94c232f0c23dee.tar.gz
gentoo-2-0cdba31b77cff13aece4babc6a94c232f0c23dee.tar.bz2
gentoo-2-0cdba31b77cff13aece4babc6a94c232f0c23dee.zip
resin and resin-ee now block each other.
Diffstat (limited to 'net-www/resin')
-rw-r--r--net-www/resin/ChangeLog5
-rw-r--r--net-www/resin/Manifest4
-rw-r--r--net-www/resin/resin-2.1.9.ebuild3
3 files changed, 8 insertions, 4 deletions
diff --git a/net-www/resin/ChangeLog b/net-www/resin/ChangeLog
index ba53b7bb4b7f..72d60187a15e 100644
--- a/net-www/resin/ChangeLog
+++ b/net-www/resin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-www/resin
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/resin/ChangeLog,v 1.1 2003/04/30 13:17:37 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/ChangeLog,v 1.2 2003/04/30 13:58:29 absinthe Exp $
+
+ 30 Apr 2003; Dylan Carlson <absinthe@gentoo.org> resin-2.1.9.ebuild:
+ With the addition of resin-ee, the two are now set to block each other.
*resin-2.1.9 (30 Apr 2003)
diff --git a/net-www/resin/Manifest b/net-www/resin/Manifest
index 821b0514a6db..69d3281d5ba6 100644
--- a/net-www/resin/Manifest
+++ b/net-www/resin/Manifest
@@ -1,5 +1,5 @@
-MD5 bd50e905796e02dfce57f0c4bb6d04a8 ChangeLog 612
-MD5 b0c70a22d97321e3584140a465ff3c4d resin-2.1.9.ebuild 3559
+MD5 42b2aaf3c596fcdc3b1b353874ad1f9a ChangeLog 758
+MD5 afc25c37373ecab149dbdd11595b613a resin-2.1.9.ebuild 3559
MD5 5837c42d665786c9555b544428725ff6 files/digest-resin-2.1.9 64
MD5 61545d3923eb43c48bd061ab224875d3 files/2.1.9/resin.conf 1237
MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.9/resin.diff 504
diff --git a/net-www/resin/resin-2.1.9.ebuild b/net-www/resin/resin-2.1.9.ebuild
index e24793744091..8f1acc84977e 100644
--- a/net-www/resin/resin-2.1.9.ebuild
+++ b/net-www/resin/resin-2.1.9.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/net-www/resin/resin-2.1.9.ebuild,v 1.2 2003/04/30 13:26:01 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-2.1.9.ebuild,v 1.3 2003/04/30 13:58:29 absinthe Exp $
inherit java-pkg
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.caucho.com"
KEYWORDS="~x86 ~ppc ~sparc"
LICENSE="CAUCHO"
SLOT="0"
+DEPEND="!net-www/resin-ee"
RDEPEND=">=virtual/jdk-1.2"
pkg_setup() {