diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-02-18 18:19:22 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-02-18 18:19:22 +0000 |
| commit | ea5e4704dea7cc10e175432de7c97b0b9473c2b3 (patch) | |
| tree | e1292549f9b06bcde156da9cbd6967a31f86f11a /dev-qt | |
| parent | version bump (diff) | |
| download | gentoo-2-ea5e4704dea7cc10e175432de7c97b0b9473c2b3.tar.gz gentoo-2-ea5e4704dea7cc10e175432de7c97b0b9473c2b3.tar.bz2 gentoo-2-ea5e4704dea7cc10e175432de7c97b0b9473c2b3.zip | |
Simplify pkg_setup().
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtlockedfile/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/dev-qt/qtlockedfile/ChangeLog b/dev-qt/qtlockedfile/ChangeLog index 8513446b210e..4b1e363796ce 100644 --- a/dev-qt/qtlockedfile/ChangeLog +++ b/dev-qt/qtlockedfile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtlockedfile # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.12 2015/01/02 17:23:06 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.13 2015/02/18 18:19:22 pesa Exp $ + + 18 Feb 2015; Davide Pesavento <pesa@gentoo.org> + qtlockedfile-2.4.1_p20130904-r1.ebuild: + Simplify pkg_setup(). 02 Jan 2015; Michael Palimaka <kensington@gentoo.org> qtlockedfile-2.4.1_p20130904-r1.ebuild: diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild index de0810d7771b..bc3f81709305 100644 --- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild +++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v 1.2 2015/01/02 17:23:06 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v 1.3 2015/02/18 18:19:22 pesa Exp $ EAPI=5 @@ -28,13 +28,7 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P}/${PN} pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4 ; then - MULTIBUILD_VARIANTS+=( qt4 ) - fi - if use qt5 ; then - MULTIBUILD_VARIANTS+=( qt5 ) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_prepare() { @@ -49,10 +43,10 @@ src_prepare() { src_configure() { myconfigure() { - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then + if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then eqmake4 fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then + if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then eqmake5 fi } @@ -69,7 +63,7 @@ src_install() { use doc && dodoc -r doc/html myinstall() { - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then + if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then insinto /usr/include/qt4/QtSolutions doins src/QtLockedFile src/${PN}.h @@ -77,7 +71,7 @@ src_install() { doins "${FILESDIR}"/${PN}.prf fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then + if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then insinto /usr/include/qt5/QtSolutions doins src/QtLockedFile src/${PN}.h |