diff options
author | Davide Pesavento <pesa@gentoo.org> | 2016-04-17 03:19:26 +0200 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2016-04-17 03:19:26 +0200 |
commit | 9f954563a2abd999dd87fe37c5ddd911e72ceaab (patch) | |
tree | 4f2cb59a09478a418cfe43e99eb0078b297f06c1 /dev-python/sip | |
parent | 84ac7d636ebced5641a9119132cc4915e8250d49 (diff) | |
download | gentoo-9f954563a2abd999dd87fe37c5ddd911e72ceaab.tar.gz gentoo-9f954563a2abd999dd87fe37c5ddd911e72ceaab.tar.xz |
dev-python/sip: version bump; EAPI=6
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-python/sip')
-rw-r--r-- | dev-python/sip/Manifest | 1 | ||||
-rw-r--r-- | dev-python/sip/files/sip-4.18-darwin.patch | 30 | ||||
-rw-r--r-- | dev-python/sip/sip-4.18.ebuild | 91 | ||||
-rw-r--r-- | dev-python/sip/sip-4.9999.ebuild | 19 |
4 files changed, 133 insertions, 8 deletions
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest index fc9dd24c5a4..988913f6b0d 100644 --- a/dev-python/sip/Manifest +++ b/dev-python/sip/Manifest @@ -1,3 +1,4 @@ DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82 DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0 DIST sip-4.17.tar.gz 959835 SHA256 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060 SHA512 ac9af0b0e8424152a9768bccacd4db393fd3f4e5c8cf171863d9e615564c744c5be4d0b4af82c5ceed8d27f9845e308f559df30153e6d5bce8d4e2af6e5192d9 WHIRLPOOL a11d1f3d43b60fa06bc67dec60a500c0c163f179bec8865e5eef286c191652fd51d45965f8f96c3c13365976a5bd85c36454924a4da9c1508df0d807466ecf20 +DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4 diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch new file mode 100644 index 00000000000..6dd45ac024e --- /dev/null +++ b/dev-python/sip/files/sip-4.18-darwin.patch @@ -0,0 +1,30 @@ +diff -ru sip-4.18.orig/siputils.py sip-4.18/siputils.py +--- sip-4.18.orig/siputils.py 2016-04-16 22:38:22.662502890 +0200 ++++ sip-4.18/siputils.py 2016-04-16 22:38:39.881551111 +0200 +@@ -946,8 +946,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 + +@@ -962,8 +960,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") + +@@ -1639,7 +1635,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/sip-4.18.ebuild b/dev-python/sip/sip-4.18.ebuild new file mode 100644 index 00000000000..799bd72a42c --- /dev/null +++ b/dev-python/sip/sip-4.18.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit 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" +SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz" + +# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in +SLOT="0/11" +LICENSE="|| ( GPL-2 GPL-3 SIP )" +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" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch ) +DOCS=( "${S}"/{ChangeLog,NEWS} ) + +src_prepare() { + # 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 + + # Fix out-of-source installation of sip.pyi + sed -i -e '/installs.*sip\.pyi/ s/build_dir/src_dir/' configure.py || die + + default +} + +src_configure() { + configuration() { + local myconf=( + "${PYTHON}" + "${S}"/configure.py + --bindir="${EPREFIX}/usr/bin" + --destdir="$(python_get_sitedir)" + --incdir="$(python_get_includedir)" + $(usex debug --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() { + default + python_optimize + } + python_foreach_impl run_in_build_dir installation + + use doc && dodoc -r doc/html +} diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild index f7b9c0da855..aa6c00622ce 100644 --- a/dev-python/sip/sip-4.9999.ebuild +++ b/dev-python/sip/sip-4.9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) -inherit eutils mercurial python-r1 toolchain-funcs +inherit python-r1 toolchain-funcs mercurial DESCRIPTION="Python extension module generator for C and C++ libraries" HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP" @@ -30,9 +30,10 @@ REQUIRED_USE=" || ( $(python_gen_useflags 'python2*') ) " -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch +PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch ) +DOCS=( "${S}"/{ChangeLog,NEWS} ) +src_prepare() { python_setup 'python2*' "${PYTHON}" build.py prepare || die if use doc; then @@ -50,6 +51,8 @@ src_prepare() { eerror die "sub-slot sanity check failed" fi + + default } src_configure() { @@ -57,9 +60,10 @@ src_configure() { local myconf=( "${PYTHON}" "${S}"/configure.py + --bindir="${EPREFIX}/usr/bin" --destdir="$(python_get_sitedir)" --incdir="$(python_get_includedir)" - $(use debug && echo --debug) + $(usex debug --debug '') AR="$(tc-getAR) cqs" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" @@ -86,11 +90,10 @@ src_compile() { src_install() { installation() { - emake DESTDIR="${D}" install + default python_optimize } python_foreach_impl run_in_build_dir installation - dodoc ChangeLog NEWS use doc && dodoc -r doc/html } |