Extend versioning to activemodel 3.2 since it is mostly compatible: https://github.com/activeldap/activeldap/pull/39

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

3 files changed, 69 insertions, 6 deletions

diff --git a/dev-ruby/ruby-activeldap/ChangeLog b/dev-ruby/ruby-activeldap/ChangeLog
index 5ed16bdff4a8..464631880aeb 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ChangeLog,v 1.32 2012/04/15 08:45:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ChangeLog,v 1.33 2012/07/02 08:25:02 graaff Exp $
+
+*ruby-activeldap-3.1.1-r1 (02 Jul 2012)
+
+  02 Jul 2012; Hans de Graaff <graaff@gentoo.org>
+  +ruby-activeldap-3.1.1-r1.ebuild:
+  Extend versioning to activemodel 3.2 since it is mostly compatible:
+  https://github.com/activeldap/activeldap/pull/39
 
 *ruby-activeldap-3.1.1 (15 Apr 2012)
 
diff --git a/dev-ruby/ruby-activeldap/Manifest b/dev-ruby/ruby-activeldap/Manifest
index 1eae4b8b0a3c..7b2e5b057d63 100644
--- a/dev-ruby/ruby-activeldap/Manifest
+++ b/dev-ruby/ruby-activeldap/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 DIST activeldap-1.2.2.gem 1084928 RMD160 b95034065de3a1ab29a6bf706c19d1e91abd55d4 SHA1 5cdf8aa8be952a45c3b68c5338447231dc2184e2 SHA256 85b7ebad03239d10dd4f0412eec9a2bfe830144e1b2625fefd33494ac7296954
 DIST activeldap-3.1.1.gem 190464 RMD160 5e44d994dd47ee713b3cced394affd6f3361bf37 SHA1 d4f1cabd13b49dd090d499761e444f66314c3fa6 SHA256 404d16f3b7cdb3a67b94b0da32090a402be031c1f86ce127b0689d921df988f1
 EBUILD ruby-activeldap-1.2.2-r1.ebuild 1603 RMD160 2a87801f7009bd51fa480f9b90259b8cd2c2db12 SHA1 ff8df4008178062598110b79852003b8f34429b1 SHA256 62479bf55a0b1629866194fb0eb15fa4df3416126a653656e8cff04375dff36a
+EBUILD ruby-activeldap-3.1.1-r1.ebuild 1563 RMD160 2b146f63a7492b1849831040e4dee8ad4200a31e SHA1 ef5cfb8db3b40734444f2d1be129b3c3de3d6435 SHA256 be97d6db70065a85a8c6e1ef909e5eb34ad966beacfc65cf1fb3fe5ab1384f91
 EBUILD ruby-activeldap-3.1.1.ebuild 1366 RMD160 ec6fbb8dd1e2173f23210ecd22d88cfcd56db6cc SHA1 fb983c3d8a39cc92732a4c2886ea493f02569a96 SHA256 4908fa54de88fb8edf6a42b4b6f7b95b3a3236081200d7a3e4a3a5764d7aef21
-MISC ChangeLog 4677 RMD160 fe6c6b30f86d17099ba851af4cc898167a3a1d5c SHA1 37fa39e49e851ac612f4ab7765f250fa88ce96e4 SHA256 66b7acbd075c50d43c35e9692f0cd8cc92f7d373c3f32164f617ddb1da140edc
+MISC ChangeLog 4926 RMD160 b3d925a8d25942d868a550f6856de193efb767a7 SHA1 2ce90bc87517b6165ef1b7bdf7ee5d28dde01ba0 SHA256 3e120ba381f7c49876f46d2962c7ff19b6f9ba791fb8a78e6d9f0e1803864cba
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+KiqoACgkQiIP6VqMIqNcDtQEAl2zRFvUhNcAnetrzOHPbC8Je
-A5EZ45gOmDHtaLnwCQMA/3T974DhUsZ4z8Kw6B+0gXGSVdVozqTVgG3I5Jj/1yDD
-=ahvt
+iF4EAREIAAYFAk/xWugACgkQiIP6VqMIqNcUmwD9GKAat0PpYSWzOkrdBVKvngBp
+zCwxls/SphqUtUgDarUA/3e+KqtIGaksJJSVq+zWRJSqvN93wqi2MFbcu8hgSmzo
+=mws0
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.1-r1.ebuild b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..f880fa9f06e8
--- /dev/null
+++ b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.1-r1.ebuild,v 1.1 2012/07/02 08:25:02 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile TODO"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+RUBY_FAKEGEM_NAME="activeldap"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="Ruby/ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_bdepend "dev-ruby/hoe"
+
+ruby_add_rdepend "
+	>=dev-ruby/activemodel-3.1.0
+	dev-ruby/locale
+	dev-ruby/fast_gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( >=dev-ruby/ruby-ldap-0.8.2 dev-ruby/ruby-net-ldap )"
+
+all_ruby_prepare() {
+	# Comment out Gettext setup because it does not work with fast_gettext. This
+	# patch probably breaks ruby_gettext usage. See
+	# https://github.com/activeldap/activeldap/issues/33
+	sed -i -e '/GetText\./ s:^:#:' lib/active_ldap/get_text_support.rb || die
+
+	# Also allow Rails 3.2. Upstream has not released a version yet that is
+	# 100% compatible, but it works for the most part and it is better than no
+	# activeldap at all.
+	sed -i -e '31d' -e 's/version: 3.1.0/version: "3.1"/' ../metadata || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}