Addition of git, mercurial and sqlite use flags. Rework ebuild to

EAPI4. Cleaner use of ruby-ng eclass

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

4 files changed, 87 insertions, 16 deletions

diff --git a/dev-vcs/fromcvs/ChangeLog b/dev-vcs/fromcvs/ChangeLog
index fb315a031705..e2f3895e456f 100644
--- a/dev-vcs/fromcvs/ChangeLog
+++ b/dev-vcs/fromcvs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2011/06/16 18:58:34 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fromcvs/ChangeLog,v 1.2 2011/06/18 09:51:59 sochotnicky Exp $
+
+*fromcvs-0_pre132-r1 (18 Jun 2011)
+
+  18 Jun 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +fromcvs-0_pre132-r1.ebuild, metadata.xml:
+  Addition of git, mercurial and sqlite use flags. Rework ebuild to
+  EAPI4. Cleaner use of ruby-ng eclass
 
   16 Jun 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   +fromcvs-0_pre132.ebuild, +metadata.xml:
diff --git a/dev-vcs/fromcvs/Manifest b/dev-vcs/fromcvs/Manifest
index 8f0f969bac01..6c9a317b3887 100644
--- a/dev-vcs/fromcvs/Manifest
+++ b/dev-vcs/fromcvs/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+EBUILD fromcvs-0_pre132-r1.ebuild 1503 RMD160 6289b7f98f665dfe06f6d36085c6588df3868056 SHA1 7f8f398bf7723b3c78e0382b41f5353709dc392e SHA256 1176d658d1650f3d75cf7268fe454ff454a53eb777de4a758c95e756185c70ef
 EBUILD fromcvs-0_pre132.ebuild 1217 RMD160 81bddabf12649d662325e45b22c6f62d2c0cbc32 SHA1 4158f0a9532967a4e8ae1987aa2bb840b145fe9e SHA256 0b27d1d5eb0cceca69bbc31b698cc056f01ac531c43d12a7f8bfeb4c84e82c97
-MISC ChangeLog 542 RMD160 1c429ba23b2814b85d0d7d7570a525631ee291f2 SHA1 4a4700f1f405e740c62b6a7493755e2d036c0294 SHA256 26e5605801b0a5a4c47a848835087002833132ca5919cf0e15efa4145a59c0a8
-MISC metadata.xml 267 RMD160 20f48fc2e9335f1a2d0e3abb1c85cff3016d9481 SHA1 ab68ff1a621217ed8ea15b9e23ea0e93208685ec SHA256 4bb19d2289d86087ec468dd097eac1a5e84c19a9ccf1a5fee36dc1bf87c347a7
+MISC ChangeLog 792 RMD160 6a49eb755b7d5d07ec8c095775d85333fd7b3894 SHA1 7bdf1c0cd8157317c27625bc18fadf7a935b7c6b SHA256 1738833b9afab72ff905330302754ead6eba3eaa99fb895a8cb5d70dde39df30
+MISC metadata.xml 508 RMD160 96a949fb39d24b348c8da408dde6c8efdd0910a2 SHA1 f170b2c3d8d3afc6ee57a50d449f4726cc059307 SHA256 d0f5ede0994040a4b6f832c47bbd74d0344476fefe9ade2656a01097fb30b5e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN+lJ2AAoJELy9dS57CHJBjX0QAJBBCarP6BskJimSps1nGVBE
-PTu4RlIYQXkDrPTKFz35BZYAffKo8t3BSK1XmydlhcksOogL1lVv9sIs98fhawoi
-Cmkw2FNNqu15HPOrSMDPCdQmXMv+3OQ5C/5TZPM/UxoyHe9iVP0Sb4ELAarhVWz4
-jC/qH/gM9rh2ndCk8CTaDXR5o86vkdRiuQV6SF3gkVFie4D5JW71ZEu1DckSpqLw
-IvGCnBodimkEALp9pvDTgZxzdX9YDKabHzAB43X3ABt09myZ5CzHaNxSx7QbTgtz
-NLJZqsIk2dIaJZL0Kz+gcdijZHD6frJu7VBKwktt7ly27p9uqMSztrpJ+5BQcN09
-Q4iv6PgoSNpM1TYM7zb4I23/QL2Y0aavrX+pb4dllLi60UBhYIGYqnXH8IQ8AqlN
-7tJUls6qQRBO6OsoWB0B3dACqw7QnJTRtiktNflDq8zXzUhBoKw7twF+Oid3GDDn
-aKxTW0Q8/5n5uh2mx62ND9WGF8M2JDpsAuhR7tSdm9oDi4gGZyu8rFOdVp8XLvhB
-nKIXpPNRVzbgwScIMxP1AQD6IjRK6M0AXGaPRiT+PM/c8i3iXPIe5agJNY3QBwHi
-jTGK3jawxUFpa/E25tSlPWrwVpr+OKWAD9I5x6MnDpwwSR+/SGArUdmc2VQjg0EV
-hD+2swJF4y0OIVNv9X8/
-=hHml
+iQIcBAEBCAAGBQJN/HVmAAoJELy9dS57CHJBlo0QANIPFRyoEkjwr+CQUuIL5n7D
+xGg55sZyqevKNFZmuF1Y5nfbj1zKg+HKfXTxQ8vVoz5fgra+p0iiwWSqpMAX3nbV
+eXN161U9qWngdULe9RvPgKHIWsdTpUPtM/hXngqolZveKLQttgvFqGFM2hnwH/yn
+pYUDw4ZHtwQ2eH5Zyl7dYmDKpsenkPGzxK4W6heRz5yD/lCFhgUnMxvkQfFIontZ
+HwiJRWkVmTbbPkoSh84m1OjVys1N/qkwHb1jx9P+XAiOgqeyPkmjmLnqURD21ED+
+NrAI7WOxBpN9pRE79tcfJr4V3PrO4GsTMZHFsCmINc5kRRP9Yr5SwTCIoFGvHkfQ
+r/fetpWaZJwF/dHQdHWdbVFJxj6wQkBSRv0u5i90qLVi6h631rXXIyMVLz7Esf88
+LDEXOejOTVHLLVeigi92erBbkI+pL4lJJBfTtWc8khsL/DKs0jUulW4gGY387Kw4
+DX4fXSiedtxp9JkPMbFGAf6AyKB+Wo/6lZm1FDstuXUn+AajCmM5OLxcudgdnTF8
+neBzdmOemAnsWXPhVyAUXwUp6NKPm5EhRsoqpuqgUxMDD3SOIYAi5usFDBY2qBx5
+9oMkMcUJuvgUjpbLqawAZ7WjjUuK5Py6//HeAupHoRL1Y0LjcZvsQRcIPGrHnubJ
+rJo28ArEd959y2NKRriV
+=irJ+
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/fromcvs/fromcvs-0_pre132-r1.ebuild b/dev-vcs/fromcvs/fromcvs-0_pre132-r1.ebuild
new file mode 100644
index 000000000000..5cdf590bf867
--- /dev/null
+++ b/dev-vcs/fromcvs/fromcvs-0_pre132-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fromcvs/fromcvs-0_pre132-r1.ebuild,v 1.1 2011/06/18 09:51:59 sochotnicky Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+#mercurial after ruby!
+inherit ruby-ng mercurial
+
+MY_PV="${PV#0_pre}"
+
+DESCRIPTION="fromcvs converts cvs to git, hg or sqlite database"
+HOMEPAGE="http://ww2.fs.ei.tum.de/~corecode/hg/fromcvs"
+SRC_URI=""
+EHG_REPO_URI="http://ww2.fs.ei.tum.de/~corecode/hg/fromcvs"
+EHG_REVISION="${MY_PV}"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git mercurial sqlite"
+
+RUBY_S="${P}"
+# return S to default after ruby-ng has modified it
+S="${WORKDIR}/${RUBY_S}"
+
+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 )"
+
+src_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}
+		mv ${script} ${script%.rb}
+	done
+
+	# this is a workaround because combination of ruby-ng and mercurial is
+	# not working correctly for unpacking
+	for rubyv in ${USE_RUBY} all;do
+		mkdir "${WORKDIR}/${rubyv}"
+		cp -prl "${S}" "${WORKDIR}/${rubyv}/${RUBY_S}"
+	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
+}
diff --git a/dev-vcs/fromcvs/metadata.xml b/dev-vcs/fromcvs/metadata.xml
index 7c1e9877610e..e8bf1ad8aad1 100644
--- a/dev-vcs/fromcvs/metadata.xml
+++ b/dev-vcs/fromcvs/metadata.xml
@@ -6,5 +6,9 @@
 		<email>sochotnicky@gentoo.org</email>
 		<name>Stanislav Ochotnicky</name>
 	</maintainer>
+        <use>
+          <flag name='git'>Add support for conversion to <pkg>dev-vcs/git</pkg> repositories</flag>
+          <flag name='mercurial'>Add support for conversion to <pkg>dev-vcs/mercurial</pkg> repositories</flag>
+        </use>
 </pkgmetadata>