Version bump.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 135 insertions, 16 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 1635c5aa28d0..7fde4ec02b5f 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.303 2015/02/17 11:09:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.304 2015/03/02 03:14:52 pesa Exp $
+
+*sip-4.16.6 (02 Mar 2015)
+
+  02 Mar 2015; Davide Pesavento <pesa@gentoo.org> +sip-4.16.6.ebuild:
+  Version bump.
 
   17 Feb 2015; Agostino Sarubbo <ago@gentoo.org> sip-4.16.2.ebuild:
   Stable for ppc64, wrt bug #517344
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index c862750eea71..1b375c41eb5e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -6,25 +6,29 @@ AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
 DIST sip-4.16.5.tar.gz 859672 SHA256 a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87 SHA512 730578deb289ee94dab4d333e331de8ef68319758e4351e37605a43932c1e4db28de727a76f7a9e9ef610b7287f4eea155765a16dbdb61ac220c371d739a6f99 WHIRLPOOL 009b6a3d93d2b934998ae74209cf9667fd7f9db39b400328f6f577d3b910fd9e568d038402bf837bdfb2c0f4c5258f79da0636146521c846cd565989671369f5
+DIST sip-4.16.6.tar.gz 861708 SHA256 8c7db2baf52935ee7d8573c98d6ede0d90e4308b8b9e7739e59acf1650714552 SHA512 18646c5ccefe45a01e6bb649acc062781da03942e1c12f79f3e1ee01cec81e834ead36321ec073e75d42328071171111ba3e4a067e1f67d576f443a96854d51a WHIRLPOOL f15225f95fa682a23d3cacc71049ca51692cc194318d4aea38ed87fffbbcfb2e856b73ecc79907b09818ca1469ab19decc3a5865890b7ed3de83f5c536451954
 EBUILD sip-4.15.3.ebuild 2969 SHA256 264822abb8d69e245bc503b65debcb19ab807a37f5d7aa75753afc02bc1a494d SHA512 27f7f5824d85f189b5df7f18f27d3a6a011ef80a03f230321c1a047276b8ff9e6de96716519c9f063c927cd7dbbe0b2f5b1d472ce071a39ac3f91bea7fbc289c WHIRLPOOL 75629461774b51e852bb2471f1fe11e5c3a432420ab8411cd05d086d1af569a70c83745cb5c7cdab73a89cac177f30d76fa8f9f7f2579d2b35d938e70fa0bbac
 EBUILD sip-4.16.2.ebuild 2960 SHA256 a831dfd3e2ed6b8c47d7f058edc69b36a2a71967aa2326bf7ac4492a8214b520 SHA512 8f46765731fe3779921b60b417d09c850f5b1408b8e83f2ccfeca87a5cf46aa5a2e3104370d5bb53067fb654f70319da445f6599c80c2005982a9c930b4cb509 WHIRLPOOL 5c778c6be205293777346a544da870ab8f01258095b3f80286b427be854a7b1eed66c47e6ba27281a030641a918c2ca18a76e638f2a4858ce9e70d40d2ef578e
 EBUILD sip-4.16.5.ebuild 2891 SHA256 df33cb5dacde2c35fafa6a9617b404c3f254e0fdc78d248ed74097b16291d3f2 SHA512 7140fb6dcb16203271cd528fa798ce2752908aaa4778c76b2312da5f0cbfc6a5fb4308f5f5431c41ccbcf7b4b5a4eeb8b38d4d75f2fe52775cd8588e7c32023a WHIRLPOOL e43ba3d4e6b79d8b6d2d014cb13c3e0809a33c00d252aa476e7fe71a366127a7be9ad344f9c9bfb2ecd3501c2d1310022715c0c8a41273288129df5c68d7fc9f
-MISC ChangeLog 36076 SHA256 a2be87a8b2e0bdea124414222681a352a80f88f6b509b3cdb46dddc750b8e6b3 SHA512 6d5375dd9d16572e530a7d1109473535e2e4da0ef8d3a66b2b468fe2a0ae86db29be860ea9c432357cb5c3322a2f9252446fc30d6c6536c2620fef90ce06d049 WHIRLPOOL 006eac0eb7b1da464d214c96b05e4012f239429923b1280cb10c44812882a1100156d7e7e2d57a80d8c21f78ee76e74b03984b9d403dc71e563d3a56113a3466
+EBUILD sip-4.16.6.ebuild 2891 SHA256 2c997dde0b997f0cf82e8cc1ea3bc50424ba7121b2d96758abd8195b723d9e65 SHA512 55e66bfa84be33d121dbd3af59da904a409d1d8fd1713709d6e11114def13c50b2d4fafacf0f6a22ea53b5573d092519f1f78360337ce27df981b377385dfb21 WHIRLPOOL 624e1673ec1c9a4710b73101857bf1066cce4991e8eb421a8d6dd6b84fd41709bd0e712259eb5251806e5fa533541be34a5536678deccb8bfd417543db229dc2
+MISC ChangeLog 36191 SHA256 b24592310591bcaae707f4808880e3579a34595eec26115285738f8bde339fef SHA512 4b488b730c0a860e5ccf262adc452652deb3e61ffba30970bfa323415d6bf9aed982f825de630a5e7a148e1c215d04731b3e998b73f6ecf2c4305b2b1314d827 WHIRLPOOL c9d3b9980508ce2627b4b5fa5c3c52c62e9434a41bf657d4c9017f6bab8e1acec182e9a0227ada42c6230c59389566510d47e233a059d06411b14b28727aac01
 MISC metadata.xml 401 SHA256 ab74aa63d207487582e8099627d0c8a809eda3c75ef92396c0287aa272cc11db SHA512 b0b78127d63daa784c5d1ef45b416621cd18930268dab57da4ec53da978bae7b2c17747d0906bd7f33537a0d0c0d9b671f29bb8743633f78645c582191ddd0b5 WHIRLPOOL 4500cbc74ff40340231ff96064d4bf56a1c7aa375352fff6e645b9afcec722a116f1a464ea6146f0becbbd207598ddfbb1c296aed24557bca7fd0d4baf7a1ed4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4yFdAAoJELp701BxlEWf9fsQAMIbUMnu5iAW1LwY6s348t7V
-Ir1/0KtBfmBybKYih8CR0JdVrqN+cLEB095nsdfO8SVosWOy/t9gTdUKET7Napcj
-Iikk+WYWDn68JU7cxDrBljVlCjA4xaK2lHIwdrzPEHhzpTqnfJcrjSmfS5TCykAg
-8s4nIJ7LuOCOfYsyK2eeeXdPYNQBg0eFIUY8NUgkEgWV/WhikJYGuFPwBn1fzAaT
-W9yw4jHL7ferpR3+CFPaQDziClM9oAGlV9wr+UdoF5w3RcWmq0muT3hx+a+fWy4a
-/fA2BR9CtOAr+2KLOJAHjNm39VLllKoYJt3O5qhBia860fJ7qmi2g434//8H2lcX
-wE3t6fJNHDmL364H2mEtxEo88g8kMV6Y588y3Y8QVAvK2n9DDZbKI6g+BA9x8/WS
-iZ1PK7wNrwnhrFBJwGQkISk6vWPqCMsDTT5GVv+w9q9u6uGnhoSWspcak9rBeDZu
-ZePe4vwLaB6i8kgmMdOi6mbaqGhwfyZ7eDlXNIQiOTLypeXLDUDRevTCVLaC2fv+
-P2nARRaiHmqJDmxrBKwrI8N7Bq4+zBWkndwFY+/evtKACtARiZEI/3xTkla8G2/p
-JmMhhZHU9G3K9FE76v5tfCq9MzIWXIX6EcpGy9XKqKlc4c0zXAWObB3ErGm75SuX
-bev4UxmZzYImL1vf0BiJ
-=X938
+iQJ8BAEBCABmBQJU89W2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9QiQP/jr9Q7vw/vFCJ4o3Tx7LjJc2
+03yXNJCPcIC3rHzu/gvrCxSjFYvceabiDi1PPaJi2G579n/QbWhmxEeVRcYcyW9K
+Ht7IkiW8lbUZjiGGY3QNX6xziCwm6iaMTrTuxwiRlb2k/xUKLpJmrB9RnmITf/SI
+byDRhfu8veRQG8egtWdAUkkrsk4JgHB2BPoWwiEPgFBG94FkTcArdmtB29eCBL4i
+JSXCy4yAeJ8eqeHrK+4faf4riFZoSVp4TbIlRcLUlRKFWMFzObJGroOMg8Lva4T8
+w4YFNpnrgDEnmzGt/xu2JxSx6KyxcnYfnHIjoAPvnEsgiAYC0uED8Vq0cBxbF3DW
+Rte32xj6FQkzCm6n38tWmA40FPWxFfjVBbNoM3eeOUBdBf+iSlq7QQ1Oi1jhDTBH
+w+m7oueiY57aENVEorNpBXLR6ZNqtdOj+C3qRooeSaOyfh+uNu8whdIlYPEQO2t2
+rByBZ7vlWFNBuBYQDnkUCwOO8F5cnVsTh/siYWjGbEzcfBE7YvKxeoICXTnYaXik
+ZGFWGrs+H2FAYOl1II3cKh/qqu8hXC1PeKQfh21mVaFN7ioU/60VwuIVcPBf86qv
+kNoEqI7NOVVLACnLZvenCxQqZtoogjGg3CocTH+1/gi6xVuX9T4Dttjdn/jZpRjE
+5iYoQERm3mHnLW9ySpTJ
+=wsUU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.16.6.ebuild b/dev-python/sip/sip-4.16.6.ebuild
new file mode 100644
index 000000000000..c6975849857b
--- /dev/null
+++ b/dev-python/sip/sip-4.16.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.6.ebuild,v 1.1 2015/03/02 03:14:52 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://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/~pesa/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/11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-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*')] )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.15.5-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
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			$(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[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc ChangeLog NEWS
+	use doc && dodoc -r doc/html
+}