pesa 15/02/18 18:20:09
Modified: qtsingleapplication-2.6.1_p20130904-r2.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/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild?r1=1.2&r2=1.3
Index: qtsingleapplication-2.6.1_p20130904-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtsingleapplication-2.6.1_p20130904-r2.ebuild 11 Feb 2015 03:41:40
-0000 1.2
+++ qtsingleapplication-2.6.1_p20130904-r2.ebuild 18 Feb 2015 18:20:09
-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/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 @@
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_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 @@
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
1.11 dev-qt/qtsingleapplication/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 11 Feb 2015 03:41:40 -0000 1.10
+++ ChangeLog 18 Feb 2015 18:20:09 -0000 1.11
@@ -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 <[email protected]>
+ qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+ Simplify pkg_setup().
11 Feb 2015; Patrick Lauer <[email protected]>
qtsingleapplication-2.6.1_p20130904-r2.ebuild:
