Replace use of distutils.eclass with -r1.eclass. Update EAPI in order to drop prepalldocs. Remove usage of PATCHES since it will cause a conflict when both distutils-r1.eclass and qt4-r1.eclass runs it.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

2 files changed, 20 insertions, 17 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 25b4c8f081f4..9b9df2b3cd17 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.60 2013/03/02 21:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.61 2013/03/03 10:19:04 ssuominen Exp $
+
+  03 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  xxdiff-4.0_beta1_p20110426.ebuild:
+  Replace use of distutils.eclass with -r1.eclass. Update EAPI in order to drop
+  prepalldocs. Remove usage of PATCHES since it will cause a conflict when both
+  distutils-r1.eclass and qt4-r1.eclass runs it.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   xxdiff-4.0_beta1_p20110426.ebuild:
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
index b2868c4d900e..1b252ff6b4df 100644
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.7 2013/03/02 21:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.8 2013/03/03 10:19:04 ssuominen Exp $
 
-EAPI=3
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils qt4-r2
+inherit distutils-r1 eutils qt4-r2
 
 DESCRIPTION="A graphical file and directories comparator and merge tool"
 HOMEPAGE="http://furius.ca/xxdiff/"
@@ -22,15 +20,15 @@ IUSE=""
 RDEPEND="dev-qt/qtgui:4"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+
 	pushd src >/dev/null
 	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
 	qt4-r2_src_prepare
 	popd
 
-	distutils_src_prepare
+	distutils-r1_src_prepare
 }
 
 src_configure() {
@@ -38,6 +36,8 @@ src_configure() {
 	qt4-r2_src_configure
 	cat Makefile.extra >> Makefile
 	popd
+
+	distutils-r1_src_configure
 }
 
 src_compile() {
@@ -45,13 +45,13 @@ src_compile() {
 	qt4-r2_src_compile
 	popd
 
-	distutils_src_compile
+	distutils-r1_src_compile
 }
 
 src_install() {
-	dobin bin/xxdiff || die
+	dobin bin/xxdiff
 
-	distutils_src_install
+	distutils-r1_src_install
 
 	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
 
@@ -59,8 +59,5 @@ src_install() {
 
 	# example tools, use these to build your own ones
 	insinto /usr/share/doc/${PF}
-	doins -r tools || die
-
-	# missing EAPI=4 support in distutils.eclass, forced to use prepalldocs
-	prepalldocs
+	doins -r tools
 }