From: Petteri Räty Date: Thu, 26 Apr 2007 20:24:03 +0000 (+0000) Subject: Fix RDEPEND. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4105fe4facb978daceabcb53a14bfd7083b0e0ff;p=gentoo.git Fix RDEPEND. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-java/openspml2/ChangeLog b/dev-java/openspml2/ChangeLog index 5b4a5e4fd7a0..d3e4fa79490f 100644 --- a/dev-java/openspml2/ChangeLog +++ b/dev-java/openspml2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/openspml2 -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/openspml2/ChangeLog,v 1.1 2006/09/11 14:15:02 nelchael Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/openspml2/ChangeLog,v 1.2 2007/04/26 20:24:03 betelgeuse Exp $ + + 26 Apr 2007; Petteri Räty + openspml2-1.0_rc2.ebuild: + Fix RDEPEND. *openspml2-1.0_rc2 (11 Sep 2006) diff --git a/dev-java/openspml2/Manifest b/dev-java/openspml2/Manifest index b7fb00e50a18..38cd04400530 100644 --- a/dev-java/openspml2/Manifest +++ b/dev-java/openspml2/Manifest @@ -6,14 +6,14 @@ MD5 c04ff951e216614881c3559a95a95b38 files/build.xml-1.0_rc2 488 RMD160 1bfdbd3fda6c716c0da14f19af88a68fd74e1b3d files/build.xml-1.0_rc2 488 SHA256 769f57b9a3599ebccd4b660a6bcd68c8e7501c9862189533343bfb49b86fa9a3 files/build.xml-1.0_rc2 488 DIST openspml_v2-1.0rc2.tgz 2068049 RMD160 f4df18e23e4b532f7b0664112ff99617dafb6f97 SHA1 4e33da4fedeea1e06d7481fb9b13be5e252af8f1 SHA256 52bdd3a783a151b05bb285f6682fc91edfa0edeb93acc1370f37be0d0ec46b85 -EBUILD openspml2-1.0_rc2.ebuild 1162 RMD160 70e857808987e3b2f27c0324d357da473c2e515d SHA1 78412a965f3fa3e9acb65b7faeff1e90fbac31b7 SHA256 14626ea6673ac320bd5eaa3be6f67850cd7a5429ebb158347551cc89e479fa65 -MD5 7af39defffa2ead2c62917a04949b497 openspml2-1.0_rc2.ebuild 1162 -RMD160 70e857808987e3b2f27c0324d357da473c2e515d openspml2-1.0_rc2.ebuild 1162 -SHA256 14626ea6673ac320bd5eaa3be6f67850cd7a5429ebb158347551cc89e479fa65 openspml2-1.0_rc2.ebuild 1162 -MISC ChangeLog 418 RMD160 836a7ebed9be63596511ba5b17720274fd89129c SHA1 cb9eb41e6e7cf547acbd53747f9f5f69a59851f8 SHA256 796a5eada4295b870564ba648131bf0a40f13df7d501ec34004054b6d0f7d79f -MD5 f2da797c101dea13fdd35a0748e85069 ChangeLog 418 -RMD160 836a7ebed9be63596511ba5b17720274fd89129c ChangeLog 418 -SHA256 796a5eada4295b870564ba648131bf0a40f13df7d501ec34004054b6d0f7d79f ChangeLog 418 +EBUILD openspml2-1.0_rc2.ebuild 1196 RMD160 f5b22a34ae47060198e842de32d558150fe570f1 SHA1 480b708905e46ff6ab4b7cbe0181cc9ae2bddf50 SHA256 257a406b8961cabba117a76553d797fd8779522227d4b58904e9ca8588d6fdab +MD5 56ebb6b1e00c35922f0ccc5dcba9b90a openspml2-1.0_rc2.ebuild 1196 +RMD160 f5b22a34ae47060198e842de32d558150fe570f1 openspml2-1.0_rc2.ebuild 1196 +SHA256 257a406b8961cabba117a76553d797fd8779522227d4b58904e9ca8588d6fdab openspml2-1.0_rc2.ebuild 1196 +MISC ChangeLog 517 RMD160 2e0b150badc8e828c4c49671e6f64cabf61e64cc SHA1 2c07891f13c9e75ef8077ab3d3ece2486ded18f6 SHA256 b03f2a4aa546d6f4ffc2b5e635f147047d47b9d35d03970e78d0451cf3078aae +MD5 e64f85ed409ba07e5ee1ac6347a46eb2 ChangeLog 517 +RMD160 2e0b150badc8e828c4c49671e6f64cabf61e64cc ChangeLog 517 +SHA256 b03f2a4aa546d6f4ffc2b5e635f147047d47b9d35d03970e78d0451cf3078aae ChangeLog 517 MISC metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 SHA1 37c1f64045f8874b69bb7dffd084e7f699c37678 SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d MD5 83f6bf68e595b0ec2e45d8e4b78c1f5a metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 metadata.xml 224 @@ -22,9 +22,9 @@ MD5 408a95d1d479e2876d40f02845cbd2b1 files/digest-openspml2-1.0_rc2 250 RMD160 b7d343755ee7bfd6ba49bd1dafe72959b2fdc875 files/digest-openspml2-1.0_rc2 250 SHA256 5a58bac6aa8757a4a7846e6d68b53464c9b32c45a51866781abd79cb54bba127 files/digest-openspml2-1.0_rc2 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFBW9ygo/w9rxVVVERAiBHAJwNb3NMg9x4zpKxa+j87juAS4LrhQCgmO5f -VICJAhRnaXUJwnuNCaIZrIE= -=JxhO +iD8DBQFGMQpjcxLzpIGCsLQRAqYcAJ4izDtQBQ8X6+UVU8iXoCjDSt8n2gCfdCEf +MdC+Eouseu0e2bd/laQa8Js= +=x1ns -----END PGP SIGNATURE----- diff --git a/dev-java/openspml2/openspml2-1.0_rc2.ebuild b/dev-java/openspml2/openspml2-1.0_rc2.ebuild index 2d9bf7c77319..1cf44d810a37 100644 --- a/dev-java/openspml2/openspml2-1.0_rc2.ebuild +++ b/dev-java/openspml2/openspml2-1.0_rc2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/openspml2/openspml2-1.0_rc2.ebuild,v 1.1 2006/09/11 14:15:02 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/openspml2/openspml2-1.0_rc2.ebuild,v 1.2 2007/04/26 20:24:03 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -15,11 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc source" -RDEPEND=">=virtual/jre-1.4" -DEPEND="${RDEPEND} - >=virtual/jdk-1.4 +COMMON_DEP=" =dev-java/servletapi-2.4* dev-java/openspml" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.4" S="${WORKDIR}"