version bump

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

3 files changed, 43 insertions, 33 deletions

diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index 6345aaa06564..d99111350530 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/blohg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.31 2014/06/09 03:33:49 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.32 2014/06/10 01:04:15 rafaelmartins Exp $
+
+*blohg-0.13 (10 Jun 2014)
+
+  10 Jun 2014; Rafael G. Martins <rafaelmartins@gentoo.org> +blohg-0.13.ebuild,
+  -blohg-0.12.ebuild:
+  version bump
 
   09 Jun 2014; Rafael G. Martins <rafaelmartins@gentoo.org> blohg-9999.ebuild:
   ported 9999 to distutils-r1, fixed deps
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index cc11058f6c68..ad0d4c96130f 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
+DIST blohg-0.13.tar.gz 75003 SHA256 34d10db8bdadee16931cadbdec904508e61d8f862b143f3a9e224171d92d0579 SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865 WHIRLPOOL b3396dfca37ff4279ece72d62c413cd590f7106c2d8aaeeaf0c46eba16c8a5f803955385052d557c39478ef71c37936a6204dccfb8db6384e9071ba346ee35f1
+EBUILD blohg-0.13.ebuild 1816 SHA256 5755043ac0cc76d6e08f618eefba064ebb1f663b15be7ec34814026c91b38203 SHA512 6390dd49a4cf3084bf49b8e97e2c350395a69ceee73951dbea27c4efbd829a548bf4f2edeb50cf0dec6f3eb7fcf31ac1eb0ee72c915b667de6e14682c87c45d4 WHIRLPOOL d954f59df23f9e7b1010a600873589c91fdb7036a86e1d78772cc6a598284a3d474db62fa9f12504258ce34f73b9d3a65efa5e1aefbd4f43416220cb857ccf7c
 EBUILD blohg-9999.ebuild 1817 SHA256 2fd4caa0cc06c1cd51547175fc1c7dbcbc686828de302087efd1c04f541bbce1 SHA512 3d2d09744b825d46272bac5a31f789865ca90d3deae52a2edc1548580d72ff563ed14fb69841b169df1b39c26d18b27f3c5ffe5987b1b639e582493af4dad350 WHIRLPOOL 0c49b5f02b74e6ecafe934a7ece0f4771529fb96ff84600c94c43f1fb3884b99848cba5ad887d147a68f474341e659e42bae721f0a7680d12b10e0e1c397fec5
-MISC ChangeLog 5129 SHA256 172491ff645830c9fd5c2c38aa5babcb1f7b181cf077291873b927526fe8850e SHA512 e40e4f5c3eaf97193ac04c5d0d7e9fdc42f404c92daff0a9a956c75efe1862f9793a2a2aa47e1026636ffa7dead274e397bfc647d498850c8313c3bcb7054646 WHIRLPOOL 7396c4c1acddc17d0ecfb0ac60a7868f8be7dad9ab51d18b2203098e2000fd24b4c85873669972ac95f1cc0514c7673a7ba2d416bf25bcb808008304fdc46d32
+MISC ChangeLog 5274 SHA256 cf46448eb04ffd1b69dc867c62712d3e631a1367fc2008655c2f16434b8feb61 SHA512 5a404b1bcf100b2f846b56667b19d0702d56ffae69186dbfc10f2a0d9054d5a554257cd35677c68b4c37c5fbf75531b8d1437f91b41cf88ee8e7887a3a423126 WHIRLPOOL bf485cebf74a4510ded3657d0561263d7953cccfb7e1984efb6da106d5d72d5888ae61e07b5615056a9c59b218b365e56c0f2f3557cee86dac656276e90a7d04
 MISC metadata.xml 969 SHA256 f8c03f1bfe35f8782fbf738744d08399a0974aade3281142d88b588bbdfc9f73 SHA512 19a236cda4eaba6c688808d29062fa2235e46a74b7d25653c2e139bad58fb2ace9519b6266e43c4881fd32757b799c8453fb4276f179059659575f50ce9dcc2b WHIRLPOOL fbc3c787979fcc6b24034324be5ee4aa64d952990eb2673ed30a643dfe23af7fe71dbf0e71e8ee04ac73fa212e23ab5458ae0987c17a2dbce9953209a8c67107
diff --git a/www-apps/blohg/blohg-0.12.ebuild b/www-apps/blohg/blohg-0.13.ebuild
index 89e772671d44..797c6f32546a 100644
--- a/www-apps/blohg/blohg-0.12.ebuild
+++ b/www-apps/blohg/blohg-0.13.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.12.ebuild,v 1.2 2013/11/28 05:29:24 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.13.ebuild,v 1.1 2014/06/10 01:04:15 rafaelmartins Exp $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
-DISTUTILS_SRC_TEST="setup.py"
+PYTHON_COMPAT=( python2_7 )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -16,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 		https://github.com/rafaelmartins/blohg"
 fi
 
-inherit distutils ${GIT_ECLASS}
+inherit distutils-r1 ${GIT_ECLASS}
 
 DESCRIPTION="A Mercurial (or Git) based blogging engine."
 HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
@@ -30,47 +27,54 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc git test"
+IUSE="doc git +mercurial test"
 
-RDEPEND="=dev-python/docutils-0.10*
+REQUIRED_USE="|| ( git mercurial )
+	test? ( git mercurial )"
+
+RDEPEND="
+	=dev-python/click-2.0
+	=dev-python/docutils-0.11*
 	>=dev-python/flask-0.10.1
 	>=dev-python/flask-babel-0.7
-	>=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.19* )"
+	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.19* )"
+	test? ( dev-python/mock )"
 
-src_compile() {
-	distutils_src_compile
+python_prepare_all() {
+	if ! use git; then
+		rm -rf blohg/vcs_backends/git || die 'rm failed'
+	fi
 
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
+	if ! use mercurial; then
+		rm -rf blohg/vcs_backends/hg || die 'rm failed'
 	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
 
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r docs/_build/html/*
-	fi
+python_test() {
+	esetup.py test
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
 	local ver="${PV}"
 	[[ ${PV} = *9999* ]] && ver="latest"