Revbump with EAPI 4 support.

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

3 files changed, 28 insertions, 22 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index a450bec37c16..8ad270717af5 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.209 2012/02/23 18:39:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.210 2012/02/23 21:32:39 pesa Exp $
+
+*sip-4.13.2-r1 (23 Feb 2012)
+
+  23 Feb 2012; Davide Pesavento <pesa@gentoo.org> +sip-4.13.2-r1.ebuild,
+  -sip-4.13.2.ebuild:
+  Revbump with EAPI 4 support.
 
   23 Feb 2012; Davide Pesavento <pesa@gentoo.org> sip-4.13.2.ebuild:
   Minor code cleanup.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index b4aef6462527..a9c0bccc6a28 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 2120 RMD160 145c7ec211493204167ebb7ac237f139ff6a227a SHA1 b32940508ab782ca6d5b7c94164a28b5e2ff6e72 SHA256 895389082a094bbde8861280867ebb0e1c310f4feabd60486d9933524d72a735
-MISC ChangeLog 25846 RMD160 8e8a2e2a6b57ab9ad3ef6c449d1896d45ab3a4c2 SHA1 aff41ff093dbd1d6560f1ad6a40a17ee3f091c89 SHA256 72e951c783f3ceac81e4867c636775b5e15864567a432063f87a33a79bd099b7
+EBUILD sip-4.13.2-r1.ebuild 2077 RMD160 0e25389267cbf7e02cc955dad7a55e8e697f07e4 SHA1 726f29c55838b1b4b536550fbab61343b4f40aed SHA256 bd5463273fd78289c0e7790856e92178037c861e78f7228fc2b5161ec89e6165
+MISC ChangeLog 26003 RMD160 9046ae2bd15a70f65a163aa3a963241593a9313b SHA1 2fc96912e6288f25d8d39875accfd56c4aa6d23b SHA256 d65b7c843ffd84d37e122b285940feda622c3f98a72fa2150f0a033896a2b3f9
 MISC metadata.xml 422 RMD160 a63c3ea27347b7b832bc993bc7fa09040652914d SHA1 46a755b4a4943ce38b4352151c7d637f2ef1c4e4 SHA256 0b764c87331ecf4d27df1c5061739794f33164047f23221d746cc70ac777d248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJPRrB9AAoJENXLsxwXqFxyFQwP/25bTBKJeS7bMSR33VOpdhsh
+FRO4zUBUVDwebH3O4FzK2PBMberK3bTtFMfXjWcBSvnxkUZ8KeGOu1UOpVr/u7mZ
+Ws9Pq1cqDHWvHUb3zHdyQIYQlCn7V9jxJPA/k8BJucZV9Zw+vukIg1BMs+JewZ85
+pO0+wY18L0+5j+7bxe8h36OdfmIPu/gXXmpyFzUSxmfGd/6SJ5DNvDbc0iRsIksm
+wj35VjFmHtWwqc7IPA4v2IQc+oyQ/YTvUR/FjGXTYuobZBQS9/YSNyJrEbDpVdJv
+/GZJHszfJrfWhmwRf9AywQdLA4ndfX/YNiYFWMK70OoCZB69o80KYFb9UsL0CYax
+a6uhNkcxG7K5pGUNdg1tykogYMmTNMwe7mHpRgnL/irNOUQZvXKo9YH2LPU2juoy
+78GaHjTprzgQQWBeRrbIDaSOSM+o9GRDLE6sbCy0ii/zx/s6kDkfwG5E5N4an1P5
+SihnNHUIUN6pUwC+HZN+snIChrTUAjzVksEQPPK66XnBvi/DbD7F0AKH/Vk9lGwQ
+n2y+QdpNbuC+NiBD7oH9X5OquzoO4aNWHppbDjejY+kKaU9sE3AHgUhwfdnQGbba
+L5KxnfMQJGJ81DHqpqLiy/QFfPgmWH6G2b/d/+KlOMITWxJAvkxtg27laIfcHMho
+gxLCUn1YQhGrrR/Q6KCn
+=YMmQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.13.2.ebuild b/dev-python/sip/sip-4.13.2-r1.ebuild
index 391fa5ca7343..f5093d1b74dd 100644
--- a/dev-python/sip/sip-4.13.2.ebuild
+++ b/dev-python/sip/sip-4.13.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2012/02/23 18:39:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.13.2-r1.ebuild,v 1.1 2012/02/23 21:32:39 pesa Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
@@ -26,7 +26,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
 	sed -i -e 's/-O2//g' specs/* || die
 
-	python_copy_sources
+	python_src_prepare
 }
 
 src_configure() {
@@ -34,8 +34,8 @@ src_configure() {
 		local myconf=("$(PYTHON)"
 			configure.py
 			--bindir="${EPREFIX}/usr/bin"
-			--incdir="${EPREFIX}$(python_get_includedir)"
 			--destdir="${EPREFIX}$(python_get_sitedir)"
+			--incdir="${EPREFIX}$(python_get_includedir)"
 			--sipdir="${EPREFIX}/usr/share/sip"
 			$(use debug && echo --debug)
 			CC="$(tc-getCC)"
@@ -55,10 +55,10 @@ src_configure() {
 src_install() {
 	python_src_install
 
-	dodoc NEWS || die "dodoc failed"
+	dodoc NEWS
 
 	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
+		dohtml -r doc/html/*
 	fi
 }