dev-python/sip-4.15.5-r1: revbump/merge

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

5 files changed, 201 insertions, 4 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index f519af6..8c552c5 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,45 @@
 # 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.270 2014/01/14 07:19:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.282 2014/04/02 12:27:20 kensington Exp $
+
+  02 Apr 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
+  Remove python herd as discussed with them.
+
+  01 Apr 2014; Ian Delaney <idella4@gentoo.org> +files/sip-4.15.5-darwin.patch,
+  sip-4.15.5.ebuild:
+  Add re-base of darwin patch
+
+*sip-4.15.5 (01 Apr 2014)
+
+  01 Apr 2014; Ian Delaney <idella4@gentoo.org> +sip-4.15.5.ebuild:
+  bump
+
+  23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for sparc, wrt bug #495638
+
+  23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for x86, wrt bug #495638
+
+  19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for alpha, wrt bug #495638
+
+  18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for ia64, wrt bug #495638
+
+  14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for ppc64, wrt bug #495638
+
+  08 Mar 2014; Pacho Ramos <pacho@gentoo.org> sip-4.15.3.ebuild:
+  amd64 stable, bug 495638
+
+  02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> sip-4.15.3.ebuild:
+  Stable for ppc, wrt bug #495638
+
+  30 Jan 2014; Markus Meier <maekke@gentoo.org> sip-4.15.3.ebuild:
+  arm stable, bug #495638
+
+  27 Jan 2014; Jeroen Roovers <jer@gentoo.org> sip-4.15.3.ebuild:
+  Stable for HPPA (bug #495638).
 
 *sip-4.15.4 (14 Jan 2014)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5069993..4018a99 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,8 @@
+AUX sip-4.15.5-darwin.patch 1168 SHA256 6c96b4528ecb2cf596d0eb477167d5314dff65f5f88b355f66c604414e1f1921 SHA512 bd48d54c2d2ac8f3487b20f1e2ac3b09f480d0c6afc17d350093ec97d624d7fcdfb006d3f7c24131f0cfccb9fbd7d49ef755b698e6f0a1355039a2ffb51dc8e7 WHIRLPOOL 5752fe37b855c821689c5ab56c5606e9853cd050d6036b1bb5eadad42e1edcd24f0c33291ce6b266453b9f02e755e5c478d1808683cc0a2fa6774edfe346a39d
 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
 EBUILD sip-4.15.4-r1.ebuild 3181 SHA256 0333d5b7b728554625f483012d2f1107ddedcf096c56f19b2a449e1da1774103 SHA512 77d3c0b63f6a1648e7ab475788fdd1763c8722bb49beeb0e06191c5891410f15c02fdd8c4453aeb70d86367e9c8b8aaa67015ed3c45cd7ccf74ac5fd359e6384 WHIRLPOOL c7dbc03d257a239ce0ca57c95792a4984b04d0102c052537cb4963d799bc8556f5b30cd1e80eec7432d719c28dc749fe16fe6817450edd2d80d96f2666392c0d
-MISC ChangeLog 32450 SHA256 c1cd61e29e2000d34e4a7f7ae76ad2d1a5f77bc453e60144a233a59c4edd8ac6 SHA512 f9e3e422e01b3da67138a137a2f639f02f4a2028689f69bed634c402849cd3f9cb4efbccb9e54ed93c2e85664cf2fa52dd2c732e3faa8587d170223e4e423928 WHIRLPOOL 576fae92511f457d5e3c345d9b289941334907198c3c4ce84a72aad061e3a633ee3601be4369c1141afa0abdf9832210f0ecd984572d55184a1102a7bc940963
-MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
+EBUILD sip-4.15.5-r1.ebuild 3182 SHA256 7f58dd1e2c4c7584f1b6214f75ee4b97519aca25eae3aef1c1ac6449d9abf40a SHA512 941c842cf91da2a34b4d2975d53b36ae9016eb31ba6b5bace704984cd1e933f2ba3dd2a23714084d9dadf216fa1b126133855fd9d384acf72dfc6799a26b7836 WHIRLPOOL 417d616dd09757fcdfbd9d2bcb2c8af8a6931c9fdd3d5544e724521d2d48eb23eb52b8ea3287ebb20dff1f083db9198a2d78798244daa36de9c1b337c628a7fa
+MISC ChangeLog 33716 SHA256 12c234c8fa5eb6756818bd4cc98f4dc63a5b2e397d6f928c66d86dc37603c585 SHA512 4117f666eaafea4603eae140ae4350d2775e7291744238ada9ca718d27430207d17c76f0ce6d0833670361d0107455731fcfce591edceb056fc8c5fb5436c06a WHIRLPOOL 0fc79df75a6e727f121e492fa08f5c1f7741ea28165fd0031e9bbdb8fe76eea957a20fda0ddae94b59f05a9930b65ffef62acd6137127c0ecd91be133838276f
+MISC metadata.xml 401 SHA256 ab74aa63d207487582e8099627d0c8a809eda3c75ef92396c0287aa272cc11db SHA512 b0b78127d63daa784c5d1ef45b416621cd18930268dab57da4ec53da978bae7b2c17747d0906bd7f33537a0d0c0d9b671f29bb8743633f78645c582191ddd0b5 WHIRLPOOL 4500cbc74ff40340231ff96064d4bf56a1c7aa375352fff6e645b9afcec722a116f1a464ea6146f0becbbd207598ddfbb1c296aed24557bca7fd0d4baf7a1ed4
diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch
new file mode 100644
index 0000000..b625d15
--- /dev/null
+++ b/dev-python/sip/files/sip-4.15.5-darwin.patch
@@ -0,0 +1,30 @@
+diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py
+--- siputils.py	2014-02-21 18:31:35.000000000 +0800
++++ siputils.py	2014-04-01 23:21:41.895036589 +0800
+@@ -945,8 +945,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             plib = clib + ".lib"
+-        elif sys.platform == "darwin" and framework:
+-            plib = "-framework " + clib
+         else:
+             plib = "-l" + clib
+ 
+@@ -961,8 +959,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+-        elif sys.platform == "darwin" and framework:
+-            prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
+         else:
+             prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
+ 
+@@ -1633,7 +1629,7 @@
+             if sys.platform == "win32":
+                 ext = "pyd"
+             elif sys.platform == "darwin":
+-                ext = "so"
++                ext = "bundle"
+             elif sys.platform == "cygwin":
+                 ext = "dll"
+             else:
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index cbe6e6d..ff3d49f 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
-	<herd>python</herd>
 	<upstream>
 		<maintainer status="active">
 			<email>phil@riverbankcomputing.com</email>
diff --git a/dev-python/sip/sip-4.15.5-r1.ebuild b/dev-python/sip/sip-4.15.5-r1.ebuild
new file mode 100644
index 0000000..d6686ca
--- /dev/null
+++ b/dev-python/sip/sip-4.15.5-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} )
+
+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/*
+}