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 DC3C8138202 for ; Mon, 12 Nov 2012 09:20:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2DC321C057; Mon, 12 Nov 2012 09:20:10 +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 05DCB21C057 for ; Mon, 12 Nov 2012 09:20:09 +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 DD6EF33D990 for ; Mon, 12 Nov 2012 09:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4035AE5444 for ; Mon, 12 Nov 2012 09:20:07 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1352711668.a66cfcef20629cf3887ff6ee8c8eda858ae2dde4.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a66cfcef20629cf3887ff6ee8c8eda858ae2dde4 X-VCS-Branch: master Date: Mon, 12 Nov 2012 09:20:07 +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: b6c54ee2-7303-49c4-95c6-213e1c4c3a82 X-Archives-Hash: d67ce40e0b98bad11f2c67f18a86b7dd commit: a66cfcef20629cf3887ff6ee8c8eda858ae2dde4 Author: Davide Pesavento gmail com> AuthorDate: Mon Nov 12 09:14:28 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 12 09:14:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a66cfcef [qt4-build.eclass] Drop support for EAPI=2. --- eclass/qt4-build.eclass | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index cb627f6..d1784ca 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -10,8 +10,8 @@ # This eclass contains various functions that are used when building Qt4. case ${EAPI} in - 2|3|4|5) : ;; - *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;; + 3|4|5) : ;; + *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;; esac inherit eutils flag-o-matic multilib toolchain-funcs versionator @@ -101,8 +101,6 @@ S=${WORKDIR}/${MY_P} # @DESCRIPTION: # Sets up PATH and LD_LIBRARY_PATH. qt4-build_pkg_setup() { - [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= - # Protect users by not allowing downgrades between releases. # Downgrading revisions within the same release should be allowed. if has_version ">${CATEGORY}/${P}-r9999:4"; then @@ -190,7 +188,7 @@ qt4-build_src_unpack() { # PATCHES array variable containing all various patches to be applied. # This variable is expected to be defined in global scope of ebuild. # Make sure to specify the full path. This variable is utilised in -# src_unpack/src_prepare phase, based on EAPI. +# src_prepare() phase. # # @CODE # PATCHES=( "${FILESDIR}/mypatch.patch" @@ -550,7 +548,6 @@ fix_includes() { # @DESCRIPTION: # Perform the actual installation including some library fixes. qt4-build_src_install() { - [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} setqtenv install_directories ${QT4_TARGET_DIRECTORIES}