Get files from devspace (original home is inaccessible). Fix bug 379271

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

4 files changed, 129 insertions, 10 deletions

diff --git a/dev-vcs/fromcvs/ChangeLog b/dev-vcs/fromcvs/ChangeLog
index af5f984d5c39..483edf538c72 100644
--- a/dev-vcs/fromcvs/ChangeLog
+++ b/dev-vcs/fromcvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/fromcvs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fromcvs/ChangeLog,v 1.3 2011/06/18 10:08:55 sochotnicky Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fromcvs/ChangeLog,v 1.4 2012/02/15 07:34:38 sochotnicky Exp $
+
+*fromcvs-0_pre20120214 (14 Feb 2012)
+
+  14 Feb 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +fromcvs-0_pre20120214.ebuild,
+  +files/0001-Fix-379271-require-rubygems-before-other-deps.patch:
+  Get files from devspace (original home is inaccessible). Fix bug 379271
+  (finally)
 
   18 Jun 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   fromcvs-0_pre132-r1.ebuild:
diff --git a/dev-vcs/fromcvs/Manifest b/dev-vcs/fromcvs/Manifest
index e8111868fada..93801555d66f 100644
--- a/dev-vcs/fromcvs/Manifest
+++ b/dev-vcs/fromcvs/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX 0001-Fix-379271-require-rubygems-before-other-deps.patch 1082 RMD160 c793acaec31b36abc121745635827a64617e5117 SHA1 795facf5256fe7a64293aeb8990b83a0b293d5da SHA256 07758904106337103cfa9ea558f8ad79782064314cba2a407e55e94f80e58655
+DIST fromcvs-20120214.tar.gz 32671 RMD160 d960aa5507af6b0fdcfd1748e8f451474ae6880d SHA1 20bac1e4cd4b8d3b66a4d8c8ac6f7c1b2450d57a SHA256 017d57d81cc32676d81d8d906aa87bd8f21edc06433df5858ed940b7dd988f43
 EBUILD fromcvs-0_pre132-r1.ebuild 1531 RMD160 19d89805888820b0eb31e5abd27e68c387af0f31 SHA1 770b9a38069d793fd41db590e01aa752b6c172fa SHA256 abe1ebe72a488a7a5971b62c8191397b5e29be2e3260180d35752b4337037552
 EBUILD fromcvs-0_pre132.ebuild 1217 RMD160 81bddabf12649d662325e45b22c6f62d2c0cbc32 SHA1 4158f0a9532967a4e8ae1987aa2bb840b145fe9e SHA256 0b27d1d5eb0cceca69bbc31b698cc056f01ac531c43d12a7f8bfeb4c84e82c97
-MISC ChangeLog 946 RMD160 155509a005c9f39293083810b60d6add13633d22 SHA1 6be9ca7a0d0aa599596420bdd1574d36155f675e SHA256 4cba098f502466603161ffcb9f01210b963c1e57df70a5d8d1ba5b3f433f5d26
+EBUILD fromcvs-0_pre20120214.ebuild 1273 RMD160 ca6ccdb94fb777777aeb71a6cc5f9b787c930ca4 SHA1 809573ad863ca75d54bb5efe667ea90c996a0062 SHA256 bdb8ca23dc9a17e3f9a3ac1fdaceffc2795ea90dcacc00fad505f444cb5d0a33
+MISC ChangeLog 1232 RMD160 29218818531eb09e4b5842e1b6b13b2929658d37 SHA1 b28720557710bda856e4ec0daa4b503b7bbda9c6 SHA256 ee76f7525037720f904e4602aa1b0e3e3262fd0f8a408a913b7677e4d0138501
 MISC metadata.xml 486 RMD160 0c32c71f7c741117086e176bd22d645342d644e6 SHA1 9f91fff5ce75283ffd80d3b916b294219597995b SHA256 30bd6685c57b1d79602e671c91b501c1c89758b79b310a308b07007a8e641a26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59nKQACgkQfXuS5UK5QB0ALQP+PtI+MMeKAU/usMLfXas/cnIR
-uEAQLnWZd4p+PRH+7H3ayAi8VhK6yQZue0m42lf8ot1YK+XZAC8sRBKGfe8vbaj6
-mSErVuWIF202QKGDWBhaaeDqV1w9Zs+JD4YUjgrWiYNzXW4MCSpOhg93NFHCRRyF
-nLlJm84RjDyOENQ/g20=
-=jUM7
+iQIcBAEBCgAGBQJPO2AcAAoJELy9dS57CHJBet0P/Rs6tPAWQSHcxqv2itHzHYxZ
+997NOs16lvze1loMjaHDE6vfIgHqmMg29nV3zJcf2q4WYfMpKFIC1I+bEN06abar
+H2z5xQDsFHD5dgikgbEuwv3gYPKZIbPccwNEq3PIJmAXWeHFoyYovCNm+zlsdmTc
+wz5xlKwr0AtQArQTOALl+ijTHYE1sUVbpln/97uNtTyu/gGHRCakyp+VL6GKb64K
+M/tLkH7GnGcdbWUKxP9Np80RAgzpYlGPBzdzVr2K1TGpvTVi5jR3YrzAkm1FROHX
+xdsLRmZV7blNAYty5/DyipbOapC6/JdBsQqn1CXJYo8MHcc9PNdNxU0lQN8G7LhH
+bgyJ+4v+ydSBe3Bosn+EvSXFDh6lN70K2lr5QOc1yX9qBOq5nAA7EgGq81gkH4Fa
+5ayAu48kR8roW9Uq9sEIEMmh0XE2wEEAFrTrQDH5Zk8SCOk+QF3KpKgr8N5/bA4l
+eTZCgjqlTXLYnHLiyp/sTEJgLyiUlmhti6AgjmyjtAbM1VuLCR7cHquhQKNqK93U
+3/1ub837PweRO8E0Q2IH+9XfX3a5zp43PbBplPeixwENlQmePRiCGqxj179cS6Av
+0VYu5t31bqDtDuYmruHb7awzZ4nTZLBtbXFENQTsKvt+KmyIkF9I5C620p10iGvb
+fhHDoO1pYeQ8hObQY3XN
+=rKj3
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/fromcvs/files/0001-Fix-379271-require-rubygems-before-other-deps.patch b/dev-vcs/fromcvs/files/0001-Fix-379271-require-rubygems-before-other-deps.patch
new file mode 100644
index 000000000000..7ae7ac67ceab
--- /dev/null
+++ b/dev-vcs/fromcvs/files/0001-Fix-379271-require-rubygems-before-other-deps.patch
@@ -0,0 +1,50 @@
+From b8b5074b0b80769d14d8f5d0839a1d63173e51ab Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 14 Feb 2012 23:43:43 +0100
+Subject: [PATCH] Fix #379271 - require rubygems before other deps
+
+---
+ todb.rb  |    1 +
+ togit.rb |    1 +
+ tohg.rb  |    1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/todb.rb b/todb.rb
+index 73f10a2..f753477 100644
+--- a/todb.rb
++++ b/todb.rb
+@@ -14,6 +14,7 @@
+ # along with fromcvs.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
++require 'rubygems'
+ require 'fromcvs'
+ require 'sqlite3'
+ 
+diff --git a/togit.rb b/togit.rb
+index d3feb24..46fa44c 100644
+--- a/togit.rb
++++ b/togit.rb
+@@ -14,6 +14,7 @@
+ # along with fromcvs.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
++require 'rubygems'
+ require 'fromcvs'
+ 
+ require 'enumerator'
+diff --git a/tohg.rb b/tohg.rb
+index 99043cb..db3337a 100644
+--- a/tohg.rb
++++ b/tohg.rb
+@@ -14,6 +14,7 @@
+ # along with fromcvs.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
++require 'rubygems'
+ require 'fromcvs'
+ require 'fileutils'
+ 
+-- 
+1.7.3.4
+
diff --git a/dev-vcs/fromcvs/fromcvs-0_pre20120214.ebuild b/dev-vcs/fromcvs/fromcvs-0_pre20120214.ebuild
new file mode 100644
index 000000000000..b59fa0015903
--- /dev/null
+++ b/dev-vcs/fromcvs/fromcvs-0_pre20120214.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fromcvs/fromcvs-0_pre20120214.ebuild,v 1.1 2012/02/15 07:34:39 sochotnicky Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+inherit ruby-ng
+
+MY_PV="${PV#0_pre}"
+
+DESCRIPTION="fromcvs converts cvs to git, hg or sqlite database"
+HOMEPAGE="http://gitorious.org/fromcvs"
+# downloaded from gitorious hash, no proper tarballs available
+SRC_URI="http://dev.gentoo.org/fromcvs-${MY_PV}.tar.gz"
+
+RUBY_PATCHES="0001-Fix-379271-require-rubygems-before-other-deps.patch"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git mercurial sqlite"
+
+RUBY_S="${PN}-${PN}"
+
+RDEPEND="${RDEPEND}
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )"
+
+ruby_add_rdepend "dev-ruby/rcsparse
+	>=dev-ruby/rbtree-0.3.0-r2
+	sqlite? ( dev-ruby/sqlite3-ruby )"
+
+all_ruby_prepare() {
+	# prepare scripts that will go into bin
+	for script in togit.rb tohg.rb todb.rb;do
+		sed -i '1 i #!/usr/bin/ruby' ${script} || die
+		mv ${script} ${script%.rb} || die
+	done
+}
+
+each_ruby_install() {
+	insinto $(ruby_rbconfig_value 'sitedir')
+	doins *.rb || die "Installation of rb files failed"
+
+	use git && dobin togit
+	use mercurial && dobin tohg
+	use sqlite && dobin todb
+}