From 65403a970da4d0195fdab666285092f47fef325d Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 15 Aug 2007 09:20:12 +0000 Subject: Add block to <=dev-java/kaffe-1.1.7-r5 to ensure kaffe is upgraded first and there are no file collisions, bug #188542. Package-Manager: portage-2.1.3.5 --- app-arch/fastjar/ChangeLog | 6 +++++- app-arch/fastjar/Manifest | 16 ++++++++-------- app-arch/fastjar/fastjar-0.95.ebuild | 5 +++-- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'app-arch/fastjar') diff --git a/app-arch/fastjar/ChangeLog b/app-arch/fastjar/ChangeLog index 6d8e0a57481e..18e76efe304d 100644 --- a/app-arch/fastjar/ChangeLog +++ b/app-arch/fastjar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/fastjar # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/fastjar/ChangeLog,v 1.5 2007/08/14 18:07:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/fastjar/ChangeLog,v 1.6 2007/08/15 09:20:12 caster Exp $ + + 15 Aug 2007; Vlastimil Babka fastjar-0.95.ebuild: + Add block to <=dev-java/kaffe-1.1.7-r5 to ensure kaffe is upgraded first and + there are no file collisions, bug #188542. 14 Aug 2007; Markus Rothe fastjar-0.95.ebuild: Added ~ppc64; bug #188082 diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest index b4893c12b1fe..2d85bc952059 100644 --- a/app-arch/fastjar/Manifest +++ b/app-arch/fastjar/Manifest @@ -4,14 +4,14 @@ EBUILD fastjar-0.94.ebuild 555 RMD160 05c5b81298c0705a288ee6dc0c09c78b0d1bc180 S MD5 54f3ebf1027aeb6dc68491a0f8df1dc0 fastjar-0.94.ebuild 555 RMD160 05c5b81298c0705a288ee6dc0c09c78b0d1bc180 fastjar-0.94.ebuild 555 SHA256 929336f81d3bccad276f58ad7eda44a3ef6fe997afc603ec4067df6e7987b2f6 fastjar-0.94.ebuild 555 -EBUILD fastjar-0.95.ebuild 607 RMD160 9f55b47eb2399748e1add87eabcb29fb2dccc9a1 SHA1 cddc9c54e30e6607cac2bb44543f675ea96bdfdb SHA256 a7d5588b16d71113b47f308651657e8bd314576eb21e99c3410217ee3e98a8f8 -MD5 f936169a38b52c63dc5109ee35407fc5 fastjar-0.95.ebuild 607 -RMD160 9f55b47eb2399748e1add87eabcb29fb2dccc9a1 fastjar-0.95.ebuild 607 -SHA256 a7d5588b16d71113b47f308651657e8bd314576eb21e99c3410217ee3e98a8f8 fastjar-0.95.ebuild 607 -MISC ChangeLog 895 RMD160 c010ca7abc4298f47cd1ac964630368012744cfd SHA1 deafec6493a3da7d1ea4d60bf84f4c5a746c1633 SHA256 d79f8093270209b98ec41fe67479a4edecad4fe3372cf0b9c43dff43ebd6ae27 -MD5 a9c2b51d088e8624d47d7da172744e59 ChangeLog 895 -RMD160 c010ca7abc4298f47cd1ac964630368012744cfd ChangeLog 895 -SHA256 d79f8093270209b98ec41fe67479a4edecad4fe3372cf0b9c43dff43ebd6ae27 ChangeLog 895 +EBUILD fastjar-0.95.ebuild 646 RMD160 cc7bda8fd392542fe57ed1b64a1483c1d27619fb SHA1 e70657f49f785837dcbbaaecda9cb4eac1b1fead SHA256 19574a9abfbc634240501f12a55149ba1074a56cfc09ab26aa037e21a5efba94 +MD5 f58239313297412ea913d50a63c0eb38 fastjar-0.95.ebuild 646 +RMD160 cc7bda8fd392542fe57ed1b64a1483c1d27619fb fastjar-0.95.ebuild 646 +SHA256 19574a9abfbc634240501f12a55149ba1074a56cfc09ab26aa037e21a5efba94 fastjar-0.95.ebuild 646 +MISC ChangeLog 1091 RMD160 c12c39158a404b160e81e39b75ac045ccb5a75e8 SHA1 2c1f32a844d37df650bb4482ff8a40110518b88a SHA256 4a429595d3ede58a8773d7f7f44f443e13828f2ac2e65e61b48cab9021e72e88 +MD5 0c3915e6427f66a479801bc138316cf9 ChangeLog 1091 +RMD160 c12c39158a404b160e81e39b75ac045ccb5a75e8 ChangeLog 1091 +SHA256 4a429595d3ede58a8773d7f7f44f443e13828f2ac2e65e61b48cab9021e72e88 ChangeLog 1091 MISC metadata.xml 400 RMD160 1c51d317ff2b35d491b1e9030a20202e62d766e5 SHA1 2ad18d4b562e8507cd7ed9090b90892eb235fb06 SHA256 31fed5bfe5c4eacb486b5dcc494bd450fe6e39642c2940d5a8fb41c879bb91ee MD5 1c78f432ff8d4b3ac1919f54f50d4797 metadata.xml 400 RMD160 1c51d317ff2b35d491b1e9030a20202e62d766e5 metadata.xml 400 diff --git a/app-arch/fastjar/fastjar-0.95.ebuild b/app-arch/fastjar/fastjar-0.95.ebuild index ce5dfb6e7c26..b58dec7634b0 100644 --- a/app-arch/fastjar/fastjar-0.95.ebuild +++ b/app-arch/fastjar/fastjar-0.95.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/fastjar/fastjar-0.95.ebuild,v 1.2 2007/08/14 18:07:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/fastjar/fastjar-0.95.ebuild,v 1.3 2007/08/15 09:20:12 caster Exp $ DESCRIPTION="A jar program written in C" HOMEPAGE="https://savannah.nongnu.org/projects/fastjar" @@ -12,7 +12,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" -RDEPEND="" +# bug #188542 +RDEPEND="!<=dev-java/kaffe-1.1.7-r5" DEPEND="" src_install() { -- cgit v1.2.3-65-gdbad