Fix problems with conversion to ruby-fakegem.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 80 insertions, 7 deletions

diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 31395a5f2063..e07f25920229 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rmagick-2.13.0-magicklibsubversion.patch 1313 RMD160 c6bf5392fb47b6da1a07b8c400fa2117f002f693 SHA1 30682313d7bb005dff313f800f7e23c4177165f2 SHA256 d0a9ca09a2eacdd4fc9f0f398ab55ce9ab1a120129d36cc34badfb9c60f9c714
 DIST RMagick-2.12.2.tar.bz2 1160212 RMD160 7cddbd8a932c1f49fbfa90c82e67e6542d6db2fc SHA1 aaebdc2cf5d029352d1cad936edcfaf7cc2e5e32 SHA256 239eca9cc0f196678327e0adc3b76bc9bc01fcd8f8660560b69f350ca8bda3ef
 DIST RMagick-2.13.0.tar.bz2 1184929 RMD160 80b0ec455695355989d4068464cdf8516e1d5b01 SHA1 c2b8e0124bacafcc318255f5b8e47faf551b37a2 SHA256 de2d765e62668ddb5071d310844112a86f7e02789d0c87f29bd82b3c8b4a5dd5
 DIST RMagick-2.13.1.tar.bz2 1185051 RMD160 54012008eefc53af9cd0738e9cec855b61f8a091 SHA1 3003693689ed3a5d2a8414ce3cb9013fcbf83dea SHA256 0b119378c79bae697978b58a543dbffb79418ec15386c01beb847d224762ab8d
 EBUILD rmagick-2.12.2.ebuild 2408 RMD160 68b0c115dd35051a4651aaf54645205286bf9abe SHA1 d9b9a24d4695202f67885adb6204ea78bd99a5b1 SHA256 e57f03c84baa4e95af2784f67dd340d5df56d713b7160faaa3ce8006a2398d22
-EBUILD rmagick-2.13.0-r1.ebuild 1452 RMD160 a55e9ab0509003126d9e6d635d6daefe3aa0c599 SHA1 34f2fac592040e6196148afb031b909e216da248 SHA256 e59452f596fcbd69b8e00244f60cb61d2430602f68630127d7ea448a5a82a842
+EBUILD rmagick-2.13.0-r1.ebuild 1450 RMD160 6a5b4a58c49553fbabccec250f634a12e1368798 SHA1 86d073ee07f79ee1b2a5bf64950ca2ae94354883 SHA256 253e8754eedb246eba632a58780c6fa6de5ba7f9944f65f59fa06d2a2e9e759d
 EBUILD rmagick-2.13.1.ebuild 1400 RMD160 d0ffbddc6f082f86e1d510585a69150d57714074 SHA1 549bc2f5c09fdb97f14c1e4c1d319c759b8a2652 SHA256 0cd2e944c6ea3a533fe5a0e686bdf7a36147ff134506cd31aa6170ac8ccdf4b4
-MISC ChangeLog 25694 RMD160 dffaf802e201885deed3209085456fa62dd8e770 SHA1 4ce01b1813d98666221cd201fa906b398ea11cb5 SHA256 ec090337f3e1a3d70219e1e5330e27a486405e84963575e2ab117018e9ba613f
+MISC ChangeLog 25793 RMD160 e44d77ba1bd76abfbd8ac843fe3ebe6f66d24f42 SHA1 2dcf33ca620804b477f420f6713222cac4ddf26b SHA256 c687384c51547cad4565288417226fafe80ba3680601f0a93d558263d4cd1401
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv5iVMACgkQCaWpQKGI+9SVpACfSDFsjvN0OKHtpNEfWPR5ku36
+oasAn1PLjMBPFp3OqonNYKQc6GM37v10
+=lh0F
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-activeldap/ChangeLog b/dev-ruby/ruby-activeldap/ChangeLog
index 707811f42f5a..6ddd0f350823 100644
--- a/dev-ruby/ruby-activeldap/ChangeLog
+++ b/dev-ruby/ruby-activeldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-activeldap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ChangeLog,v 1.21 2010/05/23 08:08:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ChangeLog,v 1.22 2010/05/23 19:57:47 graaff Exp $
+
+*ruby-activeldap-1.2.1-r2 (23 May 2010)
+
+  23 May 2010; Hans de Graaff <graaff@gentoo.org>
+  +ruby-activeldap-1.2.1-r2.ebuild:
+  Be more lenient towards newer Rails versions in the same slot.
+  Use correct name for gemspec file.
 
 *ruby-activeldap-1.2.1-r1 (23 May 2010)
 
diff --git a/dev-ruby/ruby-activeldap/Manifest b/dev-ruby/ruby-activeldap/Manifest
index 8ec57ff73a99..9ff38eab5d9d 100644
--- a/dev-ruby/ruby-activeldap/Manifest
+++ b/dev-ruby/ruby-activeldap/Manifest
@@ -3,13 +3,14 @@ Hash: SHA1
 
 DIST activeldap-1.2.1.gem 875520 RMD160 4268a06b2f5c8c9f24720b5874164566747dd25e SHA1 2d934833a29f56b2bf90f82fc1a17179242aff2a SHA256 4536768610b8fd7fbebc8435ae5455e52557aeb624d3ae64717b155856c480c3
 EBUILD ruby-activeldap-1.2.1-r1.ebuild 1335 RMD160 4228c42244a2a7aef37db62aafd2944e744fda28 SHA1 86a8bc257fd4c6fa20da6697f3fdd57d33972d16 SHA256 c18a26677807af064502c1b797f259ea08f63c09845bfbabbc17629756059c0a
+EBUILD ruby-activeldap-1.2.1-r2.ebuild 1509 RMD160 e77cd36d0cf542f4a6797bab6b431e2762a2801b SHA1 fe2b9d183f8e90c25340dde2be349d878d580866 SHA256 94f9d8d7dc9ede23897c0a4946da910f1a0487b37ec39ef3c0ba236067eb735a
 EBUILD ruby-activeldap-1.2.1.ebuild 725 RMD160 d64951e31689e88b6abeb9d357be4fe23f41473c SHA1 b293af6408c305e3586fd2141c80a88ee4a1ea1a SHA256 94e2e44aed8311c9d93bf2aabac448a6b6704ee3eb52ecd79498700f000e0f3c
-MISC ChangeLog 2995 RMD160 f744acbb7f15b3b96faa386c1c17a56ef0155f01 SHA1 cc4bab15ef4347ca059d21e9ee14a38062b66944 SHA256 438207a54d732483b7249090312b5f72fa235921de39f600ec745c31777959e6
+MISC ChangeLog 3225 RMD160 37d6bb1bc2cf613ae6ad7722cf871d5ffbe209b0 SHA1 66cccfdd0380c32f9e0be95e767dc7c1d9dd78fe SHA256 484694e5539506c0d7e80a1800188642f4de5d9060234e233f944c4e52baaef3
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkv44n4ACgkQeM7EJeUH71MdJgCZAd3kjLKXxHapFZdjzqV5kThP
-X6YAnRfr/9ltEOc++gTHO3jOsnOZt7YE
-=Do6r
+iEYEARECAAYFAkv5iMEACgkQeM7EJeUH71PZDQCeJq4Rby3GPigUCmlO/AApLLx6
+O0MAniSveAjaAqdfAAGC9sDc/kGXas4Z
+=dCgr
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-1.2.1-r2.ebuild b/dev-ruby/ruby-activeldap/ruby-activeldap-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..8d28a06dc284
--- /dev/null
+++ b/dev-ruby/ruby-activeldap/ruby-activeldap-1.2.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ruby-activeldap-1.2.1-r2.ebuild,v 1.1 2010/05/23 19:57:47 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README TODO"
+RUBY_FAKEGEM_EXTRAINSTALL="data po rails rails_generators"
+RUBY_FAKEGEM_NAME="activeldap"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="Ruby/ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="http://ruby-activeldap.rubyforge.org/doc/"
+SRC_URI="mirror://rubygems/${MY_P}.gem"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_bdepend "dev-ruby/hoe"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+ruby_add_rdepend "
+	=dev-ruby/activerecord-2.3*
+	~dev-ruby/locale-2.0.5
+	~dev-ruby/ruby-gettext-2.1.0
+	~dev-ruby/gettext_activerecord-2.1.0
+	>=dev-ruby/ruby-ldap-0.8.2"
+
+all_ruby_prepare() {
+	# Make activeldap more lenient towards newer Rails versions.
+	sed -i -e "s/= 2.3.5/~>2.3.5/" lib/active_ldap.rb || die
+}
+
+each_ruby_test() {
+	# Tests use test-unit-2 which is currently masked in tree.
+	# Version 2.0.6 is bundled so use that for now.
+	RUBYLIB=test-unit/lib ${RUBY} -S rake test || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}