[gentoo-commits] proj/qt:master commit in: dev-python/sip/, dev-python/sip/files/

[Davide Pesavento]

commit:     01017e87a05ea66b96b4ed0cd5f201a3c606898f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 16:47:53 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 16:47:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=01017e87

[dev-python/sip] Moved to gentoo-x86.

 dev-python/sip/files/sip-4.15.5-darwin.patch |  30 -------
 dev-python/sip/metadata.xml                  |  14 ----
 dev-python/sip/sip-4.9999.ebuild             | 112 ---------------------------
 3 files changed, 156 deletions(-)

diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch
deleted file mode 100644
index b625d15..0000000
--- a/dev-python/sip/files/sip-4.15.5-darwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 318329c..0000000
--- a/dev-python/sip/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>qt</herd>
-	<upstream>
-		<maintainer status="active">
-			<email>phil@××××××××××××××××××.com</email>
-			<name>Phil Thompson</name>
-		</maintainer>
-		<bugs-to>mailto:pyqt@××××××××××××××××××.com</bugs-to>
-		<remote-id type="pypi">SIP</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
deleted file mode 100644
index 58888b6..0000000
--- a/dev-python/sip/sip-4.9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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=""
-IUSE="debug doc"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-[[ ${PV} == *9999* ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-[[ ${PV} == *9999* ]] && REQUIRED_USE+="
-	|| ( $(python_gen_useflags 'python2*') )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	if [[ ${PV} == *9999* ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" 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
-}