Version bump.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 135 insertions, 15 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index b9a3346d1984..f2e593a9d9e9 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.254 2013/06/24 07:49:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.255 2013/06/24 09:23:09 pesa Exp $
+
+*sip-4.14.7 (24 Jun 2013)
+
+  24 Jun 2013; Davide Pesavento <pesa@gentoo.org> +sip-4.14.7.ebuild:
+  Version bump.
 
   24 Jun 2013; Davide Pesavento <pesa@gentoo.org> sip-4.14.6.ebuild:
   Add PYTHON_REQUIRED_USE.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 211f84cbfba2..3c9681152bc4 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -4,24 +4,26 @@ 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
 EBUILD sip-4.14.3.ebuild 2921 SHA256 b1934d919ac921b8eb1371b2e8f77a044c4443f330eb4aa6e0debc38a99d3fe3 SHA512 1d6f6da3e6fc771b6c86fe39919ddd561515e099e734931f87020c3cf124d41fc9496ca301d7fc49b501b7f13e49cd6a5c802812797fdfdede991b3d26117e03 WHIRLPOOL d959d245c2687d042a89da831ae8db2a065657de4b1409149f30c890415df4ab75e54639ebf3a11e89497f3e4e241f3a940e342778655726f1834e0a2bf52130
 EBUILD sip-4.14.6.ebuild 2965 SHA256 41d7ce2d29e8c6aea123fb09b071f34403bd57bb4ed3648333885baa1b0084b1 SHA512 9af2e92530d700ceec2e94da2857c6a7329ee076848f96b21b47c4dee5b369598b00d31ad25d688506e573deb16cf5021ba759b0efbe169ad6763d6156d7d7f4 WHIRLPOOL 6ec460451b2d6e0e5dca8dbd782b1c46015d061fe7f6115ff8c4c49e28e707d03b6d6471191a6f059d4d3c4601628757320c0e781db2dbb6e16ac8734f1a0c30
-MISC ChangeLog 30687 SHA256 e6ac3f2154f6033239768b5df12f894c8a797954f60c6858d461e0adb61e76ae SHA512 bd2916f2ffa781d6c10696d7555d54559c124820564ee7c354a757ec33a16913a232d45300c9b76ad46e8af11b2576e6af17b26b06a34d84ab284d0e137435e3 WHIRLPOOL 51bc478673ea8fa515d36024246f2911c1d376685c252ce16eb7e417fcc564a17464f43e1d2ea40d606a1e4429b8110f1b3fa9f92a9abcc0fc5a7920c1f969bd
+EBUILD sip-4.14.7.ebuild 2966 SHA256 5838a2a7c1c8566a5030bb17ac52dee8a156dccdf62392f78e743e9c247a49aa SHA512 bc2ff06397344d70ad93bd49cd5b5fe7c76bdc3a6a410f26800e94dae1c0eab19bb9036a5f54d257332387e6a5dbfd548b648f740e260035532df51f5b6e1008 WHIRLPOOL 6a45858663f673f9df5fae1a0020d6f447404df0e9a929b5ef94e14486259ff64b2a07deb8fcffead9718b5c4b53744be2655613c904736b7ef7e61b68d683eb
+MISC ChangeLog 30801 SHA256 3105ce73395ce4a25938f9194234a2b6947f5602cd5b0b63c5ceb2488d0431ca SHA512 06a41cd09d9c84f2384fab0e25c09153b91de7d75ddc03f9f5dcefe8ed290d231a522e0dd2c43d2d9b5c5c00ec4a5bbd72e02df094d913bb090414cc80d6455f WHIRLPOOL 411ad08614ec1ce4afc3d70251d8989de94542fd0579e2ce0664c1d3f2c59cf0f8924c887b198ad555c345967e94b7321646217690d61f1f091452bf2c28b991
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRx/oqAAoJENXLsxwXqFxyvrQP/1eVJWwFLmBNVCaz6WWPDacD
-nx0TxlRK34iEWpxUmvgiSWKos6yFLkPbF08r/OOhukPOgQU8lZy3QMCtps+Dpcpy
-tAkc4+fQTSOEtHiTDIR7nFsu77Zd+hzrxiv9EUXiEKt8IGrwbeeW5auByf1Tla83
-d+WCJc2E+bs16fx/5875tRI2ggfbBXo8YfEbqXwZknIMn41icrQajyn4t9LE+leW
-gqf0z/1dutPrLHo8vFNQIJ4gi96krZT48uymNCZgg+YEUJQuYrc03sZV2h9IaJ4X
-wWdhHKILZbvsVD32l5ZNpZ8B/3w2ZDuylkXGGNSC90nm0nYgEUyYdDp1jGVQuQVq
-5cD9Yt5uwo5DLUCHVXxL/Z+JFhs6YQhJGLxzn2z4p8pBg51fKmO9UiIVQwKVWSG9
-0wEagdn5QyE4x1LhOz1QTqFngUmhZMVvEK+qeDP8SaA7a0nbb5kCCTtKPLfhZFzh
-fmFtUQcaI7a36jM7W9yiEVZngjTsOaz+1YCunQXwLPIJX77i4Th4+wVUGx5dimoE
-lMU3eMs8K9RurfV7kUuKhcF1v9b3t4h5OO/9st4q4M51ZGqDWZa/lEe8CApc2c7E
-WWlAMmzj8mxKkgsy1ZcIizFuswGbypY3AaDuJXKamyiB/maNpu+kyY6P/rft7uTY
-/mcii+ajG423XhDrP4Xl
-=4KXf
+iQIcBAEBCAAGBQJRyBAcAAoJENXLsxwXqFxyvmoP/1C+QSlQ/HXKyYhuGwBSZsqT
+/aWNm/stGcyvbSUWNGFK5mZgicVOpHP2UICHPKNzJi/z/WzAe91Mkw+y+z2u3RAG
+EVaUbp/uzXZVmjG47ueqy9udXLclozXLY+28DaDAp3D2Up+378GayRdk5hkFEHYn
+brUTsz3a0kEAq2d017h7ETDWW8c9v7BMdFYAvs0OfMcO4kcW4h2j2PrT46QyQNF+
+Z2YQ+Xj1ptQwHWSnuIHbWGpE19jNYmGwdfyTgYhEZAQBppHhXxFsEmybwzm6JjHi
+WIy5jsEuk7+GKAYKV4d/aJ+fUg2ktrgaDAoLT57Hj7V8m+VOEDEiNn0CqDq6/bbu
+IoNHWj999rdle9YYRqpxXKhez9o9SNasWO2BTWlZmW4y6Z+wFXWMWxpT3zVKfc1W
+a3SQPrXjoSGVAgI2TT9IElrMr56r1Yw+oKhKygKMHvx1B0Kwv/GsPIbGHOv8mJS5
+HAmWvOJD4vQa/VEkcd5TOiGej1Dy675Mo8snhx3/ysWEg1zQ+4qZ8BYGV6mIHNnR
+FhWnNlSEoshEmDqAf/VVBxAb82YNjFE7pM+cujtlsMad/MQcPUR/LOPGtQOs5b5d
+J7kmCo9FcKkqOwzCAGz57tJy9K9mA6JpsGNpr6S2rDIK3IsRxovojuyApplWRPx6
+aGGsCPW+9MSR4hIr3PBb
+=7MUo
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.14.7.ebuild b/dev-python/sip/sip-4.14.7.ebuild
new file mode 100644
index 000000000000..7b4e2e2cbf11
--- /dev/null
+++ b/dev-python/sip/sip-4.14.7.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.14.7.ebuild,v 1.1 2013/06/24 09:23:09 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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/*
+}