Replace override of src_compile() with python_configure_all() that is a simpler solution to the pre-compile operation.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 26 insertions, 13 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 9ebc1a6a1de3..6d6a9d1ab296 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.69 2013/05/07 17:55:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.70 2013/10/27 08:42:31 mgorny Exp $
+
+  27 Oct 2013; Michał Górny <mgorny@gentoo.org> bzr-2.5.1-r1.ebuild:
+  Replace override of src_compile() with python_configure_all() that is a
+  simpler solution to the pre-compile operation.
 
 *bzr-2.5.1-r1 (07 May 2013)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index c899257f0193..e11b6a4d85c4 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -12,14 +12,26 @@ DIST bzr-2.5.1.tar.gz 10451513 SHA256 967346fa6cc52971a8dfd5171ec22e1928cf455fb4
 EBUILD bzr-2.4.1.ebuild 4614 SHA256 c800f95e7f7ac4c82df51fc7a2bb8a711f3d36e0c929a8adb92a735b4e16e001 SHA512 87be426832f371dc44b8c6d5b09ca405d55a1778934eaf155814940e2d430f945a2ca35377a4a94f31b68f1fdefe1fc71af375f0abf8547f5c706f7684bce349 WHIRLPOOL ec1a2f3ca9a74d0d249870bebdeb679a5aa082839b995988f593d2ff2243047fc82271792ecd798cf61f2925739254c59a938e1dc00aa63978d29bea15a6dd50
 EBUILD bzr-2.4.2.ebuild 3665 SHA256 afc7108f83b395335a94721a8d32f9c3b743bcd075ea59d68b2935753bbab305 SHA512 36e69155f9144ddcab1de375632f0aef397a9f2f50d4324ff7dd285e79510427aa3df8f5ac35896a852018585e4812a3aacb75df87550540ca4febecf52ba13e WHIRLPOOL 53cb581830c21df2e19604498156d4ab728d29292a4d930a2135f18c3319634108b2c94eaa98cb192fa705c6b49876b50e5d7c06708214c6f917a929682695e1
 EBUILD bzr-2.5.0.ebuild 2393 SHA256 9aa2b3749cd6174201fb540223f041154127500c20dddddc6cbda1bc70254c6f SHA512 721c8861b3598af94811d99d2879af951796e84270bf917464605f09e4d4bf946832402380b54724209301451fb41c014998b1a55d26f00f28c4154a9cd3ab28 WHIRLPOOL 4431b345b3bf846a6067479ae06bbc788929c75274ba2d252d901dc83bec43680755f8c14baf6e3d992c37e03ab730812a14bbc3ef42e6a4a758f1d4823969bb
-EBUILD bzr-2.5.1-r1.ebuild 2808 SHA256 3f7e393d0363bc757a88141259571a46b1f3e80a7996aa6222122b3ae34c7da8 SHA512 b5f121f096b5afc7b5a8430312b3524d1bf80af3a4068d55f2336d8f9ae9f8472147c9ddda898d4bcc00030d652e43864581a214b6920060b79d9565cf95d957 WHIRLPOOL 8fa3106c520ba2440f9dfb6354e65b774891fa94136dfb6430ee685314b003547cbf6bc5af4d72215bfa106d96c5480ba644b6318df23a2b045f3fca33b04933
+EBUILD bzr-2.5.1-r1.ebuild 2751 SHA256 cbbe23dbb2060a3e10bc54f5b4d8c86a9564ca42e920fedff9408392604dfb82 SHA512 0179f45cf56c9678109917af80e3899df9417de970dcc3ac86ddcbf50bcb6a0f7c96a8eac6e2328a78d42d058e6611669ffdb7eeb0a1c2b92cc8d488ac36437b WHIRLPOOL 6feea98ac295bc58bb900c6d6b58679fecde0007cd087af742c1d81eacc1a0ecd8a225a117632fd55711f737944d103e64db1759e638bb12e89bcebe5b6db78f
 EBUILD bzr-2.5.1.ebuild 2464 SHA256 6ce7e6144949f463f3c24b17edd85853b538edf31445ab51e480d6edc6438151 SHA512 8972054e70e1fdaa80ada565d85138d62ebe7745784e93f6e1a1800c3a2dd56fdc4190eec93c9340286f14e844da46b979dd63a6d6e54b52c6a02329f16a82d7 WHIRLPOOL e19b98237c029d930e341f44567c68d6c43b566a9629a9d37c2e82601b0f2a88025477d8cdf8cdfc1eeaa9b821c7ba06d43e0d32d7cfb57dc31060559e41386f
-MISC ChangeLog 27614 SHA256 22a7c5f2244c5c1dfa2bba085f72ea83d6e1e86f3600398ed206f82633cbddec SHA512 a911387afe61a07e4718f86df8dbe939d85ba7087ab25941de9d0d916688880d221d6bb95d820f557e636bdbd3be10881914c2ed6eed60b273dcdf948729b04b WHIRLPOOL 808ce3b5a1211dbb750e02cdff6d046c0a464e98548bbe370f1871cdf0e45c284b9f8310bdbb78c532a4ea4f7d3d093c63ff6c78ca38ecdb5159f8aa1974ee97
+MISC ChangeLog 27808 SHA256 4e209a191253b71ee34f086d7ef965e37add77b30271c4ac5b48e19ebcd0a321 SHA512 9b42cec731eb96820aa70ce30d7336df518b4a2a5426382d2f7fb3a84f19a041f7b1a0f9c3490703f0c10c9616812a98313f5f9ec4edc0a30da0f4895b82f716 WHIRLPOOL c771d747ddf1fc3f0b59e3b49891bd4d7549f620dd7199f1a0350061e76641539b5e3bee56a3a21b5892a96c2aabc95e198d60551892274da45b38a148914b9f
 MISC metadata.xml 690 SHA256 62d739eb6428cc287b055f975c5aa73d82aed94510162e4cd6073f8afa2d4b16 SHA512 263f2818011bd953c361876912fe16b4ba6579f4b67817c17b3ee87280e485d6f891ad30b8f2552cbf9d03f32ef50377bc43b56febc9b940d93a097cad2573df WHIRLPOOL 5acc1a8be243101554d8db86d8887cd8816a108fb0924e2d515b6132cac4047223731eb465ff6d7f8f826311a9ba2a0c2857ac24414d238830ab900e6cd235ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlGJQCEACgkQC77qH+pIQ6Tx1wD/aVojNl8XOnb8qVRAew3XbOKC
-Z0JjL/kYp/H3QDywIfcA/jw1afWDCQU0LadqLNPAtL7p2QA/LWL0oKLdsyRkKnTv
-=kGOs
+iQJ8BAEBCABmBQJSbNH4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOU7gP/AyRkJEGcfA4J353QjA08pDg
+sYzP2ARjyCrqsl4VZdw25GqSzRLPsNZJ7/56i8Q8nElFMp6p/AtcVOH0BNxw0Utf
+mB44GbXs3oh2ab9wuSV/Z2Zhevhr33IGzBOz6EptH2CdPdhIU2olOTKpi+8mV7te
+1j5+MgfuWwkFtVtwKaLP1lkV4tp69vnnRD8hvWXePz2fzoeYtriCZAf6ePdugfJ8
+6VEL6Z9jBYIBjRFTrNAa8gZPeKh4UZBrj6171Rt+VwQbLfM4Kc9u+i+GtHERfZkE
+piIagI/hDXzYYUbzUSR9Kp42lszgVpQqfIAwZ7d49b93Ja6bs28rgL9v7w55NEI8
+NhKhUyNBD7pvTlFTB5qKjtDbfgeZo93qRs6MVHhj5qBdkhG+ZIZwhsz+gy41cV+r
+jkXlFUcIzNi30qolo12GHYxvqcrONjoUdeu8An9GZKPNqBJINz5WsfhN2K4TUW/S
+Pm53YWy9N4Gu5z9XRJLF1X/yylT1kr+cfRZrcOtgxZCfSLJg7fEFICSUcAFqe5CU
+ZloQuybbs16WQ1bl6XVtubEVtKprRItG/6hDKLx3dPnBym7MkEbUFN1pDJbbit79
+RdWhAIemxR/R5PfvhQ3N6+ogKJvy8tVzALHDx69r+O4cSF6jagqhW3+RvzFihW3I
+ZqWhBl1gk/MJspK9FICx
+=pTs1
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
index 2c8b29685d33..2a1b55824680 100644
--- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
+++ b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1-r1.ebuild,v 1.1 2013/05/07 17:55:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1-r1.ebuild,v 1.2 2013/10/27 08:42:31 mgorny Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -38,12 +38,9 @@ PATCHES=(
 	"${FILESDIR}/${P}-sphinx-test-failures.patch"
 )
 
-src_compile() {
+python_configure_all() {
 	# Generate the locales first to avoid a race condition.
-	python_export_best
-	"${PYTHON}" setup.py build_mo || die
-
-	distutils-r1_src_compile
+	esetup.py build_mo
 }
 
 python_compile() {