commit: dd56b676c35121e9e2ae69c60e5c7527344106e7 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sat Nov 11 21:03:22 2017 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat Nov 11 21:05:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd56b676
dev-python/sip: add snapshot that fixes an issue with "old" compilers Package-Manager: Portage-2.3.13, Repoman-2.3.4 dev-python/sip/Manifest | 2 +- ...19.5.ebuild => sip-4.19.6_pre1711101252.ebuild} | 33 +++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest index d2039ef03b1..feaef1c163e 100644 --- a/dev-python/sip/Manifest +++ b/dev-python/sip/Manifest @@ -1,3 +1,3 @@ DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7 -DIST sip-4.19.5.tar.gz 1019157 SHA256 391b7bf08f1cd12d8a25ed5608ca36ee9b759eee1690d8156e35d92f9a74b456 SHA512 15d0c0daacf11534a61cd3961613e0015afb9f61fd484094008d1b3d344765d03a2bed2eb08c92a347bbe6868622ab1f7dc0a3bd3e2e662a8e08a53ac8e88463 WHIRLPOOL 0470942c3c8267ee58d430dfe99d7e3d895b9cd27c69660dfdb8e9506a090d9422ef8a1cb498ae6c47be4abe0d3c6802798179bcfe75a70d0b60860ffae67f72 +DIST sip-4.19.6.dev1711101252.tar.gz 999851 SHA256 f4152acde96c4cff72cab53004023c40139390a159188e0861ec666c94418d13 SHA512 87478433fb5a093f0f48465455eb731a90ab660d8d9b08f72071cdbe645220f5b923301214d524de90394dd55166e017a66427bed0fcc8731a08866e494c15d5 WHIRLPOOL 793e5a4515af673bc85cfcf11fb19a37f926237b7432c701f6b32f2dfd6a203e4f11f3362f401eb583ffc72e028144c441e79b261274c09705bca5ad07f2baeb diff --git a/dev-python/sip/sip-4.19.5.ebuild b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild similarity index 73% rename from dev-python/sip/sip-4.19.5.ebuild rename to dev-python/sip/sip-4.19.6_pre1711101252.ebuild index de3979095c5..8782d5f1065 100644 --- a/dev-python/sip/sip-4.19.5.ebuild +++ b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild @@ -9,7 +9,17 @@ inherit python-r1 toolchain-funcs DESCRIPTION="Python extension module generator for C and C++ libraries" HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"; -SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz" + +if [[ ${PV} == *9999 ]]; then + inherit mercurial + EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"; +elif [[ ${PV} == *_pre* ]]; then + MY_P=${P/_pre/.dev} + SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"; + S=${WORKDIR}/${MY_P} +else + SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz" +fi # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in SLOT="0/12" @@ -19,14 +29,29 @@ IUSE="debug doc" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" +if [[ ${PV} == *9999 ]]; then + DEPEND+=" + sys-devel/bison + sys-devel/flex + doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )" +fi -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +if [[ ${PV} == *9999 ]]; then + REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )" +fi PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch ) src_prepare() { + 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)
