Add sub-slot as suggested by Arfrever on IRC.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 39 insertions, 19 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 41302f6b1651..536a38ae593d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.81 2012/12/10 12:27:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.82 2012/12/25 02:32:53 pesa Exp $
+
+  25 Dec 2012; Davide Pesavento <pesa@gentoo.org> qscintilla-2.7.ebuild:
+  Add sub-slot as suggested by Arfrever on IRC.
 
 *qscintilla-2.7 (10 Dec 2012)
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 935193a3c55d..ef4372ebdead 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -5,23 +5,23 @@ AUX qscintilla-2.6.2-designer.patch 458 SHA256 bb73f63a41c86691058f10deb8d6429ed
 DIST QScintilla-gpl-2.6.2.tar.gz 2662469 SHA256 fac245ecfa11676b0003ef605489f87332c2efe039a4111821aec61bb936c264 SHA512 5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81 WHIRLPOOL 9c2676e61c2706cc0d57fe7ba0fc00cd45f5a12646c8ffe9fbcd197b204cbbadbdc42a93781d07dbd7b198bbbb45584d74b6752173d150096ce900ef0de222cd
 DIST QScintilla-gpl-2.7.tar.gz 2839325 SHA256 75bb242527aa83c6db2f8f2e655a79b6f0911f07fd7fee26ad5801de3a0f8a0e SHA512 1caa445c85ef969eab1c0186f5ced47b5762d3444128ce217d1f6e377331b5ad6eee83d3244c84090bc42883d7c77c3e8ef6de2a7f91479b572bcf76ec25777b WHIRLPOOL f2ff32e91817b050dd470738aead1a7063181229caf05c6b6bebf1c7a9b577dce7429ea1d05afd0fd7298ec8a3c49f0b5fe47c36c1a997177e657819d1d6f4f6
 EBUILD qscintilla-2.6.2.ebuild 1639 SHA256 d78224b3c5530be6184df1d6cef229d24f33a8bc7a03e1e7d5eb4d81ce914013 SHA512 552641e919e76ed560463113626c2535d8e9273f8d73c39c904d9822793c2bb2ba532419039f7854186f489263e41d53ef86f457dbee94f0a72cbaffdacdafc7 WHIRLPOOL f41af8598505a938628f29203f4960def04f2ebfaca40222807fd0c05336d8e4a49e2ab53591d0f23c658d66c487d9504a34dd840c7a5572bd61c36560ba90ab
-EBUILD qscintilla-2.7.ebuild 1602 SHA256 974c6ab8c046895842eefd78cad775d6faeb8e2e07f36cd03878d709f8e15e58 SHA512 4faf2311ba781d0c041888881dc97679a9ad8c24250a661638f62647188191424de2ad19bb89d5aacf7886c8d4910e53a219b6da2784937e92c0f77edfcdc673 WHIRLPOOL 7aa63bc719b690304d55f4da3370ff78f01c187d3e323ee24a27f99c7689abb71f5d3aaf1463e5a52d0dbf3320fdc34967b69a762b2259f10bb90eac7d123054
-MISC ChangeLog 21306 SHA256 fd7503e942f764c4ce76313978e76e6a1259196b16d131bc6aeb113972fea698 SHA512 ee051a0b6474fd625a3540d6c05388419b0f6e29a9acff11456246dd105c95df3e2bebee7c27481678e6ba527bdae1a54117bcbf9296757d638e6e8ccf9777bf WHIRLPOOL 9ef5b6e14f8cd4eec509fcac28fbbd85f9ca199ea97c3a07833a977dab612ddb5468b0c6e39893651ab9ddecd203f39aa85b931bcced672ee78a55e3b5021cf0
+EBUILD qscintilla-2.7.ebuild 2098 SHA256 ffc641dfde77e7caab26ec722c97dc22cd84b657e5211c6f81cdf72a4a215bf7 SHA512 e86761004415508cf59459d60645ade07beebda233cb83f8d9ec503a26e94003022381df7bcaa683681876b46c9af0fb95e2e04194839fbf889f36be6a0893be WHIRLPOOL 0ad427739425e1bd8c96013d79cf648c3d52dada4346c665e7dc4526f7532fb1e40ea88cc5f4747b7c0819c1d8dca491aa1b5665acd3cf82ec70bce59b4565e1
+MISC ChangeLog 21428 SHA256 27ed445150df66749025161778f3a09c854c6eea3f887b548c2d91581e098415 SHA512 ce50d1b1ffa72ab214d903081338fc7d15d1491a4a86692ff2395773b4b635eb2e5548a516dfd1620deea4c7b04ef2a92f7c0090f70c10184a4a6164848d0b75 WHIRLPOOL a34fe422a090a880faf8a4da2b71d4f2df9e12e81e618150dbad1db7c0bed102a52eeb78db23ebabd54e9239d47feffd5e77e353bd5f94da9e0e1ed7dc4920e1
 MISC metadata.xml 175 SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d SHA512 bea471fa9163260e9198463bcd8e6f2a88f9fb25dea55be266216d5f99abf1492d069f8dbdc111e4a26d87928f44a19db96562886edfc0233d5a9c5c947fdc7c WHIRLPOOL 4266a6076b386b6bd3e374650ddfa7879920261bef209534de056c935279dba6da27db83162e5b73ed05d3a82e47f5b839274f8137d525ff4c68073f5efdfe6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQxdUsAAoJENXLsxwXqFxyqg4P/RC1Ffy+usXQ3LmIbCh6jI24
-NINT25Em/+ksmrz9EG3+hWseSkTwIeJodHhrhyUNyVYqpuFTUYAtmi1CLl/7cYAL
-A6Cpv3FIdgmpsT1VBGxNa4YSCKtFBxh0Bzj0FN6XLNLZ29jY/C9QRREBlJqJptch
-v3hedeNVkTB5UqxuU1JAfz3znGvlLeibsknAjMeZMhMl/BWm6TXP39WMCjwiSN5R
-UdZTz9uJ4bjjBrcz43hlfchDeRQhlkyuLCJnEcJ7mLmwz/5oarDlEbmPG3sK5Azr
-e0K/8a6OphSnqa3XbI2bhwOBEMg8BSv8phQleN4z1qAT0hM/VpV6N3USBeGgAHWE
-7t05HQlwdMs6Fce8zWMPW5BRBRo6iGMGxRCEP6XAJbm0IN+sodprG1ANx+MNlT6U
-7dJ/9Ly11sbVBe7Ari2SeRCrd7cgOSiECNKnXTiCcEFqR/6DL/nJ8TfxL0Z+9YMH
-+3MyoKO6P6FjgSvnCvYbp7u4IcATPMKJUmSdxeT84zrcMov8KmYuH5HF9/frmU0q
-EpAxF5eGFwIEVxdAnJWQ0/gt7rMSiJmbE3VPlQsjD5KaiXxtGC2S9oCfeFQZC8Cm
-6iiW2tpfoQoVJeaYEgyEmwttR9AEbVgRB2w4pdoh72K3nqgQ/Dtr9vNW4mkuXDtp
-iq3KCVWLaPE5He4oi4Sa
-=+9l2
+iQIcBAEBCAAGBQJQ2RBgAAoJENXLsxwXqFxyD+EP/RlpoZBBJLByVkQkAq9CoscZ
+7jUjQdsOi/QhHlEeElxIjfTeX8gaGkpFeGw0EAQY4y9oAGHNArbjaiOA/zY+0zjO
+fNQZvDuXrSYDBpETqQkAH2txd7Ngnk/uGOx5TbJbI9rYzGC4dwrT1aaKBNXzqdsZ
+JEk3i0xKco8A2cb4D0vN0fqX+VhMZmXzuhXfkePteoIoARi0CRC5GDzRRI06RNKX
+aEn1QfGAPLxDrqN9bTpiNCv3bylBsW8vMU7nRdpBaQ0j7E/McvrQJiSTDjlNeJup
+Y2UwVeVCOD1usSDK0HqXgiQPMWqxFEYC7+9lOb/um1g1KHoT8WcYHHpaRyTl0lhw
+eIfWMr//hECVih0Rn5AA3scYZzXKgaXWmpN8YX5qrTFcgSGzu97WW4Vo51fGWvab
+g03fwCTMQFClJB3qlGxksW0bacggKludYA+3dWLqJfGAiYx1Bd9GMgMzHH/fGAlL
+4n83lKuUiQC+/CIaSoOQ7WfK+FC38qS6Mz5tQ7JESVGt/1FXt8PHEDWrp4baoBq+
+nUBv/xrli8Ypg1TVd/2xniB59EelRwYbYnc+qq65Ij/ZPoliy1ZYy8VOiL3l3mZ1
+FkR0VDA85i7DAzmt5xxDs+hDFijD9/IahRT9DnQSomply+xXphxFn8fscnPTIc7G
+rDepdG28moXy/+dIISNj
+=7zkA
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/qscintilla-2.7.ebuild b/x11-libs/qscintilla/qscintilla-2.7.ebuild
index 09a045fa7e0a..e3870b3d569d 100644
--- a/x11-libs/qscintilla/qscintilla-2.7.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.7.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/x11-libs/qscintilla/qscintilla-2.7.ebuild,v 1.1 2012/12/10 12:27:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.ebuild,v 1.2 2012/12/25 02:32:53 pesa Exp $
 
-EAPI=4
+EAPI=5
 
 inherit qt4-r2
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
+SLOT="0/9"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python"
 
@@ -30,6 +30,23 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.6.2-designer.patch"
 )
 
+src_unpack() {
+	qt4-r2_src_unpack
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
 	einfo "Configuration of qscintilla"