Use run_in_build_dir. Add python-3.3 support wrt bug #455020. Remove old.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 26 insertions, 138 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index b927f3336c5b..d3d10b4b24e3 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.236 2013/02/01 08:18:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.237 2013/02/04 16:20:17 kensington Exp $
+
+  04 Feb 2013; Michael Palimaka <kensington@gentoo.org> -sip-4.14.2-r1.ebuild,
+  sip-4.14.3.ebuild:
+  Use run_in_build_dir. Add python-3.3 support wrt bug #455020. Remove old.
 
 *sip-4.14.3 (01 Feb 2013)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 2cbc2e9bcbc5..ba2c2d664fcd 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.13.3.tar.gz 734458 SHA256 ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1 SHA512 2e27bfbb79285e420c8989f620dca52b7bf5f0c70377c4e50def20f3440bae60c5a4cd12d03ec40f1270ddcce4f2137b3b1accd6f6646292855c8b344afd9059 WHIRLPOOL 3304b0865f3cc7f015b719a083d6632efeafa7b9233a5138397c222ef01f1a2ed74f2e793b193b8576571f0af1b549111a964ee21106d3b1818eba696943ae1a
 DIST sip-4.14.2.tar.gz 746440 SHA256 1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528 SHA512 d23eba57c271e5ed4f9e434709108c33bca0166987606b02b48485996d4de385d6c6057e5b0432f18248b3b786f2dce7e80a06f8dce848b90a046418dd294ec6 WHIRLPOOL 4a2815a11e7afab5598b6157f0bd0cd47783ac17eb0ad365c42bf15cfed080eded9092a85fc23ce579b34bdce8437cd35f2aa49b8055912df7ec570d3f8fed6d
 DIST sip-4.14.3.tar.gz 747092 SHA256 a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770 SHA512 8e91ef5efbdb84d22812b392e2fb7bfdd6e8b798d49245b7ba945f24a452475be4f5bee0d11a7a00553ec8d1628ee80542a910f87e24fe5dcc1b81fd8b9b122a WHIRLPOOL 0d8634aa175239066c387244e9296a51123ae4219419c346ff93ff68dc451af75b0cd8d136e03658ea280930b3bde7acb50d65a4e138ffbe9268a7acd69a9e62
 EBUILD sip-4.13.3.ebuild 2022 SHA256 30d8a44dd20d1a5e025b6cabc2e7ce48c8139c66083664c73c6f8262d916e661 SHA512 0b06c8e00b1cec885df0d7ea161a9f3d2f6097526958bdacd3dd81cdaf137ef6f1fef6791cf8e360dc0f67f33f7b06ce2ce93477a9de7ee4a1109f9dfa32f0f2 WHIRLPOOL 1728c8e8d519528c27536449f2568aeef7b3197a1fec5784b8fc0157bca79f375354da2cddda747e39fb8790469f095dc7b29d1d8cb330225535bed5718a6fe6
-EBUILD sip-4.14.2-r1.ebuild 3094 SHA256 6c0224678c06230ddf855edea2e177bf5f619d2f34695705c884190da6280384 SHA512 2416ff151aba311c5c76b7ea2b071025589bfcb5ac4ff460d1a8a3e462b1053bab77e424615221b771f55435faa8c0a601d3f58b557feb59b0c460316335eacc WHIRLPOOL 8abfcb74406f17b2ec13a5f9e73c7f134da67c1835a4f63ff32921a42bcad302a5678396ec496d643bcac9d8d60cbd2d977d66ba07ca1b74f3817a98ff73cc3a
 EBUILD sip-4.14.2.ebuild 2915 SHA256 0ab3463610a8e24bce7a2c16d017689cc73a093360fa9009c4ff94a78e18bac0 SHA512 860c9ecb700ccae4b86b40025f603fa0d9354c3548c35ef0a213e6f3bb81a5bc96407d77cec4e1112bc02f0eb28e5ecd2d7e31c7a7468356ad987df0cc188c0c WHIRLPOOL eee39aafddd52eb4acd274c4b18569342f5683cf4a0269a6c4aecc924455d8f3f26ab11846182346fd9c18d191acd671ec3e9b3818b1ba1dd0db2335972e1402
-EBUILD sip-4.14.3.ebuild 3088 SHA256 7ef08b448085cace884310706c3aa7dd8ed8d43aad6cf967aaaf7c8765cd599e SHA512 2a0b6647cb1e82cad7b2ccdcd833c7a6c0e317b6c87ec2cb94df7b0f90685ca76650d1e78a317b83ce5a757d735f0af32de2c7cbd5a9d4b0b8927b4f937e60e7 WHIRLPOOL 32c8d561847f7205345702cd70d87a096b27fa1211c7586f2c4d4dd831caf296732a0f9317dafc786d8d56761541a497f5619d4f1330da10ba11617219a59603
-MISC ChangeLog 28719 SHA256 c46c36d1d7bd09822cd453c2e56838cbfb974f2ff8057e6d3e0a5e6d189403b4 SHA512 35a2d2ba376feaafd34d2556a623388e3727a6140d1dde040129df21a4f746cd05dcae429f510ed720aeb93653463a2ef47f847deb1c331720fe5d4b10fe032a WHIRLPOOL 12388834f602c8d0598f1450003bcd366b9f01019ea35d15deea1778aa9fde42c47d3863907e4c0a0334a5eff93db3e27181698778973cc83315a93203cafe3c
+EBUILD sip-4.14.3.ebuild 2950 SHA256 b2a458778b9f37095acd98082fd604e5280928c572b2a26003e56d75bb45c36b SHA512 f40eec6481baa65f36771e49cd81280ed5a2bf07792508e07050134ebd7e2bd1c46aea37c642e77d5d1915064374029261622b0e13f00743aa541032ff49adba WHIRLPOOL f3b5def71d433905dd7ef86823e570c292ebb49d2fe802196590f2f9a87731ca9eda2e425ca006d7b47cec21ecbadf2a967d1f3af8c77ee68b11a8debc859ee5
+MISC ChangeLog 28899 SHA256 f0c6239b7ac50aadb9a5009e911f986c4d2520cc8af730567dec30fe62351000 SHA512 d96843e45d81d0f0d346accfc07243905def0d98ffcb91b22a0b25ea1e98d55dcdf9d23f1d0faec433767d2e9fd108de0abd4f30f2a82d89ceecbdd0126a21aa WHIRLPOOL f0aa92f4978bcd63f520bf41a256bd1aafa77ac05e240a21c6f7e74cf167f6ed50258914297f7a6a88c6cd8b45c38594b852fdd196a173b3cac4ebb9cbe92839
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRD9/GAAoJEMbwO6tnXQ0sjlEH/3cibkffRM6jjF4Mo0mcbs4w
+Pj49Fy15vlkwVvGFMR6R0dRbWjpHYu186X+xb7y0wGnfEGyM1lEe7l98+YdXE4Z4
+FoSfYUuazrd86FIJ8+vKgLnUZyjH4MtwnqUZpoWq+ksnh1QHMJG0RzCgoeQGLdzq
+6Gd7kEUAW80GVvimJ4brqmqqUO9ht22Ed4i0wBZsoohMbzoxaHNgfIaX8/2PyW1l
+d2BVAnugNK48PluYXzrbdcEdrOH6lJSvw0fMK/7/8EkLaGoiw4aKFT0hAzkO6vrd
+GwxJLxMMmTseGPqmYmyKwKCRsKDY3/EAc0clueFdaYLlRdZbGCktTcRjDThfer0=
+=KdAq
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.14.2-r1.ebuild b/dev-python/sip/sip-4.14.2-r1.ebuild
deleted file mode 100644
index 077267a51834..000000000000
--- a/dev-python/sip/sip-4.14.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.2-r1.ebuild,v 1.1 2013/01/29 18:40:02 kensington Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 sip )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug doc"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-[[ ${PV} == *9999* ]] && DEPEND+="
-	=dev-lang/python-2*
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep python2*)] )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
-
-	if [[ ${PV} == *9999* ]]; then
-		python2 build.py prepare || die
-		if use doc; then
-			python2 build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		pushd "${BUILD_DIR}" > /dev/null
-		local myconf=(
-			"${PYTHON}" configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--incdir="${EPREFIX}$(python_get_includedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			$(use debug && echo --debug)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}"
-		popd > /dev/null
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		pushd "${BUILD_DIR}" > /dev/null
-		default
-		popd > /dev/null
-	}
-	python_foreach_impl compilation
-}
-
-src_install() {
-	installation() {
-		pushd "${BUILD_DIR}" > /dev/null
-		emake DESTDIR="${D}" install
-		python_optimize
-		popd > /dev/null
-	}
-	python_foreach_impl installation
-
-	dodoc NEWS
-	use doc && dohtml -r doc/html/*
-}
diff --git a/dev-python/sip/sip-4.14.3.ebuild b/dev-python/sip/sip-4.14.3.ebuild
index 8918d0508c19..ce6c2ce01bcf 100644
--- a/dev-python/sip/sip-4.14.3.ebuild
+++ b/dev-python/sip/sip-4.14.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.1 2013/02/01 08:18:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.2 2013/02/04 16:20:17 kensington Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
 inherit eutils python-r1 toolchain-funcs
 
@@ -68,7 +68,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		pushd "${BUILD_DIR}" > /dev/null
 		local myconf=(
 			"${PYTHON}" configure.py
 			--bindir="${EPREFIX}/usr/bin"
@@ -92,28 +91,20 @@ src_configure() {
 		)
 		echo "${myconf[@]}"
 		"${myconf[@]}"
-		popd > /dev/null
 	}
-	python_foreach_impl configuration
+	python_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {
-	compilation() {
-		pushd "${BUILD_DIR}" > /dev/null
-		default
-		popd > /dev/null
-	}
-	python_foreach_impl compilation
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
 	installation() {
-		pushd "${BUILD_DIR}" > /dev/null
 		emake DESTDIR="${D}" install
 		python_optimize
-		popd > /dev/null
 	}
-	python_foreach_impl installation
+	python_foreach_impl run_in_build_dir installation
 
 	dodoc NEWS
 	use doc && dohtml -r doc/html/*