Added mercurial USE flag for live ebuild

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

4 files changed, 37 insertions, 17 deletions

diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index 145fd81b5a08..bd091c46f0f6 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/blohg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.29 2013/11/29 03:13:00 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.30 2013/11/29 03:54:22 rafaelmartins Exp $
+
+  29 Nov 2013; Rafael G. Martins <rafaelmartins@gentoo.org> blohg-9999.ebuild,
+  metadata.xml:
+  Added mercurial USE flag for live ebuild
 
   29 Nov 2013; Rafael G. Martins <rafaelmartins@gentoo.org> blohg-9999.ebuild:
   Bump pygit2 for the live ebuild
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index b371070d043d..988db460d87f 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
 DIST blohg-0.12.tar.gz 74463 SHA256 fa7c3c5e5221b46b58f8d36c423ff8fde86091e14537e38c2ac2361e34152b1d SHA512 77f6a6f95290d7a87c96101d5ca51922523743d48196b9982b823578fe12fc5afb415122839fce68fadb6c65178c04f81f507cc81c641ef18c1723e8e9bf89e6 WHIRLPOOL 2c8280c569d4345121b90e8109288543ee07161796dfdeb610ee180694cbaf72830de90133afe7b882540ad844c90b653b65c26e642629fe20b79894854ad8b6
 EBUILD blohg-0.12.ebuild 1714 SHA256 a2978d375c5270f9ecfa449abfc357db400eed66ced7c436579bd04bc8c21337 SHA512 854e029af57a0a2e5c7212a77379a34d35a296630eca5729f8fd3baa43dc09511acef6b196ba7b6458353d986c34ffaba4ac23b9bed0150a4a054300283d6332 WHIRLPOOL 32dac1c849a53c36ee2dcf83f0587bfc5e0cebec48669ce05635b3258cffe7ddd0873c58fab34e95e2a5ade14859347e1b68abc2806f83130e774338a7495ff9
-EBUILD blohg-9999.ebuild 1715 SHA256 80153f6eceafd2cb1f47d93069f8d4f0ddc90597835866c0c23da97053e6101e SHA512 da673f47c935c771d634c2809c59e02067b526fe3442d09e5941a45a52cc0da08a8f4ab3dd7d67db7ead7bfd19477b71f28f9d82b6fa4dc3bd4bd686ce515dd3 WHIRLPOOL 969fa348e81f3c3f646510b297e180d53b0a4d11f5cd7c7b0990a627d93f53ae1a909b190c3f4f113d7330e894bcf8f8c088ecb19e178a967fd25344c39a6ce2
-MISC ChangeLog 4868 SHA256 e48f6132a362bb6a3e5d5ba6ca0041718ca89041a4b40789607c8eea40f4ca89 SHA512 f47c3397c2f665cafe42bb67990fc528fc172b748e848bdc7c89a9287fd9fc2a0fd39a210f32b880df84587a835efddc36926e35e23cdba29acee0e285867d7d WHIRLPOOL 86e0180494eb5db515dcabbbd820fc47cabca6f5a4f54c999862dba43a5cc53475519a3cac9cfa18dafa4f3fa7c836c04f046cc88ce0ad572dde297c15fe606f
-MISC metadata.xml 904 SHA256 9fec739f35b557d82e96f55f18f919edf201f3c77d281c8ae2dc18b44bc6b084 SHA512 781248efc8d2b68ef3175c6a9b5e31037430c0f7394f1351d41d4805cc764d805362f1b384c336fd301a643b1b257311083aaf675a5f3b9b0861906b5380c742 WHIRLPOOL 0a6ea95edb97c0798e97ea9cee41ee7918217bdfb8daf2714af419b751953d70747b30f57d3aa451698d33ecb204573af2096587ea312a48481eeaaa1fa5fa73
+EBUILD blohg-9999.ebuild 1971 SHA256 39138633e0ea4667f1b08d52396bb28319e1bbeb471cfb773e474d2b4217fb12 SHA512 1d401cd55d6b9b558a4b48284245f54bc6d02a8a9a4b9a77e1f523e3836b7f1bbb934c6b9510aa49bdd815ab53e4c8ce9c23720550fc033ca0a11af93b46451c WHIRLPOOL 4916ee6a9196158493803bb5211bca4630815ed2405925a69df57afdde56b76738f2750a09b0e36857cf989f1fd338a0750ea6d299088ca619e3eb1bf1514d00
+MISC ChangeLog 5007 SHA256 0c31daa0f72e7c084570e025bac8b590a76c8f4c1199dbe6c73420febd09f466 SHA512 edb69e5edd96d3be585852e1f80ad7e53fc713a4631f82406c6f5fe94b98114c6f9e4c5d5828d03acc9204ddd1cd7009222563d653c4264e98b9c1b3885eba93 WHIRLPOOL 02e8f6181b72665e293c3c76f9b36d8e2dbc6642db48ffcfc07d967c4100c772daa5c15905544e493c65d35bd198436f6abe5ba0db7c5fe37c213000693eb63d
+MISC metadata.xml 969 SHA256 f8c03f1bfe35f8782fbf738744d08399a0974aade3281142d88b588bbdfc9f73 SHA512 19a236cda4eaba6c688808d29062fa2235e46a74b7d25653c2e139bad58fb2ace9519b6266e43c4881fd32757b799c8453fb4276f179059659575f50ce9dcc2b WHIRLPOOL fbc3c787979fcc6b24034324be5ee4aa64d952990eb2673ed30a643dfe23af7fe71dbf0e71e8ee04ac73fa212e23ab5458ae0987c17a2dbce9953209a8c67107
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index 152b24b7a19e..230ca141b8c1 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.17 2013/11/29 03:13:00 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.18 2013/11/29 03:54:22 rafaelmartins Exp $
 
-EAPI="3"
+EAPI=5
 
 PYTHON_DEPEND="2:2.7"
 SUPPORT_PYTHON_ABIS="1"
@@ -30,7 +30,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc git test"
+IUSE="doc git +mercurial test"
+
+REQUIRED_USE="|| ( git mercurial )
+	test? ( git mercurial )"
 
 RDEPEND="=dev-python/docutils-0.10*
 	>=dev-python/flask-0.10.1
@@ -38,17 +41,27 @@ RDEPEND="=dev-python/docutils-0.10*
 	>=dev-python/flask-script-0.5.3
 	>=dev-python/frozen-flask-0.7
 	>=dev-python/jinja-2.5.2
-	>=dev-vcs/mercurial-1.6
 	dev-python/pyyaml
 	dev-python/setuptools
 	dev-python/pygments
-	git? ( =dev-python/pygit2-0.20* )"
+	git? ( =dev-python/pygit2-0.20* )
+	mercurial? ( >=dev-vcs/mercurial-1.6 )"
 
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/mock
-		=dev-python/pygit2-0.20* )"
+	test? ( dev-python/mock )"
+
+src_prepare() {
+	if ! use git; then
+		rm -rf blohg/vcs_backends/git || die 'rm failed'
+	fi
+
+	if ! use mercurial; then
+		rm -rf blohg/vcs_backends/hg || die 'rm failed'
+	fi
+
+	distutils_src_prepare
+}
 
 src_compile() {
 	distutils_src_compile
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
index cac8fec37933..f7cb22f5c7ee 100644
--- a/www-apps/blohg/metadata.xml
+++ b/www-apps/blohg/metadata.xml
@@ -5,11 +5,13 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">blohg is a Mercurial-based blogging engine written in Python, built with
-	the Flask micro-framework and some of his available extensions. All the
-	content of the blogs are stored inside Mercurial repositories and the
-	repository history is used for build the posts and pages. blohg uses
-	Jinja2 as template engine.</longdescription>
+	<longdescription lang="en">
+		blohg is a Mercurial (or Git) based blogging engine written in Python,
+		built with the Flask micro-framework and some of his available extensions.
+		All the content of the blogs are stored inside repositories and the
+		repository history is used for build the posts and pages. blohg uses
+		Jinja2 as template engine.
+	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafaelmartins@gentoo.org</email>
@@ -20,5 +22,6 @@
 	</upstream>
 	<use>
 		<flag name="git">Enable Git support</flag>
+		<flag name="mercurial">Enable Mercurial support</flag>
 	</use>
 </pkgmetadata>