From: William Thomson Date: Tue, 13 Mar 2007 00:09:33 +0000 (+0000) Subject: Corrected virtual deps X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=400adda5cb26d3d8baaab60d29865a244e2d890b;p=gentoo.git Corrected virtual deps Package-Manager: portage-2.1.2.2 --- diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog index 3fc555cb42ca..cf8fdf339317 100644 --- a/dev-java/tomcat-native/ChangeLog +++ b/dev-java/tomcat-native/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/tomcat-native # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.4 2007/02/26 07:11:42 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/ChangeLog,v 1.5 2007/03/13 00:09:33 wltjr Exp $ + + 13 Mar 2007; William L. Thomson Jr. + tomcat-native-1.1.8.ebuild: + Corrected virtual deps 26 Feb 2007; Christian Faulhammer tomcat-native-1.1.8.ebuild: diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 95eebf76e97d..ffd0e9f347e4 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,15 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST tomcat-native-1.1.8-src.tar.gz 174445 RMD160 0bb333973e7d177fd6d3e2dca1d0003633dfca3e SHA1 ed8a007abd5b658536caa5e5da76140d8112648a SHA256 c4924e416def6993e8ee41e9cb88346705da8f5d51be0523d7567b34530ed1c2 -EBUILD tomcat-native-1.1.8.ebuild 1137 RMD160 1e2bb4971d7fc3fac7f92f187f9c7516df143db9 SHA1 aeb65c4c50db1d8b7b9601749896efbd279305bd SHA256 f3aa952e8f66751dec1219527da5b7fb543e10578e24cd64f47fa7f79c480c20 -MD5 b689b85b19b30440375b3df9b4009aac tomcat-native-1.1.8.ebuild 1137 -RMD160 1e2bb4971d7fc3fac7f92f187f9c7516df143db9 tomcat-native-1.1.8.ebuild 1137 -SHA256 f3aa952e8f66751dec1219527da5b7fb543e10578e24cd64f47fa7f79c480c20 tomcat-native-1.1.8.ebuild 1137 -MISC ChangeLog 738 RMD160 83b1e713da32f5351e180cd3ba057efae9556cbe SHA1 a9db52c9819d4605dfe18896e5ec4f9433b67fd9 SHA256 2c58f5b1002a43b4477eb70105ffa866acd02f2b615f7055385fa5fca03768a0 -MD5 fc9a278dd99ed3d3a9840596d4b71fd5 ChangeLog 738 -RMD160 83b1e713da32f5351e180cd3ba057efae9556cbe ChangeLog 738 -SHA256 2c58f5b1002a43b4477eb70105ffa866acd02f2b615f7055385fa5fca03768a0 ChangeLog 738 +EBUILD tomcat-native-1.1.8.ebuild 1112 RMD160 ecb94bfc08e09269c0c9f0805f5e8bcf7fdc361a SHA1 dfa7fd8d4a62597b4d30d5eeb7fc62b9a780e5ec SHA256 90a0f12ba15d299f27ab0a60e5e9851b2eb0566e590b10f013b21c166f5d6dbd +MD5 cfa61b0394c8057c51361025597f8fe9 tomcat-native-1.1.8.ebuild 1112 +RMD160 ecb94bfc08e09269c0c9f0805f5e8bcf7fdc361a tomcat-native-1.1.8.ebuild 1112 +SHA256 90a0f12ba15d299f27ab0a60e5e9851b2eb0566e590b10f013b21c166f5d6dbd tomcat-native-1.1.8.ebuild 1112 +MISC ChangeLog 851 RMD160 24f4729a936bdf5c9ceac4aae716059d2a1ecd54 SHA1 ea6a85a85d99c82b6ae4dfe834329d52d05b1624 SHA256 37b2102c9251030b7fd3408acd6ebe1d71850cd1281861ab575e0ac43a7249c3 +MD5 442b7afb84d68a5ec5553151cc36803d ChangeLog 851 +RMD160 24f4729a936bdf5c9ceac4aae716059d2a1ecd54 ChangeLog 851 +SHA256 37b2102c9251030b7fd3408acd6ebe1d71850cd1281861ab575e0ac43a7249c3 ChangeLog 851 MISC metadata.xml 825 RMD160 1cc8173f5c1ae14d688ccf43578ff621088dd24f SHA1 f44e742a7063a22368c408e3070774dbcfacb625 SHA256 1af9155a727e8470663f21324746f6c9567af0f47fb4b63f3dadba0ee43a5eda MD5 9105446be4be62fef50c033bc88ce3aa metadata.xml 825 RMD160 1cc8173f5c1ae14d688ccf43578ff621088dd24f metadata.xml 825 @@ -17,10 +14,3 @@ SHA256 1af9155a727e8470663f21324746f6c9567af0f47fb4b63f3dadba0ee43a5eda metadata MD5 c3c4345d80959b6ca66da9cfa46dab84 files/digest-tomcat-native-1.1.8 271 RMD160 6fa60799886346789f8f0d53df7e3495538b9e64 files/digest-tomcat-native-1.1.8 271 SHA256 14dee750ccf48a3823a5e8d51875948043e5a39347b6987965aa1949d535219d files/digest-tomcat-native-1.1.8 271 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFF4of0NQqtfCuFneMRArMfAJ4yUdvQp9542CSX6w2EnFQ3iQu65ACfVYK3 -tBNvlJva8jdyUB32YplYJfs= -=RILT ------END PGP SIGNATURE----- diff --git a/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild index dd0bba2cf2e8..9aeb093d76c7 100644 --- a/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.1.8.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/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild,v 1.5 2007/02/26 07:11:42 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.8.ebuild,v 1.6 2007/03/13 00:09:33 wltjr Exp $ inherit eutils java-pkg-2 @@ -15,7 +15,7 @@ LICENSE="Apache-2.0" RDEPEND="=dev-libs/apr-1* dev-libs/openssl" -DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) +DEPEND=">=virtual/jdk-1.5 ${RDEPEND}" S=${WORKDIR}/${P}-src