Updated the app-portage/g-octave live ebuild

(Portage version: 2.2_rc67/git/Linux i686)
 (Signed Manifest commit)

5 files changed, 34 insertions, 44 deletions

diff --git a/app-portage/g-octave/ChangeLog b/app-portage/g-octave/ChangeLog
index d7dbb3674..f2290c32e 100644
--- a/app-portage/g-octave/ChangeLog
+++ b/app-portage/g-octave/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Jul 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br>
+  -g-octave-0.1.ebuild, g-octave-9999.ebuild, metadata.xml:
+  Live ebuild updated. Removed old version (0.1)
+
 *g-octave-0.2_rc1 (30 Jun 2010)
 
   30 Jun 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br>
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index ad0e17540..be01f9bd0 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST g-octave-0.1.tar.gz 43336 RMD160 b7b2424f2befd365c5ae23702ff9972df74e8a78 SHA1 535e23bf68405597d184d564b964e4ba628662ff SHA256 2160da6717f171f23c9b0b3c483e19913794973ed1e6ec0aa84ecb585872b412
 DIST g-octave-0.2_rc1.tar.gz 44129 RMD160 ac6a480a2dd2243b6b06e43265f6f5afba476d78 SHA1 802be575b817c53037f7a35c378dcfe6bcd0bea2 SHA256 c824e92dcd3c36eeb43b9a9c360cb305719456cbfa91c0b3e8c6ee353e0416bf
-EBUILD g-octave-0.1.ebuild 703 RMD160 657fda7c798f03f5f5fe4df16e876f3076c84b8a SHA1 a142b8cb5e7313b144b94bcf5d0be0cd1b914122 SHA256 42d88f8816d1187418704fa223211617e75cbd83010291df412662b23684ff30
 EBUILD g-octave-0.2_rc1.ebuild 703 RMD160 657fda7c798f03f5f5fe4df16e876f3076c84b8a SHA1 a142b8cb5e7313b144b94bcf5d0be0cd1b914122 SHA256 42d88f8816d1187418704fa223211617e75cbd83010291df412662b23684ff30
-EBUILD g-octave-9999.ebuild 751 RMD160 61302a9bc948736d26e8c854adc4722fd852a573 SHA1 f82bea957d63fd30beea45bc0632222f976640bf SHA256 c41464b2a78f39d93c3faf42a8bb00d7aa7c55bb2f15ca013b9b1a7ebc8c63b1
-MISC ChangeLog 1132 RMD160 933f300a8788960952cafe751426eb71a3b035a7 SHA1 7546a888abcb8407402049afd27d77a546231529 SHA256 86b03b000fbb503cc5aabbfac296eec7c8e6523722aa4435afe8d43198faa939
-MISC metadata.xml 755 RMD160 c95cb26b5d1414bdc32e75426611fa2958b0ad0a SHA1 ede641c7cd18ad0f7956a81eaaab2e763f8197ba SHA256 cb005e8d8ce6bf8bad8e99edb3344916d0d5e61dbf736eed57b2c033dce1530f
+EBUILD g-octave-9999.ebuild 1055 RMD160 2c92bb90253e4606708d577872b4ea60fad33769 SHA1 a03138d4da08e602df19ff9fb31dba17dbaf5fa5 SHA256 e78e79c47a7967a00073426abae234b2c5c53bddec3a4198565eba8e73f63cbf
+MISC ChangeLog 1312 RMD160 6f86e7bb2047a73ff47ac5ba577e8ee493f1793f SHA1 f6a55ef35e95d5ae5147b09b90b4b2ac80c0a54a SHA256 7a0be8522bd9f4fa0252fc25dec88737d08b4dac800de4960920b3c64f122176
+MISC metadata.xml 889 RMD160 6cd8b7a8e3d52a6b6d2f4f702987838424d93fa2 SHA1 c385586c3896eef73bca782bcd2b5d198fd096da SHA256 7e04a432c79a3db31fc33cce53e5ef102ce421f2264470de709a2bcc498c5a6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEbBAEBAgAGBQJMK5wfAAoJEMmH5mwCk1NvTeAH+Ox5M10MDgpnJ8ZKwY8jivoL
-gTrjxhwuV5daTsRH1jP1PzCA1TNYkM32uTRxxkswP1bJye7XK7dPjouIjyxTl4Sg
-91H6cYJ42Mo4j2h/KE88+bLfURuzEz56M58tytyKSyxCyIYJURpwRjJ4JtKe3a8p
-tKPNnBAKujTtqAgJxrsvQyxunSqV3H0zFojs3Q1lfKTGmrhdJplH+uTTzXOEADm/
-cRXgmoKJRiD8wFUMMWhNoCZI5aQDBb0Tbbg1yNCRKsuyhmIDKlCVLIUHvhDhYlT+
-eQu8YBh7TLXQ6Ghp9q8s5+B0t9RJt4aE77idAVXKjUgO5PVxRbJVDylRaGQDTA==
-=VQxT
+iQEcBAEBAgAGBQJMLSa2AAoJEMmH5mwCk1NvWnYIAIs9wP8FIS7M/aG7GWnTl1eI
+8tH8yfpfb6actO+D1GQfcDL+e8kfDPMTs3nYPGKGLBOXEsEUlQYBXdk5XIAaBA57
+cnN20HP+zzezancHuuecVUPBQeVqpGu+5SxC7CDFNSca1W4/ScmqP5hS5fGXYfP0
+AOeombvqx69C6yFkCiaEW7NNPOWEhY9TtgTBBfusD8cTtMhQ9ejTXFStsxOrtPoi
+2KCsD6clNvPcXBcYtqs6JEl+vVR0cqhXGIWuMmdcAW2GRu+0U10lsce8cvCl4zKJ
+ijaKlV/KWob9KLXdLGi1ZFE710oUplM6/TM3BkusSikpU2VCMYbdDXyszn+UEeg=
+=zZHf
 -----END PGP SIGNATURE-----
diff --git a/app-portage/g-octave/g-octave-0.1.ebuild b/app-portage/g-octave/g-octave-0.1.ebuild
deleted file mode 100644
index 7bf278267..000000000
--- a/app-portage/g-octave/g-octave-0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
-HOMEPAGE="http://g-octave.rafaelmartins.eng.br/"
-SRC_URI="http://g-octave.rafaelmartins.eng.br/distfiles/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="( >=dev-lang/python-2.6 <dev-lang/python-3 )"
-RDEPEND="${DEPEND}
-	|| ( >=sys-apps/portage-2.1.7[-python3] <sys-apps/portage-2.1.7 )"
-
-src_install() {
-	distutils_src_install
-	dohtml ${PN}.html
-	doman ${PN}.1
-}
-
-src_test() {
-	PYTHONPATH=. scripts/run_tests.py || die "test failed."
-}
diff --git a/app-portage/g-octave/g-octave-9999.ebuild b/app-portage/g-octave/g-octave-9999.ebuild
index 1ddb4f830..ebab60f83 100644
--- a/app-portage/g-octave/g-octave-9999.ebuild
+++ b/app-portage/g-octave/g-octave-9999.ebuild
@@ -13,15 +13,27 @@ EHG_REPO_URI="http://g-octave.rafaelmartins.eng.br/hg/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="svn test"
 
 CDEPEND="( >=dev-lang/python-2.6 <dev-lang/python-3 )"
 DEPEND="${CDEPEND}
 	>=dev-python/docutils-0.6"
 RDEPEND="${CDEPEND}
+	svn? ( dev-python/pysvn )
 	|| ( >=sys-apps/portage-2.1.7[-python3] <sys-apps/portage-2.1.7 )"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/hg"
+
+PYTHON_MODNAME="g_octave"
+
+src_prepare() {
+	distutils_src_prepare
+	if ! use svn; then
+		rm -rf g_octave/svn/ || die 'failed to remove the Subversion stuff.'
+		sed -i -e '/g_octave.svn/d' -e '/pysvn/d' setup.py \
+			|| die 'failed to remove the SVN stuff from setup.py'
+	fi
+}
 
 src_install() {
 	distutils_src_install
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index bfc62e668..101f90d23 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/metadata.xml
@@ -14,5 +14,11 @@
 		handle patches to the packages automatically. The command line interface
 		tries to be very similar to the interface of the emerge tool.
 	</longdescription>
+	<use>
+		<flag name="svn">
+			Adds support to the installation of packages from the octave-forge
+			SVN repository.
+		</flag>
+	</use>
 </pkgmetadata>