[patch] diff -u patch

qct.patch (text/plain), 2.51 KB, created by Ian Delaney (RETIRED) on 2015-02-23 15:18:04 UTC

--- qct-1.7.ebuild	2011-01-18 20:55:44.000000000 +0800
+++ qct-1.7-r1.ebuild	2015-02-23 23:00:44.123051166 +0800
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/qct-1.7.ebuild,v 1.9 2011/01/18 12:55:44 arfrever Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="PyQt based commit tool for many VCSs"
 HOMEPAGE="http://qct.sourceforge.net/"
@@ -18,32 +18,24 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="bazaar cvs mercurial monotone subversion"
 
-DEPEND="app-text/asciidoc
+DEPEND="app-text/asciidoc[${PYTHON_USEDEP}]
 	app-text/xmlto
-	dev-python/PyQt4
-	bazaar? ( dev-vcs/bzr )
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )
 	cvs? ( dev-vcs/cvs )
-	mercurial? ( dev-vcs/mercurial )
+	mercurial? ( dev-vcs/mercurial[${PYTHON_USEDEP}] )
 	monotone? ( dev-vcs/monotone )
-	subversion? ( dev-vcs/subversion )"
+	subversion? ( dev-vcs/subversion[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
-	python_pkg_setup
-
-	PYTHON_MODNAME="qctlib"
-	if use bazaar; then
-		PYTHON_MODNAME+=" bzrlib/plugins/qctBzrPlugin.py"
-	fi
-	if use mercurial; then
-		PYTHON_MODNAME+=" hgext/qct.py"
-	fi
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	distutils_src_prepare
+	distutils-r1_src_prepare
 
 	rm qctlib/vcs/p4.py
 
@@ -59,7 +51,7 @@
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 
 	# manpage and html docs are built using asciidoc
 	make -C doc man html || die
@@ -67,20 +59,14 @@
 	dohtml doc/qct.1.html || die
 
 	if use bazaar; then
-		install_bazaar_plugins() {
-			insinto "$(python_get_sitedir)/bzrlib/plugins" || return 1
-			doins plugins/qctBzrPlugin.py || return 1
-		}
-		python_execute_function -q install_bazaar_plugins
+		insinto "$(python_get_sitedir)/bzrlib/plugins"
+		doins plugins/qctBzrPlugin.py
 	fi
 
 	if use mercurial; then
-		install_mercurial_extension() {
-			insinto "$(python_get_sitedir)/hgext" || return 1
-			doins hgext/qct.py || return 1
-		}
-		python_execute_function -q install_mercurial_extension
-		insinto /etc/mercurial/hgrc.d || die
-		doins "${FILESDIR}/qct.rc" || die
+		insinto "$(python_get_sitedir)/hgext"
+		doins hgext/qct.py
+		insinto /etc/mercurial/hgrc.d
+		doins "${FILESDIR}/qct.rc"
 	fi
 }