Use distutils.eclass instead of distutils-r1.eclass. Add live ebuild.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

5 files changed, 113 insertions, 32 deletions

diff --git a/media-sound/marrie/ChangeLog b/media-sound/marrie/ChangeLog
index 2790f9a0a0bd..3e3395bb75c6 100644
--- a/media-sound/marrie/ChangeLog
+++ b/media-sound/marrie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/marrie
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/ChangeLog,v 1.1 2012/11/22 04:39:08 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/ChangeLog,v 1.2 2012/11/23 01:28:57 rafaelmartins Exp $
+
+*marrie-9999 (23 Nov 2012)
+*marrie-0.3-r1 (23 Nov 2012)
+
+  23 Nov 2012; Rafael G. Martins <rafaelmartins@gentoo.org> -marrie-0.3.ebuild,
+  +marrie-0.3-r1.ebuild, +marrie-9999.ebuild:
+  Use distutils.eclass instead of distutils-r1.eclass. Add live ebuild.
 
 *marrie-0.3 (22 Nov 2012)
 
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index 8676764d78e1..c30ceb2407a3 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1,4 +1,5 @@
 DIST marrie-0.3.tar.gz 7565 SHA256 ec83a3ee9ececd94f4751d73f48b65241f290a1c0b665512c572542f9a0f6383 SHA512 3e90158b567c728a434dcd4965f7928dd704c8caca7e80b3f654b1156266e7af817a5aa9e10f01ab247acf505828b43a033cd84c698a817b9f203528b6f3037e WHIRLPOOL 8a7aed287a779c010de42e413b3de97c51be95dbe659fb9a2892eb858c944f4603885eaca6e38e4274da6e90e144cbd54da7c5e790c8e01120a8bf61cfec575c
-EBUILD marrie-0.3.ebuild 728 SHA256 bcb6b8b452010a229b75b05e0aad323f48cae98267609fe1d3176db2b290b376 SHA512 12d97e2a3d9b25fde98033953da5e15656935dab9011645537ef443a7a157b5b26db70f6d54b8870269b2b1b12dd0145baca86a862e1d05162b89f950b26b994 WHIRLPOOL cb8080d80847fecc8bf9ea397c25c7c2099de9137517e5f3a671d6c17bf0d61507bfc1ea06fdd9377cee631dfd798b37e0443b4539b83d40433bd89b5cd4546b
-MISC ChangeLog 358 SHA256 ec8075916926648a22a2497c1d616b0e306eaeb47425bc2913cf3d5b783aea97 SHA512 fffb21aa8d4bcac7881f8365ee54b967f4a7de51e9074e47929c64a743c57844c08ce7519757086023d25eb67a9cda1fc66575671f028613730f59e7966559a7 WHIRLPOOL 63cd47dcf15f474c46c5a8b35f884c7ef3bb145d639457825008e86890915d745592910ca49d2fea5fbae1c094be4a9427b064b89685c584531456c1ad886bce
+EBUILD marrie-0.3-r1.ebuild 1129 SHA256 b46acfbc3b3aa4f5ac8c868f72fa4055948c4f186ba68fbe125e4a6318a1c861 SHA512 3b9964101679dddf55918aff7c00080d3406725de3ad2111490fcf439eb641643c112eeb6c2753650ea84cc5cb03b22aae48e2bf36f8ba634b2cbaf7a322d6b9 WHIRLPOOL f392904b43a3ca69c21883b704bf82fa6a8cc9aefca2a5111b606a90def29e6816fad9992aa03c50553c8266bee43871cf4c8c1724da518111618ab00f7228c9
+EBUILD marrie-9999.ebuild 1127 SHA256 63c1a1d1d2716d8e55a977373c3d8c0ed630e88d116758689585a3c5d8c484bb SHA512 5dd53f84d1d182661d2d3966305cb2ea021b7c58c8e34ec8e66924c2d29a0031aba6272857884941ae6d9abfd802e8fb45409fcdb8344afa39bd71c9f2f646d3 WHIRLPOOL bbdb642894499c71dd53c5b7406f2b684f46025ae9b44fb5ccddb4f1db0e9be87841b08a1237ca374a15e40352f20ce912afea2b2865623ed3cdfe4360d712e9
+MISC ChangeLog 614 SHA256 b190709e28c8d64a4a1d2be5eef0e5f862ca6df8374bc047e34bcffd705f36a4 SHA512 2afe7e864530aa56cbc0a56e0ec34cd99f987c6fb0dc3be716fb695dddcee52c8ad31f591a226b192641314f37c27173f7184f5e3cba69d88aa60f968726e66a WHIRLPOOL ed1c07c879e73a5b80f26b31f7ef6a1e7731b8d017074087cc6426a4e3f143a2c833a9cb7a5fa1e883bdfe3a98bcb9b3b419a0cf4512ec2fccb3ef7c9d0bbd42
 MISC metadata.xml 495 SHA256 987375eceb3e50b6f07cd64365425fba4f77ced4dae4f24e946bc13a5ca5e48f SHA512 5892338666d768f881d7c48f6be08cb7be72e6470b2fddded9237ce6c261337b7f5f396986be36399f3bdd6dde278cbb3c7a8fdf5aa661a95bec31ee97171ead WHIRLPOOL 1dc743e37de363f887c09e81f95b38afb0c64feffd2234359a968675dc7ca489853d52e2576009d3abd778b2601b94347a6a1a8b6ad8956361db88b621cd6291
diff --git a/media-sound/marrie/marrie-0.3-r1.ebuild b/media-sound/marrie/marrie-0.3-r1.ebuild
new file mode 100644
index 000000000000..3539c414dc9e
--- /dev/null
+++ b/media-sound/marrie/marrie-0.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-0.3-r1.ebuild,v 1.1 2012/11/23 01:28:57 rafaelmartins Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/marrie/"
+	EHG_REVISION="default"
+fi
+
+inherit distutils ${HG_ECLASS}
+
+DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
+HOMEPAGE="http://projects.rafaelmartins.eng.br/marrie/"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="virtual/python-argparse
+	dev-python/feedparser"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		rst2html.py README.rst marrie.html || die "rst2html.py failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml marrie.html
+	fi
+}
diff --git a/media-sound/marrie/marrie-0.3.ebuild b/media-sound/marrie/marrie-0.3.ebuild
deleted file mode 100644
index 170dc63ec434..000000000000
--- a/media-sound/marrie/marrie-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-0.3.ebuild,v 1.1 2012/11/22 04:39:08 rafaelmartins Exp $
-
-EAPI=4
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
-HOMEPAGE="http://projects.rafaelmartins.eng.br/marrie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/python-argparse
-	dev-python/feedparser"
-DEPEND="${RDEPEND}
-	dev-python/docutils"
-
-DOCS_HTML=(README.html)
-
-src_compile() {
-	rst2html.py README.rst README.html
-	distutils-r1_src_compile
-}
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
new file mode 100644
index 000000000000..903a09da7490
--- /dev/null
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/marrie/marrie-9999.ebuild,v 1.1 2012/11/23 01:28:57 rafaelmartins Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/marrie/"
+	EHG_REVISION="default"
+fi
+
+inherit distutils ${HG_ECLASS}
+
+DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
+HOMEPAGE="http://projects.rafaelmartins.eng.br/marrie/"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="virtual/python-argparse
+	dev-python/feedparser"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		rst2html.py README.rst marrie.html || die "rst2html.py failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml marrie.html
+	fi
+}