Address dependency issues caused by depend.apache. Refer to bug 107127.

Package-Manager: portage-2.1_rc4-r1

3 files changed, 44 insertions, 36 deletions

diff --git a/dev-ruby/mod_ruby/ChangeLog b/dev-ruby/mod_ruby/ChangeLog
index 0fff6d3e9ca4..a1cf7b951ca7 100644
--- a/dev-ruby/mod_ruby/ChangeLog
+++ b/dev-ruby/mod_ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/mod_ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.17 2006/03/09 22:51:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.18 2006/06/04 18:23:59 vericgar Exp $
+
+  04 Jun 2006; Michael Stewart <vericgar@gentoo.org>
+  mod_ruby-1.2.4-r2.ebuild:
+  Address dependency issues caused by depend.apache. Refer to bug 107127.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> mod_ruby-1.2.4-r2.ebuild:
   Mark 1.2.4-r2 stable on ia64
diff --git a/dev-ruby/mod_ruby/Manifest b/dev-ruby/mod_ruby/Manifest
index 29912da56207..8cbe697b9104 100644
--- a/dev-ruby/mod_ruby/Manifest
+++ b/dev-ruby/mod_ruby/Manifest
@@ -1,55 +1,58 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 84d26b646d0b76e436b6841f0caa6eda ChangeLog 5014
-RMD160 e5b7be8b9155256dcbd6d53e520f21bc87256c59 ChangeLog 5014
-SHA256 3f69cb2250cd2dafd9cff8251a638f5d95940ccec195dc52800994b07ddfd2d3 ChangeLog 5014
+AUX 20_mod_ruby.conf 1286 RMD160 63e256f13bd8066171c84d61bc0c202de4f1c714 SHA1 1fa26c317205a04186fc0d81b2ffff25fb017783 SHA256 f1dd0a2f073c2d08246e04415590f7a82d4ab1e4daccb6fe673ee7fc39cc2183
 MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
 RMD160 63e256f13bd8066171c84d61bc0c202de4f1c714 files/20_mod_ruby.conf 1286
 SHA256 f1dd0a2f073c2d08246e04415590f7a82d4ab1e4daccb6fe673ee7fc39cc2183 files/20_mod_ruby.conf 1286
+AUX 21_mod_ruby.conf 1281 RMD160 1ff18ac15c19e46fdf3107356eb6b0badca84fed SHA1 3374d500120d7a26c00a9ea1af235e9740adf19f SHA256 9795729cb0d17e525cdc8829fb36aabddb0e2a87849ebd186df814be33f97323
 MD5 d87224e9645bea207d6db5f6a2079e97 files/21_mod_ruby.conf 1281
 RMD160 1ff18ac15c19e46fdf3107356eb6b0badca84fed files/21_mod_ruby.conf 1281
 SHA256 9795729cb0d17e525cdc8829fb36aabddb0e2a87849ebd186df814be33f97323 files/21_mod_ruby.conf 1281
-MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod_ruby-1.0.7 65
-RMD160 fc57203fa8388f012440a7dd5ad08c1b1d8f8562 files/digest-mod_ruby-1.0.7 65
-SHA256 a46cd1c62eaf8589d755af36efa3dbe953eec4bcca3bf9a8cda89e8f16002c55 files/digest-mod_ruby-1.0.7 65
-MD5 094ecc3f9ad4a6698c2ef4ee0c8139cc files/digest-mod_ruby-1.2.2 65
-RMD160 d0fec7ec8e672300128586c380a2928d3e94e9c5 files/digest-mod_ruby-1.2.2 65
-SHA256 752571fe280d77502d346fe3ce1273e83a4daa8414a1f22e6cc61841e900da48 files/digest-mod_ruby-1.2.2 65
-MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4 66
-RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4 66
-SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4 66
-MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r1 66
-RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4-r1 66
-SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4-r1 66
-MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r2 66
-RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4-r2 66
-SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4-r2 66
+AUX mod_ruby.conf 846 RMD160 3ae644cfa6fcaf4377b7b8fc9a7b44197ad68935 SHA1 e614830d674a0d289af9904f209cdbd61af89502 SHA256 ba70a1f748fd03707be5ef80388a0b0b7c455802286f108de2b195c0a9ce2814
 MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
 RMD160 3ae644cfa6fcaf4377b7b8fc9a7b44197ad68935 files/mod_ruby.conf 846
 SHA256 ba70a1f748fd03707be5ef80388a0b0b7c455802286f108de2b195c0a9ce2814 files/mod_ruby.conf 846
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
-SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
+DIST mod_ruby-1.0.7.tar.gz 69035
+DIST mod_ruby-1.2.2.tar.gz 93925
+DIST mod_ruby-1.2.4.tar.gz 107797
+EBUILD mod_ruby-1.0.7.ebuild 927 RMD160 ee8a34425a2b0923c8401af9a984b85af7763ac3 SHA1 c7de662e9301a89beab527e4a0e50d6b17b9f1aa SHA256 5c7d5380384909259158f3a36b28a01fbc77b83f96ddf9c35c549f0d353e2185
 MD5 0a3b2010518d678dcb74dacf8511fe28 mod_ruby-1.0.7.ebuild 927
 RMD160 ee8a34425a2b0923c8401af9a984b85af7763ac3 mod_ruby-1.0.7.ebuild 927
 SHA256 5c7d5380384909259158f3a36b28a01fbc77b83f96ddf9c35c549f0d353e2185 mod_ruby-1.0.7.ebuild 927
+EBUILD mod_ruby-1.2.2.ebuild 1924 RMD160 8a086b913878b1093ebe2eceb6dec24d804e86c7 SHA1 96c9a53e4c7ab077973bab31f88313ab9ed5aa56 SHA256 9918bc807ccf4acbf7d31c2c86ae6c3399c75d2f171da6589ecf95cbda4b280f
 MD5 3bee9f0cde08505727d25806cb7ccf36 mod_ruby-1.2.2.ebuild 1924
 RMD160 8a086b913878b1093ebe2eceb6dec24d804e86c7 mod_ruby-1.2.2.ebuild 1924
 SHA256 9918bc807ccf4acbf7d31c2c86ae6c3399c75d2f171da6589ecf95cbda4b280f mod_ruby-1.2.2.ebuild 1924
+EBUILD mod_ruby-1.2.4-r1.ebuild 1136 RMD160 ad1077baa9e016eb60083850ac828748970d411c SHA1 9cd51b7a8ae15ff82a57c2e33d86b8f40f01a87b SHA256 7028b87c15a483c5bee0f4f9c3ba81bc7e3eae087ce9604f55ac8c62fe331e12
 MD5 2b4d5ae65d1dc92adf5c70292819be42 mod_ruby-1.2.4-r1.ebuild 1136
 RMD160 ad1077baa9e016eb60083850ac828748970d411c mod_ruby-1.2.4-r1.ebuild 1136
 SHA256 7028b87c15a483c5bee0f4f9c3ba81bc7e3eae087ce9604f55ac8c62fe331e12 mod_ruby-1.2.4-r1.ebuild 1136
-MD5 ee8866ccd9b5821ad9e34f1ff3b57828 mod_ruby-1.2.4-r2.ebuild 1165
-RMD160 6c73a29bfabff84b3d542cafce2e11565ebd9062 mod_ruby-1.2.4-r2.ebuild 1165
-SHA256 cdda53c1a79131ebf1d785807605cb8445e68cb53e442bd4a395fdada90481ea mod_ruby-1.2.4-r2.ebuild 1165
+EBUILD mod_ruby-1.2.4-r2.ebuild 1188 RMD160 6dc239d5ada750ea2fa11e8d51a24a4ca8d66665 SHA1 ae83653a4cc5c6617dee7448c70176533c205955 SHA256 d27507543adbabb652e478a78343f99d97e0ea5560b96933d2c49cbb5c1742f8
+MD5 0a6be4cf589b8d9784b84cbe355ef55e mod_ruby-1.2.4-r2.ebuild 1188
+RMD160 6dc239d5ada750ea2fa11e8d51a24a4ca8d66665 mod_ruby-1.2.4-r2.ebuild 1188
+SHA256 d27507543adbabb652e478a78343f99d97e0ea5560b96933d2c49cbb5c1742f8 mod_ruby-1.2.4-r2.ebuild 1188
+EBUILD mod_ruby-1.2.4.ebuild 1922 RMD160 6eda0175273e9ac01266f851ca9c9b1f67b44201 SHA1 58f0b9e509e282679eed5e141c0c3c0f6baefeef SHA256 75a2e9664eaae9c757c072e9a2a7d3bc74840bd0a197d05763695bdb9b143693
 MD5 5d348c12096664c37eaba44a777ae090 mod_ruby-1.2.4.ebuild 1922
 RMD160 6eda0175273e9ac01266f851ca9c9b1f67b44201 mod_ruby-1.2.4.ebuild 1922
 SHA256 75a2e9664eaae9c757c072e9a2a7d3bc74840bd0a197d05763695bdb9b143693 mod_ruby-1.2.4.ebuild 1922
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEELGXJrHF4yAQTrARAugTAKCsdBSrAE/CpWKEPpPBaHQvhMEAGACdF0In
-ZptNxtkeSIXh87Iy6n1qDvk=
-=rQBD
------END PGP SIGNATURE-----
+MISC ChangeLog 5170 RMD160 541562ed3ca2c16c934c9658c50adfc9040b9087 SHA1 935c6f1a5d32a387cd02362e8092f3b74c8f5fad SHA256 eb11b4f9d93f734600e50e4f133944332fde7e09250a40cf1f9c2dd088262988
+MD5 b10a479662a8e40cb4ea8b52dbb59983 ChangeLog 5170
+RMD160 541562ed3ca2c16c934c9658c50adfc9040b9087 ChangeLog 5170
+SHA256 eb11b4f9d93f734600e50e4f133944332fde7e09250a40cf1f9c2dd088262988 ChangeLog 5170
+MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
+SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
+MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod_ruby-1.0.7 65
+RMD160 fc57203fa8388f012440a7dd5ad08c1b1d8f8562 files/digest-mod_ruby-1.0.7 65
+SHA256 a46cd1c62eaf8589d755af36efa3dbe953eec4bcca3bf9a8cda89e8f16002c55 files/digest-mod_ruby-1.0.7 65
+MD5 094ecc3f9ad4a6698c2ef4ee0c8139cc files/digest-mod_ruby-1.2.2 65
+RMD160 d0fec7ec8e672300128586c380a2928d3e94e9c5 files/digest-mod_ruby-1.2.2 65
+SHA256 752571fe280d77502d346fe3ce1273e83a4daa8414a1f22e6cc61841e900da48 files/digest-mod_ruby-1.2.2 65
+MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4 66
+RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4 66
+SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4 66
+MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r1 66
+RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4-r1 66
+SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4-r1 66
+MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r2 66
+RMD160 d6a08b9946ea97c276241d140f1bebca9e44ea7e files/digest-mod_ruby-1.2.4-r2 66
+SHA256 6f1ce299712a34be15038affee48860cdfba6d3bfcd68d1ee318264584a7675f files/digest-mod_ruby-1.2.4-r2 66
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
index b929e1938aad..0e8e614640e3 100644
--- a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.7 2006/03/09 22:51:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.8 2006/06/04 18:23:59 vericgar Exp $
 
 inherit apache-module
 
@@ -14,6 +14,7 @@ IUSE="doc"
 
 DEPEND="virtual/ruby
 	doc? ( dev-ruby/rdtool )"
+RDEPEND="virtual/ruby"
 
 APACHE1_MOD_CONF="mod_ruby"
 APACHE2_MOD_CONF="21_mod_ruby"