Bump

Package-Manager: portage-2.2.6/cvs/Linux x86_64

3 files changed, 122 insertions, 12 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index ee8be4c845ba..960b51df10a3 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.264 2013/09/10 05:18:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.265 2013/09/17 02:17:19 patrick Exp $
+
+*sip-4.15.2 (17 Sep 2013)
+
+  17 Sep 2013; Patrick Lauer <patrick@gentoo.org> +sip-4.15.2.ebuild:
+  Bump
 
   10 Sep 2013; Markus Meier <maekke@gentoo.org> sip-4.14.7.ebuild:
   arm stable, bug #483112
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index f5dca346fd14..059d83daa31b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.14.3.tar.gz 747092 SHA256 a84fcaf0e400a45496fe70f0cf1adc7eddf0788ade44a4567d51db8bf1ff5770 SHA512 8e91ef5efbdb84d22812b392e2fb7bfdd6e8b798d49245b7ba945f24a452475be4f5bee0d11a7a00553ec8d1628ee80542a910f87e24fe5dcc1b81fd8b9b122a WHIRLPOOL 0d8634aa175239066c387244e9296a51123ae4219419c346ff93ff68dc451af75b0cd8d136e03658ea280930b3bde7acb50d65a4e138ffbe9268a7acd69a9e62
 DIST sip-4.14.6.tar.gz 749965 SHA256 4adda378be3ed0c2bb15f502b8437be72ddada20201b9433ea0df50c7b698daf SHA512 b8ad6c98a98c7e568096f8c24cf2ac4df312634c4442c769643a647de9243ed5d40519a633d3ec042c2004543f5f41bbc8112b07a1abef0c930f6d6d2ec823e2 WHIRLPOOL 815f46c43c7ceb679f2956f5b1f01513d37705ac770667d812566c52a1c2a9d51ddb59d3aaf1412ecd5de2619e84b3791db5ded30adc69f28cb0e827b4286bbd
 DIST sip-4.14.7.tar.gz 754916 SHA256 05669120a53a2c98f98560424cda413ae95f5528494c80764004dbea78d361b7 SHA512 8a2ff12553c4c0b31f5884ef292b9c233d0a1148c66c9bdea2b7f74ce151465a16f8e511069e6e47a0527f960c1f13a9ec6c5766d7324670c236a92536bbb6b3 WHIRLPOOL 6729efbd0e6a42138d5590822a0a22f7c38938dc2af4af2245ae13b1461bf15510c0f4161ef3dd864f02c98a168817f755ccd60b41c94358ffcacfc3d14ad673
+DIST sip-4.15.2.tar.gz 773688 SHA256 b418cfdc3fabdd9175e7c29bab935812075d325ba5e0f693ec84b5473b802624 SHA512 bc47274cd17b62a4f1b7a6cc3108685b2d905b0d121250403be971f9abd0f2ae73b02536529bc3b210f5ad9105c39c1416ad87e4389feb03ab1c3236dab17acf WHIRLPOOL 483d760677d3bfa97a7cf9c66c573313a31428a5527ffad42e156f28170d7d7629d812fee939f89a5968d753b9f114b940f64aa0fa0a95d3c5b4d16e34c920e3
 EBUILD sip-4.14.3.ebuild 2912 SHA256 09dc1f854cde093cf59370ccaf4e98bff46d87a520c019108d63d9dc78342829 SHA512 da03bf9b02d1061406612a286833010c0da0e5532c7d0722cbae52b858b1ea7813951a47adb235cb64d083fd529ad43b2b88890a085275018fd1216caa01549c WHIRLPOOL d3a2fb2360830e3ed08970ba557bb181246229dc704fc65cc982c17db325753c951fc397e180eab66ab391c5f617f38ee28f0fe0c333303117ab0d74f26bd45a
 EBUILD sip-4.14.6.ebuild 2959 SHA256 07fb2ffe8dfba65869b102bc13d1a4a9cc2d87a33a593b5be367d683bad0d708 SHA512 508c7ad967421dbaf60ce90f0fd6461871ae4b48ac777d1bfca30cb3a9f51d53153b0e3399097104bbb7833b3bd0a302f9d7ec25332c1db81b8251feef6466e7 WHIRLPOOL 9bc9e4c7476496ddd7e00b1f2ce0f517f27b1f43784ec8f6fc2d132ac824ca788fdc535b7e769364b30abd7f2384caba08829e3e9266beb7cb1661b025ce303b
 EBUILD sip-4.14.7.ebuild 2953 SHA256 f61a541270dc05fb8778f745235ace4e35a552b4a8fe8de35c3d91e362ebe1ae SHA512 b5110d84cf5077c49aa93266147f460635b499b24890e5a7157a134f29ffa814874b4fe77b50548ecfdf80e8a93e655cf47c5273dbc66f0cb88a965e75932898 WHIRLPOOL 7a510c738e216c77f83346a3d1b924a4e927dc60e62544a366f16bb55b8d0f2815ebda991cb9a13503d42caeb88daee62dfd1b360a22b927f11b66389b8f8bcc
-MISC ChangeLog 31783 SHA256 a8f1d7d8651dba335b0c4a442015351c29d3455a9abb8ab95d5284146ba52f39 SHA512 85807a547c3dffa9537c862607af0a28975cbb8edf64c306e10471802405ef88fb6bf8954b4015d474b8f7cfacb1c62df3a90387cd95db9d111bd99e9906fdaf WHIRLPOOL fe96b5c16601ce1a360706fde8f1e7f4a19313cbb03c319852373a4b2589713cd942927db32e9f088e28989cd8d930ff75d2c0a59804eb3db3dec8eb1c68d0b1
+EBUILD sip-4.15.2.ebuild 2961 SHA256 ffc8c783256fd8f27bf2e968f5253fc2adc3e750ed5263d718e5151f9d15a78f SHA512 e34494cb5a7bf445c31fa8b91260ded5f7e2e71017686dc431b5db9a4c1acfd9d221c38d352b95525db3b858ac57648b308d7d4c76692ae90487f732176b1406 WHIRLPOOL 8eeb28ce84bfcab43ac09ea2741694c949dba7e55519995c5517ad700813d01d393c4e15ebbf418564fbb47e16f92d5ecd1298a1a442a7dc75e07e3a6272fdf0
+MISC ChangeLog 31889 SHA256 722c1b0cff7ac11fec987ba409f61d302454fbff31c5665003d768ce08f50a5d SHA512 e58cdf8e408a700e6ce9716e2a2c54426c28b2f90381368adf6b2b0a197a94028984338e8287ed9e765fbb3b4fb124a3c4d507b761f3d60a30dd8e978dba35f8 WHIRLPOOL 2daae444de0764cb39e5a2d5958d18a2b5be7820b9db15d34f683cac3ec9e0db6c41dd1b87f4ecc52d32d8355d267df9c5eff0ee24b4d92a2afe14bad00ddfd4
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlIurScACgkQkKaRLQcq0GL5rwCeLnmTZ8fiHANvkKe9U0k2zXc/
-UHAAn1y6+KRs9ywQ4C2qFyYA4p6pMNKS
-=B/3u
------END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.15.2.ebuild b/dev-python/sip/sip-4.15.2.ebuild
new file mode 100644
index 000000000000..87737920508b
--- /dev/null
+++ b/dev-python/sip/sip-4.15.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.15.2.ebuild,v 1.1 2013/09/17 02:17:19 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils 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/10"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-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.9.3-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 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() {
+	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 NEWS
+	use doc && dohtml -r doc/html/*
+}