Set subslot. Backported from Progress Overlay. Patch by Arfrever.

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

3 files changed, 16 insertions, 22 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 1ebe2f0c62c0..ebb4f6393f15 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.225 2012/10/05 20:24:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.226 2012/10/12 01:00:35 floppym Exp $
+
+  12 Oct 2012; Mike Gilbert <floppym@gentoo.org> sip-4.14.ebuild:
+  Set subslot. Backported from Progress Overlay. Patch by Arfrever.
 
 *sip-4.14 (05 Oct 2012)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d753e0481228..5a659e16b93f 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -11,23 +11,13 @@ DIST sip-4.14.tar.gz 742647 SHA256 52175dfd8d8a82b861bf698843e344a69c313f1fe80ba
 EBUILD sip-4.12.3-r2.ebuild 2237 SHA256 860611d9af5d7655735ff7c8bb2bb87e43337db520768a5aacaf0a616699f6b4 SHA512 6c05342b1d500d480c862d978784ab283dfbda833561563163bc15b500de7ded789594b217f8e4d3f22faeca09e7aae9b757c27307b93e817a4d31cb3e74617f WHIRLPOOL f9f39f23b59a2f771a5e05dbe91560a159c5b4cdce3d21f7a445d3f3bd4319e5cbe53c5ab096b41d6870e1c4f12c71d4b74eed3f6b0257971c8b51ce0d9c27a6
 EBUILD sip-4.13.2-r1.ebuild 2029 SHA256 c73207f301b9c7bf5abbe3c07881336a2c7a124489547f7b3b825ffbb0fabbf1 SHA512 7116bc609f823fe906a15c2a07b4ae221880bb4a4df75b4261e4d395b5e0811559f57d872ef0d5e9f97d93d00149c970593a454fbcd9ab7a3121c220cfda8893 WHIRLPOOL a7fe08569ed696b6c0ebcfda6c78b5b2d1f0a8d21563774902e1d3da3805738edbc8b7ca6a9fa6b411466131c2a61516e010be9cb6f87bc111e782cd9a9aa504
 EBUILD sip-4.13.3.ebuild 2024 SHA256 285e10638ad496fc6909d88f4e43046c1a4c963b45fbdb627dc58031078c03b7 SHA512 ce99dc1cb21f2092358eca75135d506f4c4d43512d05953a76b4cfb1353a901e21d9c2e250678f26050d58e78c29f116c7f8dfeeb0b6ac7bf4dfcad3d709c20f WHIRLPOOL eb11cdbc9b1ea96cbd3f3cbff4e4bf4f87662a33b9066c48580f0e8ce94593addfd60f913d93f3a9b3ff72b54e1746369a494d9d3521ed0965a9fc47c1a5564d
-EBUILD sip-4.14.ebuild 2002 SHA256 3811f9c193f956e87ac09685aecc74824cb2ebda54ec99640d48dbfebaf123bf SHA512 87aceb6357581b2d50dac699d6cb7b9b5996eebe42bf202d98ca6c1d44ac04385f324bc6c6aed90400445d8d47f139745519118770ca70e609dc949156fc7baa WHIRLPOOL 2338f587362a78899a08fe810f1cbb848b5c0da1aa8b3054b90fde7462e46d141edf0d50e24faa94514549db80c962d7aa0253594e48099343974f6082a36e1b
-MISC ChangeLog 27663 SHA256 2cee8cfa94a8c1b0aed341f3e5b07ac4c3977f293308e9db46166051a2443ce8 SHA512 f2d21cd3bf16d88e981142db3a1fba3b9b3b9ab8248181f4a3dbe2f841d4015ef745ac1c8037263f9928b754d6e530af95a8a98aa20b9f7b15291850916029b8 WHIRLPOOL c74df9172bbacfd282db36b55f81520b3564f5785e0f8a8be7371fe783426785bfc2c0dace02113a8ff72e6162cfbe38207db914ee2a1681c3ef3addf558af2d
+EBUILD sip-4.14.ebuild 2048 SHA256 72e8de2db7a6cb66b00404f706a95221b0e501e61143ee0114388ba9070ac0de SHA512 bdacfc64e1fe12920aa648be1c1e552bbc4253be18bcd1eb8393ccc09d43bffaa689e0d19bc981f1f42f505dd2135913366b643cf3f61536c0dcc932fc833a86 WHIRLPOOL 6d8c9b5ad2340d1ba149ba13f4efcfd7f27309b3194d2ec40580adc0cc1cb0631623a95282518a44195ec1f1ea0e98437d2977d8be83ec1365e65c9b97caf9e3
+MISC ChangeLog 27797 SHA256 e4b887732fad83813936225a97f6d26bffd73c333e7aeadb9ea1a58dbaff8ef0 SHA512 a4dcbbd715ee3b3ef5e537899fa92f15fa2cccf69860180cb9ab4ab915cd4f3e941087c199c03d60b4b1c2ddbca92a94e7a2339f8b392bf44e90da0e4d774aad WHIRLPOOL a1f6bdbfe397e4b8cb93b8936a5caa4d6a6eff54a86776ad842b5a07a01a32c8db5834d19785086e3248e8f478f1b7522e849cd9ec24d31bd19964826215c55f
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQb0IFAAoJEPqDWhW0r/LCS34P/3G3pzgt9xxkApt8WTwqEdA9
-9UZSOMKkHCjoBCHaDIdr+Tf9QnczVDw0JGYsSknd1n3DLHsQq6Mk1VVsl8toTM+u
-0lwQkOeOyjhTba9MGfkxN7GfbU9c/rB7FPbMSdYzt6s0ejzFBJDDuHRSeoMduEkZ
-a1Vnzfk/sVniWKTilVl+36cK+SC2j0W2JgAAgjyIGIrweHmBT3v6FlyDHf2USCfV
-tWntwgPjvf+GaUJdhemlXLG/mpaWApkw+u4xTRoJIkA/1JYMHCNXceKvc3nLKPGh
-6JItX/7nmHnlf/D9SyYbHvdcXLdsBjHXhcafpgxx6Yq1EDgHQZOuUfwwM51CzD/7
-G90HiSnXykEp6ktOLl2M9qljIqFI+s1N+UNnx+aWjqa6t0RBuofXee0LIFY/+EVT
-8xfDLFre/877kSPD9IdrIBq2tIWJkKmV8UHdiAM6PwGGc6d3AHxAmWOdQnmGhHrV
-uZ0I1mYgkWIEuNb2XV3BqKQI1z1gezNAM9l6OUHdBshUzif+F1vNWWkweQOTAvJq
-99QXSM3Ggg92VAFal1XbWBxrYaHxrKPs9tcNQ28mYiIkJOlH1lXQ5nHJ0h/hZYSK
-nSn6CrE5hpWDsbHKahX3Ls89B7OgGs4zJMSFuTeze3lQZdQR8iUeUY3i7dT5jaj3
-ctnRyt340/X1Sb5RFhbY
-=hYVT
+iF4EAREIAAYFAlB3a7QACgkQC77qH+pIQ6TcQgD+NNcflP70x6Yrw6YNsNqKZkz4
+RWJKCxPQuFaJVWqVpUoA/iMCdNC36wo1XImizXAnV9JRDGTeFAFZ1gDsFf1z8dak
+=FAQY
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.14.ebuild b/dev-python/sip/sip-4.14.ebuild
index 4d0ce97223df..58fa65424fa2 100644
--- a/dev-python/sip/sip-4.14.ebuild
+++ b/dev-python/sip/sip-4.14.ebuild
@@ -1,21 +1,22 @@
 # 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.14.ebuild,v 1.1 2012/10/05 20:24:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.ebuild,v 1.2 2012/10/12 01:00:35 floppym Exp $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit eutils python 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"
-SRC_URI="mirror://sourceforge/pyqt/${PN}/${P}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 sip )"
-SLOT="0"
+# Subslot 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"
 
@@ -58,7 +59,7 @@ src_install() {
 	dodoc NEWS
 
 	if use doc; then
-		dohtml -r doc/html/*
+		dohtml -r doc/html/
 	fi
 }