pesa 15/02/18 18:19:22 Modified: qtlockedfile-2.4.1_p20130904-r1.ebuild ChangeLog Log: Simplify pkg_setup(). (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.3 dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild?r1=1.2&r2=1.3 Index: qtlockedfile-2.4.1_p20130904-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qtlockedfile-2.4.1_p20130904-r1.ebuild 2 Jan 2015 17:23:06 -0000 1.2 +++ qtlockedfile-2.4.1_p20130904-r1.ebuild 18 Feb 2015 18:19:22 -0000 1.3 @@ -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 @@ 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_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 @@ 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 @@ 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 1.13 dev-qt/qtlockedfile/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/ChangeLog?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/ChangeLog?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/ChangeLog?r1=1.12&r2=1.13 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ChangeLog 2 Jan 2015 17:23:06 -0000 1.12 +++ ChangeLog 18 Feb 2015 18:19:22 -0000 1.13 @@ -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 <[email protected]> + qtlockedfile-2.4.1_p20130904-r1.ebuild: + Simplify pkg_setup(). 02 Jan 2015; Michael Palimaka <[email protected]> qtlockedfile-2.4.1_p20130904-r1.ebuild:
