diff options
author | Dylan Carlson <absinthe@gentoo.org> | 2004-02-25 18:19:21 +0000 |
---|---|---|
committer | Dylan Carlson <absinthe@gentoo.org> | 2004-02-25 18:19:21 +0000 |
commit | fcd8ccdb6cd176c4ee5f215cf805bad91084be0f (patch) | |
tree | e178faf6c0cdf75e624e6b27985adeb324e17087 /dev-java/fop-bin | |
parent | Broken on sparc, see bug 41329. (Manifest recommit) (diff) | |
download | gentoo-2-fcd8ccdb6cd176c4ee5f215cf805bad91084be0f.tar.gz gentoo-2-fcd8ccdb6cd176c4ee5f215cf805bad91084be0f.tar.bz2 gentoo-2-fcd8ccdb6cd176c4ee5f215cf805bad91084be0f.zip |
Fixed to avoid conflicts with dev-java/fop (the source build).
Diffstat (limited to 'dev-java/fop-bin')
-rw-r--r-- | dev-java/fop-bin/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/fop-bin/fop-bin-0.20.4.ebuild | 5 | ||||
-rw-r--r-- | dev-java/fop-bin/fop-bin-0.20.5.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-java/fop-bin/ChangeLog b/dev-java/fop-bin/ChangeLog index 1271e1d4de9f..ef48836102b2 100644 --- a/dev-java/fop-bin/ChangeLog +++ b/dev-java/fop-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/fop-bin # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/ChangeLog,v 1.4 2004/02/25 10:31:02 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/ChangeLog,v 1.5 2004/02/25 18:19:21 absinthe Exp $ + + 25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> fop-bin-0.20.4.ebuild, + fop-bin-0.20.5.ebuild: + Fixed to avoid conflicts with dev-java/fop (the source build). 25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> fop-bin-0.20.5.ebuild: added amd64 keyword. diff --git a/dev-java/fop-bin/fop-bin-0.20.4.ebuild b/dev-java/fop-bin/fop-bin-0.20.4.ebuild index a52bdbf2604e..163315fc4fd9 100644 --- a/dev-java/fop-bin/fop-bin-0.20.4.ebuild +++ b/dev-java/fop-bin/fop-bin-0.20.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/fop-bin-0.20.4.ebuild,v 1.6 2004/01/25 00:47:36 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/fop-bin-0.20.4.ebuild,v 1.7 2004/02/25 18:19:21 absinthe Exp $ MY_P=${P/-bin/} DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL" @@ -11,7 +11,8 @@ LICENSE="Apache-1.1" SLOT="0" KEYWORDS="x86" -DEPEND=">=virtual/jdk-1.4" +DEPEND=">=virtual/jdk-1.4 + !dev-java/fop" S=${WORKDIR}/${MY_P} diff --git a/dev-java/fop-bin/fop-bin-0.20.5.ebuild b/dev-java/fop-bin/fop-bin-0.20.5.ebuild index 72329b4c6b64..e3918356345d 100644 --- a/dev-java/fop-bin/fop-bin-0.20.5.ebuild +++ b/dev-java/fop-bin/fop-bin-0.20.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/fop-bin-0.20.5.ebuild,v 1.3 2004/02/25 10:31:02 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop-bin/fop-bin-0.20.5.ebuild,v 1.4 2004/02/25 18:19:21 absinthe Exp $ MY_P=${P/-bin/} DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL" @@ -11,7 +11,8 @@ LICENSE="Apache-1.1" SLOT="0" KEYWORDS="x86 amd64" -DEPEND=">=virtual/jdk-1.4" +DEPEND=">=virtual/jdk-1.4 + !dev-java/fop" S=${WORKDIR}/${MY_P} |