From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RxDwe-0008Us-B0 for garchives@archives.gentoo.org; Tue, 14 Feb 2012 08:41:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 559A6E07A7; Tue, 14 Feb 2012 08:40:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 166CAE07A7 for ; Tue, 14 Feb 2012 08:40:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5326A1B400E for ; Tue, 14 Feb 2012 08:40:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17659E5400 for ; Tue, 14 Feb 2012 08:40:52 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1329208840.cc077f46ff0ab50c7ff6df731b7e2c3be1b91a9f.graaff@gentoo> Subject: [gentoo-commits] dev/graaff:master commit in: dev-ruby/ruby-activeldap/ X-VCS-Repository: dev/graaff X-VCS-Files: dev-ruby/ruby-activeldap/ChangeLog dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild X-VCS-Directories: dev-ruby/ruby-activeldap/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: cc077f46ff0ab50c7ff6df731b7e2c3be1b91a9f X-VCS-Branch: master Date: Tue, 14 Feb 2012 08:40:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ff6ae3e9-2c35-4b4b-aa08-b3c08b15cb9b X-Archives-Hash: 8ea8e23a315a3a77f8f6a17fc65864d2 commit: cc077f46ff0ab50c7ff6df731b7e2c3be1b91a9f Author: Hans de Graaff degraaff org> AuthorDate: Tue Feb 14 08:40:40 2012 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Tue Feb 14 08:40:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/graaff.git;a=3D= commit;h=3Dcc077f46 Actually fix this in the latest revision. (Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with= key 0x8883FA56A308A8D7!) --- dev-ruby/ruby-activeldap/ChangeLog | 4 + .../ruby-activeldap-3.1.0-r1.ebuild | 61 --------------= ------ .../ruby-activeldap-3.1.0-r2.ebuild | 2 +- 3 files changed, 5 insertions(+), 62 deletions(-) diff --git a/dev-ruby/ruby-activeldap/ChangeLog b/dev-ruby/ruby-activelda= p/ChangeLog index a971606..f4a404d 100644 --- a/dev-ruby/ruby-activeldap/ChangeLog +++ b/dev-ruby/ruby-activeldap/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 14 Feb 2012; Hans de Graaff + -ruby-activeldap-3.1.0-r1.ebuild, ruby-activeldap-3.1.0-r2.ebuild: + Actually fix this in the latest revision. + *ruby-activeldap-3.1.0-r2 (14 Feb 2012) =20 14 Feb 2012; Hans de Graaff diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild b/d= ev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild deleted file mode 100644 index c775886..0000000 --- a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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-activel= dap-1.2.2-r1.ebuild,v 1.3 2011/10/15 23:05:58 maekke Exp $ - -EAPI=3D4 -USE_RUBY=3D"ruby18" - -RUBY_FAKEGEM_TASK_DOC=3D"" -RUBY_FAKEGEM_EXTRADOC=3D"README.textile TODO" -RUBY_FAKEGEM_EXTRAINSTALL=3D"po" -RUBY_FAKEGEM_NAME=3D"activeldap" - -inherit ruby-fakegem - -MY_P=3D"${P/ruby-/}" -DESCRIPTION=3D"Ruby/ActiveLDAP provides an activerecord inspired object = oriented interface to LDAP" -HOMEPAGE=3D"https://github.com/activeldap/activeldap" - -LICENSE=3D"GPL-2" -SLOT=3D"3" -KEYWORDS=3D"~amd64 ~x86 ~x86-macos" -IUSE=3D"" - -# Most tests require a live LDAP server to run. -RESTRICT=3D"test" - -ruby_add_bdepend "dev-ruby/hoe" -ruby_add_bdepend "test? ( virtual/ruby-test-unit )" - -# The activemodel dependency is 3.1.0.rc4 but we don't have that yet. -ruby_add_rdepend " - >=3Ddev-ruby/activemodel-3.0.10 - dev-ruby/locale - dev-ruby/fast_gettext - dev-ruby/gettext_i18n_rails - || ( >=3Ddev-ruby/ruby-ldap-0.8.2 dev-ruby/ruby-net-ldap )" - -all_ruby_prepare() { - # "Fix" activemodel dependency to also work with Rails 3.0. - sed -i -e 's/~> 3.1.0.rc4/>=3D 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 - # https://github.com/activeldap/activeldap/issues/33 - sed -i -e '/GetText\./ s:^:#:' lib/active_ldap/get_text_support.rb || d= ie -} - -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=3Dtest-unit/lib ${RUBY} -S rake test || die "Tests failed." -} - -all_ruby_install() { - all_fakegem_install - - dodoc doc/text/* - - insinto /usr/share/doc/${PF} - doins -r examples -} diff --git a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild b/d= ev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild index 0d2ad94..c775886 100644 --- a/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild +++ b/dev-ruby/ruby-activeldap/ruby-activeldap-3.1.0-r2.ebuild @@ -37,7 +37,7 @@ ruby_add_rdepend " =20 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/>=3D 3.0.10/' ../metadata || die =20 # Comment out Gettext setup because it does not work with fast_gettext.= This # patch probably breaks ruby_gettext usage. See