Minor code cleanup.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 24 insertions, 24 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 3731ab7e5394..a450bec37c16 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.208 2012/02/23 18:04:39 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.209 2012/02/23 18:39:42 pesa Exp $
+
+  23 Feb 2012; Davide Pesavento <pesa@gentoo.org> sip-4.13.2.ebuild:
+  Minor code cleanup.
 
   23 Feb 2012; Davide Pesavento <pesa@gentoo.org> -sip-4.12.4.ebuild,
   -sip-4.13.1.ebuild, -sip-4.13.ebuild, metadata.xml:
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index c47c16d059ff..b4aef6462527 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -9,23 +9,23 @@ DIST sip-4.12.3.tar.gz 725415 RMD160 bc9e9be7036139f212dec5b307229a529267bf66 SH
 DIST sip-4.13.2.tar.gz 733120 RMD160 24a8e7c4bd36382594ea3f11317eb0f10e4e56ea SHA1 1c5df9182e8046f1c0d01603a2474fa2418bcea0 SHA256 4bc3f5353c75918e1c8499ec1474e7b3392c30513ea6d7a6334f88b88271eebf
 EBUILD sip-4.11.2.ebuild 2134 RMD160 bcfd2823b35fe05e1b281fd5d3b2aea6420e7d9e SHA1 8fed7c03669305d7a9287cfbddbe2787b32e5540 SHA256 fa37ff494a98ed6bd170727ae394c82987acaba71ac1539be3d073a27b36bb42
 EBUILD sip-4.12.3-r2.ebuild 2237 RMD160 911c002df19a3af59bf4518c3f674fe492a16d53 SHA1 895a4c3660d2812da0c77e39d0172e5eddf479af SHA256 87cce6d1d31dfbd2497f92e1981ea6f21ecab66a49d139f05ba69e3030dcab42
-EBUILD sip-4.13.2.ebuild 2175 RMD160 c01db3678beb24d052fb16d4ca83ac6a7ec5b588 SHA1 99e980db8bc6f64a9c3607eac11fd88e93f4eea4 SHA256 19ab4a4cd64bd3e2619080470809878b3f97d8157c053f31ab508dc05693b6dc
-MISC ChangeLog 25754 RMD160 767f2b7048f1ce040bcd8e3b3003c940963b9f1b SHA1 afba86cff70735046852c689feb4bfb5f166dcc9 SHA256 5cc27aed3383b61d9aa11f219c0b494353d501552f85b5804f8d9de7367504a0
+EBUILD sip-4.13.2.ebuild 2120 RMD160 145c7ec211493204167ebb7ac237f139ff6a227a SHA1 b32940508ab782ca6d5b7c94164a28b5e2ff6e72 SHA256 895389082a094bbde8861280867ebb0e1c310f4feabd60486d9933524d72a735
+MISC ChangeLog 25846 RMD160 8e8a2e2a6b57ab9ad3ef6c449d1896d45ab3a4c2 SHA1 aff41ff093dbd1d6560f1ad6a40a17ee3f091c89 SHA256 72e951c783f3ceac81e4867c636775b5e15864567a432063f87a33a79bd099b7
 MISC metadata.xml 422 RMD160 a63c3ea27347b7b832bc993bc7fa09040652914d SHA1 46a755b4a4943ce38b4352151c7d637f2ef1c4e4 SHA256 0b764c87331ecf4d27df1c5061739794f33164047f23221d746cc70ac777d248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPRn+8AAoJENXLsxwXqFxyk7IP/0JTPyjx2UD5hPLG/3jdDbO3
-Hya08ST6DZcDsKkdpQct37HETUip5Ar0R3wTJV8FZWyAyiAxhMSqHbGm2fZiYlA3
-r0a+EvBz2EyBmImoHlHBFvDXKmgazdxku1m7eNQIaCM8Oz23z0UOIqh9gwJctgcq
-ewCfIaouKrpKsxstL8bEnQz6lLoqcjRIzkeZwR3lPKjZZDm5eYssoHVFTTO6z/rQ
-DEaRLu7dYqGpFaNw0a4y9dfcNGzgsyK9Oq0ehsP437O0mRhy0DdzKwMXLqmJ/A0S
-WRwRhM6NtXAgJ2s58iz5wkCHV25LDwQNpxRJO8Px1qN93iVV6I9baeaqVUH+CdU3
-kjHbHk1x5d5jeSFSN6HQKxJt9OPNpx97qTXt6sqLW1xEaC1yhN8g+5EHMvsO++TB
-HGLn66LI3lFpmrWrygIAH4eF6O930ENsxRLaROJrvIKPwmb5O85pLwlsTufoLuzp
-nb/71L2h/EyC8TKDa2yL1ZFa66MABySfcrSaMbXc7T4ut/EcGS6TbAKiC413Wko0
-42QjcIWqL0VyYhH5Cq8GuhbX1YiOh4mOhGvwjEOp/JqUB71qeDiafFt34+kuypZR
-PvD5r/w75mQSvTyXFwjlZuRQHJLK+SKwfSXsrwHwErNHGsJh2FRmaVW+aTySpDEE
-xMaJhBdEEq+6DQoWP8I6
-=cRlV
+iQIcBAEBCgAGBQJPRof0AAoJENXLsxwXqFxyjwEP/1dMrrboJB6BBmxhcfjkW+f/
+aIM0zjy5WAb9sO+7IEvgB6D1PvBKpiL4fmZg06Ewoy86ljKeTlfsI9W3ZhqAqWXH
+Ni9UyEVIAwXF3THL8FCMs8+TROOF5eZvs37N5PK844VOH7H9Y/JVYEg/2s97DRgA
+diAbaPtci+/xb0NZOJ/lbagEj61OzUxou2/zhwKQXsNoa9aSaGx1Uwe1Yj5TOnbk
+xCF+QoLvdMGJaOhy/2VsaBK7zpiXKvL+4bWdbg/4fCGHH/GNlg4xkm6N/dTf3lcn
++g/2gN7uiPD0hIZbde03Zf4rvU/2DrWAevS0DnIAd6hn9SzuzvwiMG40nXYCemyn
+xsrL7GzwAE6jza6i8xEb+oRnugIQ/+JHRBAZw5PVHiv9zLrBIkCtVIjcUC4qlDfE
+6rV+F8bzA7G6JJzXIxlc/LcA+/ILc6voPspsC8bV8WdxMzTbvQd3Se8tWCkJBAJK
+9zKutvIW/VXlcOgJj0+hyaJUQ/XeB0mDkRisDwMbESasyNswHUjvk0O0b3CiCqBa
+pIem69TLhbIqepzte4OuXljuzvmhSqxu8Z5fuOuXP+QxNkBOF5WFhSmJxXsOBTqj
+tIPTm1TU3XwKAtfAdFrX+P+0IaP/x6R1HxvNJ0hbxoCAwLgnskw8xxEvnyTUAM1l
+ENc56g2d6X4fc5uM/aqA
+=JsCl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.13.2.ebuild b/dev-python/sip/sip-4.13.2.ebuild
index db1f385af146..391fa5ca7343 100644
--- a/dev-python/sip/sip-4.13.2.ebuild
+++ b/dev-python/sip/sip-4.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.13.2.ebuild,v 1.2 2012/02/20 10:13:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.13.2.ebuild,v 1.3 2012/02/23 18:39:42 pesa Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -10,25 +10,22 @@ RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
 inherit eutils python toolchain-funcs
 
-MY_P="${P/_pre/-snapshot-}"
-
 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"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 sip )"
 SLOT="0"
 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"
 
-S="${WORKDIR}/${MY_P}"
-
 DEPEND=""
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.9.3-darwin.patch"
-	sed -i 's/-O2//g' specs/* || die
+	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
+	sed -i -e 's/-O2//g' specs/* || die
+
 	python_copy_sources
 }