[patch] Patch converting to distutils-r1

0001-www-apps-ownpaste-convert-to-distutils-r1.patch (text/plain), 4.90 KB, created by Michał Górny on 2013-07-22 10:58:03 UTC

From 4e19de7bd5516c4394332286d42a7a3851b2b1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Mon, 22 Jul 2013 12:54:57 +0200
Subject: [PATCH] www-apps/ownpaste: convert to distutils-r1.

---
 ...paste-0.2.2.ebuild => ownpaste-0.2.2-r1.ebuild} | 39 ++++++++++------------
 gx86/www-apps/ownpaste/ownpaste-9999.ebuild        | 39 ++++++++++------------
 2 files changed, 34 insertions(+), 44 deletions(-)
 copy gx86/www-apps/ownpaste/{ownpaste-0.2.2.ebuild => ownpaste-0.2.2-r1.ebuild} (53%)

diff --git a/gx86/www-apps/ownpaste/ownpaste-0.2.2.ebuild b/gx86/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
similarity index 53%
copy from gx86/www-apps/ownpaste/ownpaste-0.2.2.ebuild
copy to gx86/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
index 802eb87..7b9906d 100644
--- a/gx86/www-apps/ownpaste/ownpaste-0.2.2.ebuild
+++ b/gx86/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-0.2.2.ebuild,v 1.3 2012/12/26 23:30:45 ottxor Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 HG_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
 fi
 
-inherit python-distutils-ng ${HG_ECLASS}
+inherit distutils-r1 ${HG_ECLASS}
 
 DESCRIPTION="Private pastebin (server-side implementation)"
 HOMEPAGE="http://ownpaste.rtfd.org/ http://pypi.python.org/pypi/ownpaste"
@@ -28,32 +28,27 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 fi
 
-RDEPEND="dev-python/setuptools
-	>=dev-python/flask-0.8
-	>=dev-python/flask-script-0.3.3
-	>=dev-python/flask-sqlalchemy-0.15
-	>=dev-python/jinja-2.6
-	>=dev-python/werkzeug-0.8
-	>=dev-python/sqlalchemy-migrate-0.7.2
-	dev-python/pygments
-	dev-python/pytz"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	python-distutils-ng_src_compile
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+python_compile_all() {
 	if use doc; then
 		einfo 'building documentation'
 		emake -C docs html
 	fi
 }
 
-src_install() {
-	python-distutils-ng_src_install
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
 
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r "${S}/docs/_build/html/"*
-	fi
+	distutils-r1_python_install_all
 }
diff --git a/gx86/www-apps/ownpaste/ownpaste-9999.ebuild b/gx86/www-apps/ownpaste/ownpaste-9999.ebuild
index 878d58f..bb71ef5 100644
--- a/gx86/www-apps/ownpaste/ownpaste-9999.ebuild
+++ b/gx86/www-apps/ownpaste/ownpaste-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/ownpaste/ownpaste-9999.ebuild,v 1.4 2012/12/26 23:30:45 ottxor Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 HG_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
 fi
 
-inherit python-distutils-ng ${HG_ECLASS}
+inherit distutils-r1 ${HG_ECLASS}
 
 DESCRIPTION="Private pastebin (server-side implementation)"
 HOMEPAGE="http://ownpaste.rtfd.org/ http://pypi.python.org/pypi/ownpaste"
@@ -28,32 +28,27 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 fi
 
-RDEPEND="dev-python/setuptools
-	>=dev-python/flask-0.8
-	>=dev-python/flask-script-0.3.3
-	>=dev-python/flask-sqlalchemy-0.15
-	>=dev-python/jinja-2.6
-	>=dev-python/werkzeug-0.8
-	>=dev-python/sqlalchemy-migrate-0.7.2
-	dev-python/pygments
-	dev-python/pytz"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	python-distutils-ng_src_compile
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+python_compile_all() {
 	if use doc; then
 		einfo 'building documentation'
 		emake -C docs html
 	fi
 }
 
-src_install() {
-	python-distutils-ng_src_install
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
 
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r "${S}/docs/_build/html/"*
-	fi
+	distutils-r1_python_install_all
 }
-- 
1.8.3.2