From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CE63313880A for ; Sat, 2 Feb 2013 23:28:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D5ADE02CE; Sat, 2 Feb 2013 23:28:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6770E02CE for ; Sat, 2 Feb 2013 23:28:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5E6F33DD3D for ; Sat, 2 Feb 2013 23:28:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 04F262171D; Sat, 2 Feb 2013 23:28:27 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/clang: clang-9999.ebuild clang-3.2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: clang-9999.ebuild clang-3.2.ebuild ChangeLog X-VCS-Directories: sys-devel/clang X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130202232828.04F262171D@flycatcher.gentoo.org> Date: Sat, 2 Feb 2013 23:28:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b06d3ac1-abcc-4c7c-99fb-bf960f3f69d2 X-Archives-Hash: 0836ae955bf656a7cad70e47b5c0b9ce mgorny 13/02/02 23:28:27 Modified: clang-9999.ebuild clang-3.2.ebuild ChangeLog Log: Migrate to python-r1. (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) Revision Changes Path 1.34 sys-devel/clang/clang-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?r1=1.33&r2=1.34 Index: clang-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- clang-9999.ebuild 3 Jan 2013 23:36:58 -0000 1.33 +++ clang-9999.ebuild 2 Feb 2013 23:28:27 -0000 1.34 @@ -1,13 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.33 2013/01/03 23:36:58 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.34 2013/02/02 23:28:27 mgorny Exp $ -EAPI=4 +EAPI=5 -RESTRICT_PYTHON_ABIS="3.*" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) -inherit subversion eutils multilib python +inherit subversion eutils multilib python-r1 DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="http://clang.llvm.org/" @@ -17,10 +16,12 @@ LICENSE="UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug multitarget +static-analyzer test" +IUSE="debug multitarget python +static-analyzer test" -DEPEND="static-analyzer? ( dev-lang/perl )" -RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=]" +DEPEND="static-analyzer? ( dev-lang/perl ) + ${PYTHON_DEPS}" +RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=] + ${PYTHON_DEPS}" S="${WORKDIR}/llvm" @@ -53,10 +54,6 @@ sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ -i tools/clang/lib/Driver/Tools.cpp \ || die "gold plugin path sed failed" - # Specify python version - python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view - python_convert_shebangs -r 2 test/Scripts - python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py # From llvm src_prepare einfo "Fixing install dirs" @@ -115,13 +112,12 @@ echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - testing() { - if ! emake -j1 VERBOSE=1 test; then - has test $FEATURES && die "Make test failed. See above for details." - has test $FEATURES || eerror "Make test failed. See above for details." - fi - } - python_execute_function testing + python_export_best + + if ! emake -j1 VERBOSE=1 test; then + has test $FEATURES && die "Make test failed. See above for details." + has test $FEATURES || eerror "Make test failed. See above for details." + fi } src_install() { @@ -136,19 +132,34 @@ insinto /usr/share/${PN} doins tools/scan-build/scanview.css doins tools/scan-build/sorttable.js - - cd tools/scan-view || die "cd scan-view failed" - dobin scan-view - install-scan-view() { - insinto "$(python_get_sitedir)"/clang - doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py - } - python_execute_function install-scan-view fi - # AddressSanitizer symbolizer (currently separate) - dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + python_inst() { + if use static-analyzer ; then + pushd tools/scan-view >/dev/null || die + + python_doscript scan-view + + touch __init__.py || die + python_moduleinto clang + python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py + + popd >/dev/null || die + fi + + if use python ; then + pushd bindings/python/clang >/dev/null || die + + python_moduleinto clang + python_domodule __init__.py cindex.py enumerations.py + + popd >/dev/null || die + fi + + # AddressSanitizer symbolizer (currently separate) + python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + } + python_foreach_impl python_inst # Fix install_names on Darwin. The build system is too complicated # to just fix this, so we correct it post-install @@ -173,11 +184,3 @@ done fi } - -pkg_postinst() { - python_mod_optimize clang -} - -pkg_postrm() { - python_mod_cleanup clang -} 1.4 sys-devel/clang/clang-3.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-3.2.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-3.2.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-3.2.ebuild?r1=1.3&r2=1.4 Index: clang-3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clang-3.2.ebuild 11 Jan 2013 07:01:44 -0000 1.3 +++ clang-3.2.ebuild 2 Feb 2013 23:28:27 -0000 1.4 @@ -1,13 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.2.ebuild,v 1.3 2013/01/11 07:01:44 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.2.ebuild,v 1.4 2013/02/02 23:28:27 mgorny Exp $ EAPI=5 -RESTRICT_PYTHON_ABIS="3.*" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) -inherit eutils multilib python +inherit eutils multilib python-r1 DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="http://clang.llvm.org/" @@ -19,10 +18,12 @@ LICENSE="UoI-NCSA" SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="debug kernel_FreeBSD multitarget +static-analyzer test" +IUSE="debug kernel_FreeBSD multitarget python +static-analyzer test" -DEPEND="static-analyzer? ( dev-lang/perl )" -RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=]" +DEPEND="static-analyzer? ( dev-lang/perl ) + ${PYTHON_DEPS}" +RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=] + ${PYTHON_DEPS}" S=${WORKDIR}/llvm-${PV}.src @@ -55,10 +56,6 @@ sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ -i tools/clang/lib/Driver/Tools.cpp \ || die "gold plugin path sed failed" - # Specify python version - python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view - python_convert_shebangs -r 2 test/Scripts - python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py # From llvm src_prepare einfo "Fixing install dirs" @@ -127,13 +124,12 @@ echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - testing() { - if ! emake -j1 VERBOSE=1 test; then - has test $FEATURES && die "Make test failed. See above for details." - has test $FEATURES || eerror "Make test failed. See above for details." - fi - } - python_execute_function testing + python_export_best + + if ! emake -j1 VERBOSE=1 test; then + has test $FEATURES && die "Make test failed. See above for details." + has test $FEATURES || eerror "Make test failed. See above for details." + fi } src_install() { @@ -148,19 +144,34 @@ insinto /usr/share/${PN} doins tools/scan-build/scanview.css doins tools/scan-build/sorttable.js - - cd tools/scan-view || die "cd scan-view failed" - dobin scan-view - install-scan-view() { - insinto "$(python_get_sitedir)"/clang - doins Reporter.py Resources ScanView.py startfile.py - touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py - } - python_execute_function install-scan-view fi - # AddressSanitizer symbolizer (currently separate) - dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + python_inst() { + if use static-analyzer ; then + pushd tools/scan-view >/dev/null || die + + python_doscript scan-view + + touch __init__.py || die + python_moduleinto clang + python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py + + popd >/dev/null || die + fi + + if use python ; then + pushd bindings/python/clang >/dev/null || die + + python_moduleinto clang + python_domodule __init__.py cindex.py enumerations.py + + popd >/dev/null || die + fi + + # AddressSanitizer symbolizer (currently separate) + python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py + } + python_foreach_impl python_inst # Fix install_names on Darwin. The build system is too complicated # to just fix this, so we correct it post-install @@ -188,11 +199,3 @@ # Remove unnecessary headers on FreeBSD, bug #417171 use kernel_FreeBSD && rm "${ED}"usr/$(get_libdir)/clang/${PV}/include/{arm_neon,std,float,iso,limits,tgmath,varargs}*.h } - -pkg_postinst() { - python_mod_optimize clang -} - -pkg_postrm() { - python_mod_cleanup clang -} 1.84 sys-devel/clang/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.84&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.84&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?r1=1.83&r2=1.84 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ChangeLog 15 Jan 2013 12:31:55 -0000 1.83 +++ ChangeLog 2 Feb 2013 23:28:27 -0000 1.84 @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.83 2013/01/15 12:31:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.84 2013/02/02 23:28:27 mgorny Exp $ + + 02 Feb 2013; Michał Górny clang-3.2.ebuild, + clang-9999.ebuild: + Migrate to python-r1. 15 Jan 2013; Jeroen Roovers metadata.xml: Switch to UTF8.