From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SEP89-000787-22 for garchives@archives.gentoo.org; Sun, 01 Apr 2012 18:03:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B1AEE0020; Sun, 1 Apr 2012 18:03:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 191EBE0020 for ; Sun, 1 Apr 2012 18:03:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0856B1B401B for ; Sun, 1 Apr 2012 18:03:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C5B08E5403 for ; Sun, 1 Apr 2012 18:03:47 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1333303374.05501d34f267aa802066ac22b12b3b6fae2d5b1f.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-edge.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 05501d34f267aa802066ac22b12b3b6fae2d5b1f X-VCS-Branch: master Date: Sun, 1 Apr 2012 18:03:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c3f5303a-a620-4baf-9bc9-4299357fb6ed X-Archives-Hash: 70f8e183838f67a1c0c3f3ade4a64e68 commit: 05501d34f267aa802066ac22b12b3b6fae2d5b1f Author: Michael Palimaka astralcloak net> AuthorDate: Sun Apr 1 18:02:54 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Sun Apr 1 18:02:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D05501d34 [eclass] Remove deprecated qt4-ebuild-edge --- eclass/qt4-build-edge.eclass | 193 ------------------------------------= ------ 1 files changed, 0 insertions(+), 193 deletions(-) diff --git a/eclass/qt4-build-edge.eclass b/eclass/qt4-build-edge.eclass deleted file mode 100644 index 649e441..0000000 --- a/eclass/qt4-build-edge.eclass +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# @ECLASS: qt4-build-edge.eclass -# @MAINTAINER: -# Qt herd -# @BLURB: Eclass for Qt4 split ebuilds in qt overlay. -# @DESCRIPTION: -# This eclass contains various functions that are used when building Qt4= . - -# WARNING: This eclass requires EAPI 2, 3 or 4 -# -# NOTES: -# -# 4.9999 and 4.?.9999[-kde-qt] -# stands for live ebuilds from qtsoftware's git repository -# (that is Nokia, previously trolltech) -# 4.?.9999[kde-qt] -# stands for live ebuilds from kde-qt git repository -# 4.*.*_{beta,rc,}* and * -# are official releases or snapshots from Nokia -# - -MY_EGIT_COMMIT=3D${EGIT_COMMIT:=3D} - -inherit eutils git-2 qt4-build - -if [[ ${PV} =3D=3D *.9999 ]]; then - SRC_URI=3D - DEPEND=3D"dev-lang/perl" -fi - -# @FUNCTION: qt4-build-edge_pkg_setup -# @DESCRIPTION: -# Sets up PATH, {,DY}LD_LIBRARY_PATH and EGIT_* variables. -qt4-build-edge_pkg_setup() { - debug-print-function $FUNCNAME "$@" - - MY_PV_EXTRA=3D"${PV}" - - case "${MY_PV_EXTRA}" in - 4.?.9999) - EGIT_REPO_URI=3D"git://gitorious.org/qt/qt.git" - EGIT_PROJECT=3D"qt-${PV}" - EGIT_BRANCH=3D"${MY_PV_EXTRA/.9999}" - ;; - 4.9999) - EGIT_REPO_URI=3D"git://gitorious.org/qt/qt.git" - EGIT_PROJECT=3D"qt-${PV}" - EGIT_BRANCH=3D"master" - ;; - esac - - EGIT_COMMIT=3D${MY_EGIT_COMMIT:=3D${EGIT_BRANCH}} - - # Let users know what they are getting themselves into ;-) - if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then - echo - ewarn "Please file bugs on bugs.gentoo.org and prepend the summary" - ewarn "with [qt overlay]. Alternatively, contact ." - ewarn "Thank you for using qt overlay." - ewarn - case "${MY_PV_EXTRA}" in - 4.?.9999 | 4.9999) - ewarn "The ${PV} version ebuilds install live git code from Nokia Qt= Software." - ;; - 4.*.*_*) - ewarn "The ${PV} version ebuilds install a pre-release from Nokia Qt= Software." - ;; - esac - echo - fi - - qt4-build_pkg_setup -} - -# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES -# @DESCRIPTION: -# Arguments for build_target_directories. Takes the directories in which= the -# code should be compiled. This is a space-separated list of relative pa= ths. - -# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES -# @DESCRIPTION: -# Space-separated list of directories that will be extracted from Qt tar= ball. - -# @FUNCTION: qt4-build-edge_src_unpack -# @DESCRIPTION: -# Unpacks the sources. -qt4-build-edge_src_unpack() { - debug-print-function $FUNCNAME "$@" - setqtenv - - local target=3D targets=3D - for target in configure LICENSE.{GPL3,LGPL} projects.pro \ - src/{qbase,qt_targets,qt_install}.pri \ - bin config.tests mkspecs qmake \ - ${QT4_EXTRACT_DIRECTORIES}; do - targets+=3D" ${MY_P}/${target}" - done - - case "${PV}" in - *.9999) - git-2_src_unpack - ;; - *) - echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} - tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die - ;; - esac -} - -# @ECLASS-VARIABLE: PATCHES -# @DESCRIPTION: -# In case you have patches to apply, specify them here. Make sure to spe= cify -# the full path. This variable is necessary for src_prepare phase. -# Example: -# PATCHES=3D( "${FILESDIR}"/mypatch.patch -# "${FILESDIR}"/mypatch2.patch ) - -# @FUNCTION: qt4-build-edge_src_prepare -# @DESCRIPTION: -# Prepares the sources before the configure phase. Strips C(XX)FLAGS if = necessary, and fixes -# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on = /etc/make.conf. -qt4-build-edge_src_prepare() { - debug-print-function $FUNCNAME "$@" - generate_include - # We need to remove any specific hardcoded compiler flags - sed -i -e '/^QMAKE_CFLAGS[^_.*]/s:\+=3D.*:=3D:' \ - -e '/^QMAKE_CXXFLAGS[^_.*]/s:\+=3D.*:=3D:' \ - -e '/^QMAKE_LFLAGS[^_.*]/s:\+=3D.*:=3D:' \ - "${S}"/mkspecs/common/g++.conf - - qt4-build_src_prepare -} - -# @FUNCTION: qt4-build-edge_src_configure -# @DESCRIPTION: -# Runs ./configure with appropriate arguments. You can use -# the ${myconf} variable to pass additional arguments. -qt4-build-edge_src_configure() { - debug-print-function $FUNCNAME "$@" - qt4-build_src_configure -} - -# @FUNCTION: qt4-build-edge_src_compile -# @DESCRIPTION: -# Compiles the code in ${QT4_TARGET_DIRECTORIES}. -qt4-build-edge_src_compile() { - debug-print-function $FUNCNAME "$@" - qt4-build_src_compile -} - -# @FUNCTION: qt4-build-edge_src_install -# @DESCRIPTION: -# Performs the actual installation including some library fixes. -qt4-build-edge_src_install() { - debug-print-function $FUNCNAME "$@" - qt4-build_src_install -} - -# @FUNCTION: qt4-build-edge_src_test -# @DESCRIPTION: -# Runs make check in target directories only (required for live ebuilds)= . -qt4-build-edge_src_test() { - debug-print-function $FUNCNAME "$@" - qt4-build_src_test -} - -# @FUNCTION: qt4-build-edge_pkg_postrm -# @DESCRIPTION: -# Generates configuration when the package is completely removed. -qt4-build-edge_pkg_postrm() { - debug-print-function $FUNCNAME "$@" - qt4-build_pkg_postrm -} - -# @FUNCTION: qt4-build-edge_pkg_postinst -# @DESCRIPTION: -# Generates configuration after the package is installed. -qt4-build-edge_pkg_postinst() { - debug-print-function $FUNCNAME "$@" - qt4-build_pkg_postinst -} - -# @FUNCTION: generate_include -# @DESCRIPTION: -# Internal function, required for live ebuilds. -generate_include() { - QTDIR=3D"." perl bin/syncqt -} - -EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_comp= ile src_install src_test pkg_postrm pkg_postinst