public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/graaff:master commit in: dev-ruby/ruby-activeldap/
Date: Tue, 14 Feb 2012 08:34:48 +0000 (UTC)	[thread overview]
Message-ID: <1329208324.3c061d0e28d39669165c057a036ce800ce402166.graaff@gentoo> (raw)

commit:     3c061d0e28d39669165c057a036ce800ce402166
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Feb 14 08:32:04 2012 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 08:32:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=3c061d0e

Also include Rails 3.1.

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

---
 dev-ruby/ruby-activeldap/ChangeLog                 |    6 +++++
 dev-ruby/ruby-activeldap/Manifest                  |   22 +++++++++++++++++++-
 .../ruby-activeldap-3.1.0-r1.ebuild                |    2 +-
 ...0-r1.ebuild => ruby-activeldap-3.1.0-r2.ebuild} |    0
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/ruby-activeldap/ChangeLog b/dev-ruby/ruby-activeldap/ChangeLog
index bd68ca9..a971606 100644
--- a/dev-ruby/ruby-activeldap/ChangeLog
+++ b/dev-ruby/ruby-activeldap/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ruby-activeldap-3.1.0-r2 (14 Feb 2012)
+
+  14 Feb 2012; Hans de Graaff <graaff@gentoo.org>
+  ruby-activeldap-3.1.0-r1.ebuild, +ruby-activeldap-3.1.0-r2.ebuild:
+  Also include Rails 3.1.
+
   23 Jan 2012; Hans de Graaff <graaff@gentoo.org>
   ruby-activeldap-3.1.0-r1.ebuild:
   Fix sed call.

diff --git a/dev-ruby/ruby-activeldap/Manifest b/dev-ruby/ruby-activeldap/Manifest
index 8fd4ec6..e18797f 100644
--- a/dev-ruby/ruby-activeldap/Manifest
+++ b/dev-ruby/ruby-activeldap/Manifest
@@ -1,11 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+- - -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST activeldap-3.1.0.gem 189440 RMD160 5fbc03fa9925f319184bd7a218db424bf7ce35a7 SHA1 7bc21ce44e2febc6c78b93a24ec2a2cfda1787b8 SHA256 f75cab6b7a2b369bf845c6e520948e1d88738644ed555ce7bef099c3cdd36a7e
------BEGIN PGP SIGNATURE-----
+- - -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
 iF4EAREIAAYFAk8dbPcACgkQiIP6VqMIqNejhAD+IY4h5lxOnyU7rwQGXr5NgMtM
 12pkTw5wuiGfXbI7EkkA/jF04HMwXpVtXdJqnlfLykd/KIzkyWYrBJq6ECcKDYKD
 =Jlsl
+- - -----END PGP SIGNATURE-----
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk8dv4oACgkQiIP6VqMIqNdKLgD7BgFoJE8RacsyAZZCVHv62OaU
+EU51ZCnVIC++esKyHZIA/1Kzgbn/kjOyOU0doA/BE1Gt0n0xL9uUQn7EhFgfu61m
+=H2te
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk86HAQACgkQiIP6VqMIqNe7dgD/e53F1djssiPonu9wJa/zYc4X
+TnXh9FDNpVlFJXJ+TocA/ix35JnmithbMkiUXqRpf2LfYBCAvWqYmYM5R3gfDT7T
+=39ii
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild
index 0d2ad94..c775886 100644
--- a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild
+++ b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild
@@ -37,7 +37,7 @@ ruby_add_rdepend "
 
 all_ruby_prepare() {
 	# "Fix" activemodel dependency to also work with Rails 3.0.
-	sed -i -e 's/3.1.0.rc4/3.0.10/' ../metadata || die
+	sed -i -e 's/~> 3.1.0.rc4/>= 3.0.10/' ../metadata || die
 
 	# Comment out Gettext setup because it does not work with fast_gettext. This
 	# patch probably breaks ruby_gettext usage. See

diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild
similarity index 100%
copy from dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild
copy to dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild



             reply	other threads:[~2012-02-14  8:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-14  8:34 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-16  9:07 [gentoo-commits] dev/graaff:master commit in: dev-ruby/ruby-activeldap/ Hans de Graaff
2012-02-14  8:40 Hans de Graaff
2012-01-23 20:14 Hans de Graaff
2012-01-23 14:21 Hans de Graaff
2011-11-03 12:28 Hans de Graaff
2011-11-03 12:23 Hans de Graaff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329208324.3c061d0e28d39669165c057a036ce800ce402166.graaff@gentoo \
    --to=graaff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox