From 3ca8ccd78860f4468755a3c80da385c35093d2ec Mon Sep 17 00:00:00 2001
From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@gentoo.org>
Date: Tue, 27 Dec 2011 14:26:35 +0000
Subject: [PATCH] dev-python/diff-match-patch: Ebuild clean up wrt test phase.

distutils eclass src_test() is used instead of custom one. Also distutils
eclass src_prepare() is called at the beginning of custom one.

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64
---
 dev-python/diff-match-patch/ChangeLog          |  9 ++++++++-
 dev-python/diff-match-patch/Manifest           | 18 +++++++++---------
 .../diff-match-patch-20110725.1.ebuild         | 16 ++++------------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/dev-python/diff-match-patch/ChangeLog b/dev-python/diff-match-patch/ChangeLog
index 40ce9e97595e..4ffc30a28e98 100644
--- a/dev-python/diff-match-patch/ChangeLog
+++ b/dev-python/diff-match-patch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/diff-match-patch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/diff-match-patch/ChangeLog,v 1.1 2011/12/27 13:07:18 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/diff-match-patch/ChangeLog,v 1.2 2011/12/27 14:26:35 aidecoe Exp $
+
+  27 Dec 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  diff-match-patch-20110725.1.ebuild:
+  Ebuild clean up wrt test phase.
+
+  distutils eclass src_test() is used instead of custom one. Also distutils
+  eclass src_prepare() is called at the beginning of custom one.
 
 *diff-match-patch-20110725.1 (27 Dec 2011)
 
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index bcc0d5fdd9cc..618e9324dd53 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST diff-match-patch-20110725.1.tar.gz 53208 RMD160 cbbd5d9d6085bdf362a9a3213ec5854d04d6df9b SHA1 83d8d921f983af44dfd12acfc74f592b3151c764 SHA256 d876417dcf4210765e0c705b97d1b278588bf82304ec6d875e33f61447266300
-EBUILD diff-match-patch-20110725.1.ebuild 1011 RMD160 834351d9b706ba3bbe3c3b408a691cdcae386f99 SHA1 6652b63e1c7a3f1162072ea3897ab456c8efd9eb SHA256 d23f52a1e553a91b9cb0b53e3f272c3bcc5ba722611e207b922fe9838757353f
-MISC ChangeLog 402 RMD160 4b4f304394b7b1e26dde4fdf22c338b4a9a40150 SHA1 9e58f1218594adf5ce96dcce6b002602f4ecc1cf SHA256 a18c0f266095ee7da8ba33567a71d43e366ff35a9130922a43644c5bb782cca1
+EBUILD diff-match-patch-20110725.1.ebuild 867 RMD160 eafa1c8f0e07ce71e8ec94739fa37e95604aaca8 SHA1 5e1624c1bf9839d5b632c625fd695531493eb615 SHA256 4efb6e4b8a5b8f2b57c0a2483c17e5f49f63e7a2a02f27997f035bdab139f49f
+MISC ChangeLog 674 RMD160 300fa9a75d97c93671df8ff5d90d3179ee79863b SHA1 3060ee64f11fdc7706ffe900ef17a251621592a1 SHA256 d7547c9f30f1065b96fd364d32b36f82b28b75f9924f8ce17e2d417a3335c635
 MISC metadata.xml 1113 RMD160 f67c4d7b48a787e0953cd95c6fbfdfbfaa9b265a SHA1 edf12019b6687e2764f2b0d4af3f87a7795238e7 SHA256 675405a69eb14999322524a35c2069c9632e9dbfbfaf6932e32677fd458be9ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO+cMMAAoJEPATRTHh2/q1eNoH/2+N/6CxwHNDyhwdoFjZ2T0c
-gDllX5fQ0H3ZXIANvWTC42F/EW9LtDDWAGH+FRKmjifVZr0jyLO5UMfBN2fkr1Qh
-9OTWUSWu9yGzYRzK0Z2vpVMfhpDja/4ueuSeGUrnmBSR6kvsFrAZRYMuyRrxgULB
-rSsgD1P1fAgIZJoS47crsHCyDExUWVfLBnVEZxybLMoleJsb2FhpTMyKuoDAvE7k
-9shnjjl8HlZqbsYASoRd54kwIskOuUaNQF69ft7XuJZwPUuw3md2kzHFfbApXve7
-KlU36HfQ9Fq6nGfKb8WOHSTO51vc7LpTbt33nrtDLeyUSOchNwBNbxwuVKqyalM=
-=GSaf
+iQEcBAEBAgAGBQJO+dWgAAoJEPATRTHh2/q1WAUH/1mGzX4ocUw/py4QJHxZOF4w
+fsQXxeIPy9+p+0+1hzLWCiCIYyfgDQbkmf0mvH0KpRDoP91q2W+mWcrHSttcxCKF
+VRX+mp/p9F/ZVMzYDrJTsWmvI4zrWILrglC6z6PUMOYcxFzSbaVNENHbw4FYGbdA
+pnh2w2g55pKDObaAeldqerL8YPlm1jq5x+yHCnBZGCwTP2wfGHedRcC9qGoosaYv
+8fd5BUcqQxk0zLXfaK4xQGKWGteLdqRc66bJ3QhqzEDinIOLfO6ar4UlmlhZmxTy
+XSOHLp6SLdeejOVY7k4MYOGGr20Jwe+dj8BluVZRwOxFP1+LsnaCQ04zLRxOIck=
+=Vmi8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild b/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild
index dd0c06cb0c9f..772e004af382 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild,v 1.1 2011/12/27 13:07:18 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/diff-match-patch/diff-match-patch-20110725.1.ebuild,v 1.2 2011/12/27 14:26:35 aidecoe Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="*"
 SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
 
@@ -21,25 +22,16 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-TEST_SCRIPT="${PN//-/_}/${PN//-/_}_test.py"
-
 src_prepare() {
+	distutils_src_prepare
 	python_convert_shebangs -r 2 python2/*
 }
 
-src_test() {
-	testing() {
-		local pylib="build-${PYTHON_ABI}/lib"
-		PYTHONPATH="${pylib}" "$(PYTHON)" "${pylib}/${TEST_SCRIPT}"
-	}
-	python_execute_function testing
-}
-
 src_install() {
 	distutils_src_install
 
 	delete_tests() {
-		rm "${D}/$(python_get_sitedir)/${TEST_SCRIPT}" || die
+		rm "${D}/$(python_get_sitedir)/${PN//-/_}/${PN//-/_}_test.py" || die
 	}
 
 	python_execute_function -q delete_tests
-- 
2.26.2