* [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r2.ebuild ChangeLog
@ 2015-01-02 18:17 Michael Palimaka (kensington)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2015-01-02 18:17 UTC (permalink / raw
To: gentoo-commits
kensington 15/01/02 18:17:33
Modified: ChangeLog
Added: qtsingleapplication-2.6.1_p20130904-r2.ebuild
Log:
Add Qt 5 support wrt bug #534304.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path
1.9 dev-qt/qtsingleapplication/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 14 Jul 2014 11:53:59 -0000 1.8
+++ ChangeLog 2 Jan 2015 18:17:33 -0000 1.9
@@ -1,6 +1,13 @@
# ChangeLog for dev-qt/qtsingleapplication
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.8 2014/07/14 11:53:59 pesa Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.9 2015/01/02 18:17:33 kensington Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r2 (02 Jan 2015)
+
+ 02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+ +files/qtsingleapplication5.prf,
+ +qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+ Add Qt 5 support wrt bug #534304.
14 Jul 2014; Davide Pesavento <pesa@gentoo.org>
qtsingleapplication-2.6.1_p20130904-r1.ebuild:
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild?rev=1.1&content-type=text/plain
Index: qtsingleapplication-2.6.1_p20130904-r2.ebuild
===================================================================
# 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.1 2015/01/02 18:17:33 kensington Exp $
EAPI=5
inherit multibuild multilib qmake-utils
MY_P=qt-solutions-${PV#*_p}
DESCRIPTION="Qt library to start applications only once per user"
HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="doc +qt4 qt5 X"
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
qt4? (
dev-qt/qtcore:4
X? ( dev-qt/qtgui:4 )
)
qt5? (
dev-qt/qtcore:5
dev-qt/qtnetwork:5
X? (
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
)
dev-qt/qtlockedfile[qt4?,qt5?]
"
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
}
src_prepare() {
epatch "${FILESDIR}/${PV}-unbundle-qtlockedfile.patch"
epatch "${FILESDIR}/${PV}-no-gui.patch"
echo 'SOLUTIONS_LIBRARY = yes' > config.pri
use X || echo 'QTSA_NO_GUI = yes' >> config.pri
sed -i -e "s/-head/-${PV%.*}/" common.pri || die
sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
# to ensure unbundling
rm -f src/qtlockedfile*
multibuild_copy_sources
}
src_configure() {
myconfigure() {
if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
eqmake4
fi
if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
eqmake5
fi
}
multibuild_foreach_variant run_in_build_dir myconfigure
}
src_compile() {
multibuild_foreach_variant run_in_build_dir default
}
src_install() {
dodoc README.TXT
use doc && dodoc -r doc/html
myinstall() {
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/
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/
doins src/qtsinglecoreapplication.h
use X && doins src/{QtSingleApplication,${PN}.h}
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
dolib.so lib/*
}
multibuild_foreach_variant run_in_build_dir myinstall
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r2.ebuild ChangeLog
@ 2015-02-11 3:41 Patrick Lauer (patrick)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer (patrick) @ 2015-02-11 3:41 UTC (permalink / raw
To: gentoo-commits
patrick 15/02/11 03:41:40
Modified: qtsingleapplication-2.6.1_p20130904-r2.ebuild
ChangeLog
Log:
Whitespace
(Portage version: 2.2.16/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild?rev=1.2&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.1&r2=1.2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtsingleapplication-2.6.1_p20130904-r2.ebuild 2 Jan 2015 18:17:33 -0000 1.1
+++ qtsingleapplication-2.6.1_p20130904-r2.ebuild 11 Feb 2015 03:41:40 -0000 1.2
@@ -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.1 2015/01/02 18:17:33 kensington Exp $
+# $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 $
EAPI=5
@@ -20,7 +20,7 @@
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
- qt4? (
+ qt4? (
dev-qt/qtcore:4
X? ( dev-qt/qtgui:4 )
)
1.10 dev-qt/qtsingleapplication/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 2 Jan 2015 18:17:33 -0000 1.9
+++ ChangeLog 11 Feb 2015 03:41:40 -0000 1.10
@@ -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.9 2015/01/02 18:17:33 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.10 2015/02/11 03:41:40 patrick Exp $
+
+ 11 Feb 2015; Patrick Lauer <patrick@gentoo.org>
+ qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+ Whitespace
*qtsingleapplication-2.6.1_p20130904-r2 (02 Jan 2015)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r2.ebuild ChangeLog
@ 2015-02-18 18:20 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2015-02-18 18:20 UTC (permalink / raw
To: gentoo-commits
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 <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:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-18 18:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-18 18:20 [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r2.ebuild ChangeLog Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2015-02-11 3:41 Patrick Lauer (patrick)
2015-01-02 18:17 Michael Palimaka (kensington)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox