=dev-python/sip-4.16-r1: revbump/merge

However, I am leaving this masked, as it is upstream, as I am not able
to get the corresponding PyQt4 package to work.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 139 insertions, 2 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 8c552c5..7a27c48 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.282 2014/04/02 12:27:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.284 2014/05/30 18:25:05 pesa Exp $
+
+*sip-4.16 (30 May 2014)
+
+  30 May 2014; Davide Pesavento <pesa@gentoo.org> +sip-4.16.ebuild,
+  -sip-4.15.5.ebuild:
+  Version bump.
+
+  28 Apr 2014; Mike Gilbert <floppym@gentoo.org> sip-4.15.5.ebuild:
+  Add python3.4.
 
   02 Apr 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
   Remove python herd as discussed with them.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 6b37167..251e25e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,9 @@ AUX sip-4.15.5-darwin.patch 1168 SHA256 6c96b4528ecb2cf596d0eb477167d5314dff65f5
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.15.4.tar.gz 776179 SHA256 594b742873cd135dc945e61f0fff4d9d35ea5da8d23e2fc8f3820c3771a52228 SHA512 887f740853d3ce09946faea2ccababfad505d454cfe2f9d525104d02a05fe6c146a549464901231a76039ea3855223206ef48c122bb51806cfd97a54c23ac143 WHIRLPOOL 545ea82634b87c0d782732bfbefe0d49fce2b09d1e405bd6b23691979c8f1b346fa95df962a1461b6654a651eb05b0c8eea7d94320d8d55d2dbcc54f2f36b1db
 DIST sip-4.15.5.tar.gz 843133 SHA256 9b11d87e7f382ce22bf013137f29462e75b56f5ea46f3fea6061bb20f967d559 SHA512 7ddccf274027992efecfcb7186999164260955046e62723b0e26ac13002f7a4f4d12222880a62efc06c3b9318d337db4c7c2f48a16b2c7b971652bdd27c49f9c WHIRLPOOL f2bd9e73181cbb1edf6a967fb121065e0b7aae01edb8a846a89b1dd32affa474f831a0ad1f46e6875975cf003ae22fcf550a21c58793877b1295716362839aa8
+DIST sip-4.16.tar.gz 793162 SHA256 d769ce2486bab4cb0b3bea8868153c7e5c27b50ee74fec3329e35ed50a346398 SHA512 e0f5f08f0157d1f709b7eed71aa1cd4633beea856b074a92434243d734c8b7f2f3eae3db474b8fb35fc9bdc0c679510b635a4183accd80dcec8381a5fdd62b25 WHIRLPOOL 4fd3caf872699d9f356305294b9f53cce1b2a4294c54a1df239a33131ca785e144a88f5cecd090cefe36e9d712eefd6b7c3b17f00e253c156e4f996a68c8529c
 EBUILD sip-4.15.4-r1.ebuild 3181 SHA256 0333d5b7b728554625f483012d2f1107ddedcf096c56f19b2a449e1da1774103 SHA512 77d3c0b63f6a1648e7ab475788fdd1763c8722bb49beeb0e06191c5891410f15c02fdd8c4453aeb70d86367e9c8b8aaa67015ed3c45cd7ccf74ac5fd359e6384 WHIRLPOOL c7dbc03d257a239ce0ca57c95792a4984b04d0102c052537cb4963d799bc8556f5b30cd1e80eec7432d719c28dc749fe16fe6817450edd2d80d96f2666392c0d
 EBUILD sip-4.15.5-r1.ebuild 3186 SHA256 2b0eb09c3be51357ad98d8a4a57335a3c7b495d6f0ee8fe19a5523e008e332a8 SHA512 0d8d2e901dcf3a2514b2be30ef28f71b5b535a77bbc189dd98ed5cf6d9a69176ac680756aa44e4cc9a6265ca7632cbb1f994c84a8a48390511ae939c903bb677 WHIRLPOOL 785b5071b6ffa9f01a8d02ac0495d5d22bf405ff58b25f80e8c16b6b23933d67a74975d1956833b7c695d7fa56f930cc5dd5721bba87e34694004e3f907b7663
-MISC ChangeLog 33716 SHA256 12c234c8fa5eb6756818bd4cc98f4dc63a5b2e397d6f928c66d86dc37603c585 SHA512 4117f666eaafea4603eae140ae4350d2775e7291744238ada9ca718d27430207d17c76f0ce6d0833670361d0107455731fcfce591edceb056fc8c5fb5436c06a WHIRLPOOL 0fc79df75a6e727f121e492fa08f5c1f7741ea28165fd0031e9bbdb8fe76eea957a20fda0ddae94b59f05a9930b65ffef62acd6137127c0ecd91be133838276f
+EBUILD sip-4.16-r1.ebuild 3186 SHA256 2b0eb09c3be51357ad98d8a4a57335a3c7b495d6f0ee8fe19a5523e008e332a8 SHA512 0d8d2e901dcf3a2514b2be30ef28f71b5b535a77bbc189dd98ed5cf6d9a69176ac680756aa44e4cc9a6265ca7632cbb1f994c84a8a48390511ae939c903bb677 WHIRLPOOL 785b5071b6ffa9f01a8d02ac0495d5d22bf405ff58b25f80e8c16b6b23933d67a74975d1956833b7c695d7fa56f930cc5dd5721bba87e34694004e3f907b7663
+MISC ChangeLog 33928 SHA256 d3222b29be6c0333b21410b155809ad4df113b50bb02843ce7ec1db9b9af63cb SHA512 3a0c189730bb4a35ab8bf940c839fad98abbceef64ad72ec498641dba31c21812324e51e16ca64cf4fef3dc2b9a99bbff3900bef7e3de4166704f932c9419058 WHIRLPOOL 3c69c8c2b3492e65c9b36c3389903b7d0b9c6fa6855d98c39f0fe6b36c64726014df3f512556e1923341460e50fcb77084638996b2b7eb21ec76482c9acc7001
 MISC metadata.xml 401 SHA256 ab74aa63d207487582e8099627d0c8a809eda3c75ef92396c0287aa272cc11db SHA512 b0b78127d63daa784c5d1ef45b416621cd18930268dab57da4ec53da978bae7b2c17747d0906bd7f33537a0d0c0d9b671f29bb8743633f78645c582191ddd0b5 WHIRLPOOL 4500cbc74ff40340231ff96064d4bf56a1c7aa375352fff6e645b9afcec722a116f1a464ea6146f0becbbd207598ddfbb1c296aed24557bca7fd0d4baf7a1ed4
diff --git a/dev-python/sip/sip-4.16-r1.ebuild b/dev-python/sip/sip-4.16-r1.ebuild
new file mode 100644
index 0000000..0526690
--- /dev/null
+++ b/dev-python/sip/sip-4.16-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit eutils flag-o-matic python-r1 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"
+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/~hwoarang/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="~amd64"
+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
+
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+		local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		local myconf=(
+			"${PYTHON}" configure.py
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			$(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[@]}"
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	compilation() {
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+		local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		default
+	}
+	python_foreach_impl run_in_build_dir compilation
+}
+
+src_install() {
+	installation() {
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+		local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		default
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc NEWS
+	use doc && dohtml -r doc/html/*
+}