ported 9999 to distutils-r1, fixed deps

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

3 files changed, 24 insertions, 30 deletions

diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index bd091c46f0f6..6345aaa06564 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,9 @@
 # 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.30 2013/11/29 03:54:22 rafaelmartins Exp $
+# 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 $
+
+  09 Jun 2014; Rafael G. Martins <rafaelmartins@gentoo.org> blohg-9999.ebuild:
+  ported 9999 to distutils-r1, fixed deps
 
   29 Nov 2013; Rafael G. Martins <rafaelmartins@gentoo.org> blohg-9999.ebuild,
   metadata.xml:
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 988db460d87f..cc11058f6c68 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 1971 SHA256 39138633e0ea4667f1b08d52396bb28319e1bbeb471cfb773e474d2b4217fb12 SHA512 1d401cd55d6b9b558a4b48284245f54bc6d02a8a9a4b9a77e1f523e3836b7f1bbb934c6b9510aa49bdd815ab53e4c8ce9c23720550fc033ca0a11af93b46451c WHIRLPOOL 4916ee6a9196158493803bb5211bca4630815ed2405925a69df57afdde56b76738f2750a09b0e36857cf989f1fd338a0750ea6d299088ca619e3eb1bf1514d00
-MISC ChangeLog 5007 SHA256 0c31daa0f72e7c084570e025bac8b590a76c8f4c1199dbe6c73420febd09f466 SHA512 edb69e5edd96d3be585852e1f80ad7e53fc713a4631f82406c6f5fe94b98114c6f9e4c5d5828d03acc9204ddd1cd7009222563d653c4264e98b9c1b3885eba93 WHIRLPOOL 02e8f6181b72665e293c3c76f9b36d8e2dbc6642db48ffcfc07d967c4100c772daa5c15905544e493c65d35bd198436f6abe5ba0db7c5fe37c213000693eb63d
+EBUILD blohg-9999.ebuild 1817 SHA256 2fd4caa0cc06c1cd51547175fc1c7dbcbc686828de302087efd1c04f541bbce1 SHA512 3d2d09744b825d46272bac5a31f789865ca90d3deae52a2edc1548580d72ff563ed14fb69841b169df1b39c26d18b27f3c5ffe5987b1b639e582493af4dad350 WHIRLPOOL 0c49b5f02b74e6ecafe934a7ece0f4771529fb96ff84600c94c43f1fb3884b99848cba5ad887d147a68f474341e659e42bae721f0a7680d12b10e0e1c397fec5
+MISC ChangeLog 5129 SHA256 172491ff645830c9fd5c2c38aa5babcb1f7b181cf077291873b927526fe8850e SHA512 e40e4f5c3eaf97193ac04c5d0d7e9fdc42f404c92daff0a9a956c75efe1862f9793a2a2aa47e1026636ffa7dead274e397bfc647d498850c8313c3bcb7054646 WHIRLPOOL 7396c4c1acddc17d0ecfb0ac60a7868f8be7dad9ab51d18b2203098e2000fd24b4c85873669972ac95f1cc0514c7673a7ba2d416bf25bcb808008304fdc46d32
 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 230ca141b8c1..6e460580e171 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.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-9999.ebuild,v 1.18 2013/11/29 03:54:22 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.19 2014/06/09 03:33:49 rafaelmartins Exp $
 
 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"
@@ -35,10 +32,11 @@ IUSE="doc git +mercurial test"
 REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
 
-RDEPEND="=dev-python/docutils-0.10*
+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-python/pyyaml
@@ -51,7 +49,7 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
 	test? ( dev-python/mock )"
 
-src_prepare() {
+python_prepare_all() {
 	if ! use git; then
 		rm -rf blohg/vcs_backends/git || die 'rm failed'
 	fi
@@ -60,30 +58,23 @@ src_prepare() {
 		rm -rf blohg/vcs_backends/hg || die 'rm failed'
 	fi
 
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
-	fi
+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"