Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication: qtsingleapplication-2.6.1_p20150629.ebuild qtsingleapplication-2.6.1_p20130904-r1.ebuild ChangeLog qtsingleapplication-2.6.1_p20130904-r4.ebuild
Date: Mon, 29 Jun 2015 17:41:38
Message-Id: 20150629174116.7D3F6739@oystercatcher.gentoo.org
1 pesa 15/06/29 17:41:16
2
3 Modified: qtsingleapplication-2.6.1_p20130904-r1.ebuild
4 ChangeLog
5 Added: qtsingleapplication-2.6.1_p20150629.ebuild
6 Removed: qtsingleapplication-2.6.1_p20130904-r4.ebuild
7 Log:
8 New snapshot. Fixes bug #549170.
9
10 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
11
12 Revision Changes Path
13 1.8 dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?rev=1.8&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?rev=1.8&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?r1=1.7&r2=1.8
18
19 Index: qtsingleapplication-2.6.1_p20130904-r1.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v
22 retrieving revision 1.7
23 retrieving revision 1.8
24 diff -u -r1.7 -r1.8
25 --- qtsingleapplication-2.6.1_p20130904-r1.ebuild 16 May 2015 11:19:27 -0000 1.7
26 +++ qtsingleapplication-2.6.1_p20130904-r1.ebuild 29 Jun 2015 17:41:16 -0000 1.8
27 @@ -1,6 +1,6 @@
28 # Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v 1.7 2015/05/16 11:19:27 pacho Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v 1.8 2015/06/29 17:41:16 pesa Exp $
32
33 EAPI=5
34
35 @@ -9,7 +9,7 @@
36 MY_P=qt-solutions-${PV#*_p}
37
38 DESCRIPTION="Qt library to start applications only once per user"
39 -HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
40 +HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
41 SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
42
43 LICENSE="|| ( LGPL-2.1 GPL-3 )"
44
45
46
47 1.19 dev-qt/qtsingleapplication/ChangeLog
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.19&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.19&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.18&r2=1.19
52
53 Index: ChangeLog
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
56 retrieving revision 1.18
57 retrieving revision 1.19
58 diff -u -r1.18 -r1.19
59 --- ChangeLog 16 May 2015 11:19:27 -0000 1.18
60 +++ ChangeLog 29 Jun 2015 17:41:16 -0000 1.19
61 @@ -1,6 +1,14 @@
62 # ChangeLog for dev-qt/qtsingleapplication
63 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
64 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.18 2015/05/16 11:19:27 pacho Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.19 2015/06/29 17:41:16 pesa Exp $
66 +
67 +*qtsingleapplication-2.6.1_p20150629 (29 Jun 2015)
68 +
69 + 29 Jun 2015; Davide Pesavento <pesa@g.o>
70 + +qtsingleapplication-2.6.1_p20150629.ebuild,
71 + -qtsingleapplication-2.6.1_p20130904-r4.ebuild,
72 + qtsingleapplication-2.6.1_p20130904-r1.ebuild:
73 + New snapshot. Fixes bug #549170.
74
75 16 May 2015; Pacho Ramos <pacho@g.o>
76 qtsingleapplication-2.6.1_p20130904-r1.ebuild:
77
78
79
80 1.1 dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild?rev=1.1&content-type=text/plain
84
85 Index: qtsingleapplication-2.6.1_p20150629.ebuild
86 ===================================================================
87 # Copyright 1999-2015 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild,v 1.1 2015/06/29 17:41:16 pesa Exp $
90
91 EAPI=5
92
93 inherit multibuild qmake-utils
94
95 MY_P=qt-solutions-${PV#*_p}
96
97 DESCRIPTION="Qt library to start applications only once per user"
98 HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
99 SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
100
101 LICENSE="|| ( LGPL-2.1 GPL-3 )"
102 SLOT="0"
103 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
104 IUSE="doc +qt4 qt5 X"
105
106 REQUIRED_USE="|| ( qt4 qt5 )"
107
108 DEPEND="
109 dev-qt/qtlockedfile[qt4?,qt5?]
110 qt4? (
111 dev-qt/qtcore:4
112 X? ( dev-qt/qtgui:4 )
113 )
114 qt5? (
115 dev-qt/qtcore:5
116 dev-qt/qtnetwork:5
117 X? (
118 dev-qt/qtgui:5
119 dev-qt/qtwidgets:5
120 )
121 )
122 "
123 RDEPEND="${DEPEND}"
124
125 S=${WORKDIR}/${MY_P}/${PN}
126
127 pkg_setup() {
128 MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
129 }
130
131 src_prepare() {
132 epatch "${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch"
133 epatch "${FILESDIR}/2.6.1_p20130904-no-gui.patch"
134
135 echo 'SOLUTIONS_LIBRARY = yes' > config.pri
136 use X || echo 'QTSA_NO_GUI = yes' >> config.pri
137
138 sed -i -e "s/-head/-${PV%.*}/" common.pri || die
139 sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
140
141 # to ensure unbundling
142 rm -f src/qtlockedfile*
143
144 multibuild_copy_sources
145 }
146
147 src_configure() {
148 myconfigure() {
149 if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
150 eqmake4
151 fi
152 if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
153 eqmake5
154 fi
155 }
156 multibuild_foreach_variant run_in_build_dir myconfigure
157 }
158
159 src_compile() {
160 multibuild_foreach_variant run_in_build_dir default
161 }
162
163 src_install() {
164 dodoc README.TXT
165 use doc && dodoc -r doc/html
166
167 myinstall() {
168 # libraries
169 dolib.so lib/*
170
171 # headers
172 insinto "$(${MULTIBUILD_VARIANT}_get_headerdir)"/QtSolutions
173 doins src/qtsinglecoreapplication.h
174 use X && doins src/{QtSingleApplication,${PN}.h}
175
176 # .prf files
177 insinto "$(${MULTIBUILD_VARIANT}_get_mkspecsdir)"/features
178 doins "${FILESDIR}"/qtsinglecoreapplication.prf
179 use X && doins "${FILESDIR}"/${PN}.prf
180 }
181 multibuild_foreach_variant run_in_build_dir myinstall
182 }