Bump

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

3 files changed, 123 insertions, 23 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 825190b487f8..f519af60fdf2 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.269 2013/12/25 19:51:52 pesa Exp $
+# 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 $
+
+*sip-4.15.4 (14 Jan 2014)
+
+  14 Jan 2014; Patrick Lauer <patrick@gentoo.org> +sip-4.15.4.ebuild:
+  Bump
 
   25 Dec 2013; Davide Pesavento <pesa@gentoo.org> -sip-4.14.3.ebuild,
   -sip-4.15.2.ebuild:
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 100cc6e44baf..7b16ffb856a8 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.14.7.tar.gz 754916 SHA256 05669120a53a2c98f98560424cda413ae95f5528494c80764004dbea78d361b7 SHA512 8a2ff12553c4c0b31f5884ef292b9c233d0a1148c66c9bdea2b7f74ce151465a16f8e511069e6e47a0527f960c1f13a9ec6c5766d7324670c236a92536bbb6b3 WHIRLPOOL 6729efbd0e6a42138d5590822a0a22f7c38938dc2af4af2245ae13b1461bf15510c0f4161ef3dd864f02c98a168817f755ccd60b41c94358ffcacfc3d14ad673
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
+DIST sip-4.15.4.tar.gz 776179 SHA256 594b742873cd135dc945e61f0fff4d9d35ea5da8d23e2fc8f3820c3771a52228 SHA512 887f740853d3ce09946faea2ccababfad505d454cfe2f9d525104d02a05fe6c146a549464901231a76039ea3855223206ef48c122bb51806cfd97a54c23ac143 WHIRLPOOL 545ea82634b87c0d782732bfbefe0d49fce2b09d1e405bd6b23691979c8f1b346fa95df962a1461b6654a651eb05b0c8eea7d94320d8d55d2dbcc54f2f36b1db
 EBUILD sip-4.14.7.ebuild 2949 SHA256 f7509074e6f7980e5ef0d2ca11883794e057c895ac6b19ca439b3e4b7f3a464d SHA512 3cbdbce5d4909f9b11f369be68345006cfb0a288b5696726d65b43d3181a85b8b9ac60eb9461b9bb6005b97627580778aa692411c2322a25d51f8b80228653e8 WHIRLPOOL 51566bdf1464516821062a259b77de7b410351a2241614426a7dfb17c5af99f3abc620f2452737ec859ccc97e878b0590e7afc05b86bb4afbaa0d14217693153
 EBUILD sip-4.15.3.ebuild 2969 SHA256 b2c672657c83267fe179de7f5d0021c17d07829b4a803800c069af887dab2435 SHA512 ab2f9643ee99710dd53cde3f9815691719dfc7a4d74684b117657a1cc3af8d771e88a4195ba9092aa8672f0261d566c08274ba4183850f3a03d413e5bbaf97a5 WHIRLPOOL a6d650287adb0ffb8c813fae4c4d243eed1e014e779fc3b51778f7e7a7b09104cb85e9668432409e00e1240964eb7829260123c4db5f412c5a6d1c2e9c09911c
-MISC ChangeLog 32342 SHA256 4b47840bb9187f07cb1e8d411ed5af3ec025b76d107f804899b0cb30129490eb SHA512 edfd1e0ad076a69f9459871a523fe906d109ba923aab06a23f537c59791dd16ec081d6fb9a6fc2982e910580ea5bcc6b35b12818166928835d133a42205eca6f WHIRLPOOL 0102391df7c7cfac8b8881bcbcbd5ae7364eb73c9c1e0e25f487818a2779935bb1036a5e813ded5e14666c2be32690d2acbb3dad30a4976a2391a93954a1b694
+EBUILD sip-4.15.4.ebuild 2972 SHA256 65c1c1dca9bd7d2a7f5a3f5a4a855cdc4fafd11df3061637e29d4d3fff15635f SHA512 65a990453a8d9f52112fdcd92ac0291b71155e419a23dc68282e4125efa549ac3955419891361c24367b112cd8594f6b5d2746091a20918ea4f53a05027a3c29 WHIRLPOOL 18480f0a814b5b9b7fbffc11419a4c61ee8c500d7c23cf168cd5be3bd7b4a88d8ab6f18439bbb8b4a3d765f0b97b24055d1483461c543d915efe678274c6645a
+MISC ChangeLog 32450 SHA256 c1cd61e29e2000d34e4a7f7ae76ad2d1a5f77bc453e60144a233a59c4edd8ac6 SHA512 f9e3e422e01b3da67138a137a2f639f02f4a2028689f69bed634c402849cd3f9cb4efbccb9e54ed93c2e85664cf2fa52dd2c732e3faa8587d170223e4e423928 WHIRLPOOL 576fae92511f457d5e3c345d9b289941334907198c3c4ce84a72aad061e3a633ee3601be4369c1141afa0abdf9832210f0ecd984572d55184a1102a7bc940963
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSuzdZAAoJENXLsxwXqFxy4Q4P/1N6RN9QR9itliTdBO/t7zKo
-46TDVTTZJx2eWlXixLSeINfU7o5Vke6KqlKltHhvYrbx5wQae2q0rQJ/aAMZxXbi
-HuBlXiEHMErA80216kXAAeGQ0/hELmc4IHiF2IkxLd9JoJ8M2zynLH8oEg8yVGEp
-VQa1ziGoqAL6/puPXV49kep/vb5smVPaEZWWgH/K7FuENyjy9zf2zzSMGOTTIoWs
-YEADmgx90Uv9W4whEbU1iqT6tLenJZWa8OPvh7YKR5CQmHmw3+CzuH4iUc1U3Gxj
-H0E7N6r8xKkyHvBzUXGmehD/b00z+XFXStNWzXJAyqRKf5UsEVugT7zz+BXI8Y7u
-nriT1N15Ru6yUv9kIdOSAsofIanZ2cLNoB1mzsIjbQLl+ScrayDMqK+YhiFHH64S
-u2FYn0b8ZYT1ExsdJlakgZ93HHkZt4oLpjW8ge6KKNwOvHWo9krxpq+qgPgJuhbO
-8yROrS3pBRLvl7h5pB3IfehY+FfbtivCattd0IRgT5F+OpLzdEO9BN9VOQdOb/P3
-CqtnyqvvQtiXFzB7oFo65Ir5ERoyNokNu/6B5chBWVSXVmc7QcOuDnZZSoZM6Hwu
-pND6HkjKjspAS0BcmS9FololZUoNwK6n33mkJ8EVFPMwMSdB0RtORbZCHQUEYxY5
-3lOnhkl83vJ74XJVNZtI
-=RHib
------END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.15.4.ebuild b/dev-python/sip/sip-4.15.4.ebuild
new file mode 100644
index 000000000000..34b1af8596fa
--- /dev/null
+++ b/dev-python/sip/sip-4.15.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.15.4.ebuild,v 1.1 2014/01/14 07:19:00 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 ~x64-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/*
+}