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

EAPI4. Cleaner use of ruby-ng eclass

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 71 insertions, 1 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/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>