diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-02-18 18:20:09 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-02-18 18:20:09 +0000 |
| commit | 06736d765bb20056d9dd0d5428d7f040c432c61f (patch) | |
| tree | 8fcddb5447e79757b73d414e2cf5b7b86aab990b /dev-qt | |
| parent | Simplify pkg_setup(). (diff) | |
| download | gentoo-2-06736d765bb20056d9dd0d5428d7f040c432c61f.tar.gz gentoo-2-06736d765bb20056d9dd0d5428d7f040c432c61f.tar.bz2 gentoo-2-06736d765bb20056d9dd0d5428d7f040c432c61f.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/qtsingleapplication/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild | 26 |
2 files changed, 15 insertions, 17 deletions
diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog index c711c6b26074..a6c5e4e9873e 100644 --- a/dev-qt/qtsingleapplication/ChangeLog +++ b/dev-qt/qtsingleapplication/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtsingleapplication # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.10 2015/02/11 03:41:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.11 2015/02/18 18:20:09 pesa Exp $ + + 18 Feb 2015; Davide Pesavento <pesa@gentoo.org> + qtsingleapplication-2.6.1_p20130904-r2.ebuild: + Simplify pkg_setup(). 11 Feb 2015; Patrick Lauer <patrick@gentoo.org> qtsingleapplication-2.6.1_p20130904-r2.ebuild: diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild index 8bba5d0bdbaa..2fc9b008badd 100644 --- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild +++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.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/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.2 2015/02/11 03:41:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.3 2015/02/18 18:20:09 pesa Exp $ EAPI=5 @@ -39,13 +39,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() { @@ -66,10 +60,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 } @@ -86,22 +80,22 @@ src_install() { use doc && dodoc -r doc/html myinstall() { - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - insinto /usr/include/qt4/QtSolutions/ + if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then + insinto /usr/include/qt4/QtSolutions doins src/qtsinglecoreapplication.h use X && doins src/{QtSingleApplication,${PN}.h} - insinto /usr/share/qt4/mkspecs/features/ + insinto /usr/share/qt4/mkspecs/features doins "${FILESDIR}"/${PN}.prf dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then - insinto /usr/include/qt5/QtSolutions/ + if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then + insinto /usr/include/qt5/QtSolutions doins src/qtsinglecoreapplication.h use X && doins src/{QtSingleApplication,${PN}.h} - insinto /usr/$(get_libdir)/qt5/mkspecs/features/ + insinto /usr/$(get_libdir)/qt5/mkspecs/features newins "${FILESDIR}"/${PN}5.prf ${PN}.prf dosym ${PN}.prf /usr/$(get_libdir)/qt5/mkspecs/features/qtsinglecoreapplication.prf fi |