* [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r3.ebuild ChangeLog
@ 2015-05-10 15:41 Davide Pesavento (pesa)
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-10 15:41 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/10 15:41:54
Modified: qtsingleapplication-2.6.1_p20130904-r3.ebuild
ChangeLog
Log:
Use qmake-utils helper functions.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path
1.2 dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.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-r3.ebuild?r1=1.1&r2=1.2
Index: qtsingleapplication-2.6.1_p20130904-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtsingleapplication-2.6.1_p20130904-r3.ebuild 10 May 2015 14:16:36 -0000 1.1
+++ qtsingleapplication-2.6.1_p20130904-r3.ebuild 10 May 2015 15:41:54 -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-r3.ebuild,v 1.1 2015/05/10 14:16:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v 1.2 2015/05/10 15:41:54 pesa Exp $
EAPI=5
@@ -80,27 +80,18 @@
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}"/qtsinglecoreapplication.prf
- use X && doins "${FILESDIR}"/${PN}.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
- doins "${FILESDIR}"/qtsinglecoreapplication.prf
- use X && doins "${FILESDIR}"/${PN}.prf
- fi
-
+ # libraries
dolib.so lib/*
+
+ # headers
+ insinto "$(${MULTIBUILD_VARIANT}_get_headerdir)"/QtSolutions
+ doins src/qtsinglecoreapplication.h
+ use X && doins src/{QtSingleApplication,${PN}.h}
+
+ # .prf files
+ insinto "$(${MULTIBUILD_VARIANT}_get_mkspecsdir)"/features
+ doins "${FILESDIR}"/qtsinglecoreapplication.prf
+ use X && doins "${FILESDIR}"/${PN}.prf
}
multibuild_foreach_variant run_in_build_dir myinstall
1.15 dev-qt/qtsingleapplication/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 10 May 2015 14:16:36 -0000 1.14
+++ ChangeLog 10 May 2015 15:41:54 -0000 1.15
@@ -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.14 2015/05/10 14:16:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.15 2015/05/10 15:41:54 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <pesa@gentoo.org>
+ qtsingleapplication-2.6.1_p20130904-r3.ebuild:
+ Use qmake-utils helper functions.
*qtsingleapplication-2.6.1_p20130904-r3 (10 May 2015)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r3.ebuild ChangeLog
@ 2015-05-10 15:50 Davide Pesavento (pesa)
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-10 15:50 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/10 15:50:11
Modified: qtsingleapplication-2.6.1_p20130904-r3.ebuild
ChangeLog
Log:
Drop unused inherit.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path
1.3 dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.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-r3.ebuild?r1=1.2&r2=1.3
Index: qtsingleapplication-2.6.1_p20130904-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtsingleapplication-2.6.1_p20130904-r3.ebuild 10 May 2015 15:41:54 -0000 1.2
+++ qtsingleapplication-2.6.1_p20130904-r3.ebuild 10 May 2015 15:50:11 -0000 1.3
@@ -1,10 +1,10 @@
# 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-r3.ebuild,v 1.2 2015/05/10 15:41:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v 1.3 2015/05/10 15:50:11 pesa Exp $
EAPI=5
-inherit multibuild multilib qmake-utils
+inherit multibuild qmake-utils
MY_P=qt-solutions-${PV#*_p}
@@ -20,6 +20,7 @@
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
+ dev-qt/qtlockedfile[qt4?,qt5?]
qt4? (
dev-qt/qtcore:4
X? ( dev-qt/qtgui:4 )
@@ -32,7 +33,6 @@
dev-qt/qtwidgets:5
)
)
- dev-qt/qtlockedfile[qt4?,qt5?]
"
RDEPEND="${DEPEND}"
1.16 dev-qt/qtsingleapplication/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 10 May 2015 15:41:54 -0000 1.15
+++ ChangeLog 10 May 2015 15:50:11 -0000 1.16
@@ -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.15 2015/05/10 15:41:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.16 2015/05/10 15:50:11 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <pesa@gentoo.org>
+ qtsingleapplication-2.6.1_p20130904-r3.ebuild:
+ Drop unused inherit.
10 May 2015; Davide Pesavento <pesa@gentoo.org>
qtsingleapplication-2.6.1_p20130904-r3.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-10 15:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-10 15:50 [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20130904-r3.ebuild ChangeLog Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2015-05-10 15:41 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox