pesa 15/05/10 14:16:36
Modified: qtsingleapplication-2.6.1_p20130904-r1.ebuild
ChangeLog
Added: qtsingleapplication-2.6.1_p20130904-r3.ebuild
Removed: qtsingleapplication-2.6.1_p20130904-r2.ebuild
Log:
Use improved .prf files from Fedora.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.6
dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild?r1=1.5&r2=1.6
Index: qtsingleapplication-2.6.1_p20130904-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qtsingleapplication-2.6.1_p20130904-r1.ebuild 2 Mar 2015 09:04:22
-0000 1.5
+++ qtsingleapplication-2.6.1_p20130904-r1.ebuild 10 May 2015 14:16:36
-0000 1.6
@@ -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-r1.ebuild,v
1.5 2015/03/02 09:04:22 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v
1.6 2015/05/10 14:16:36 pesa Exp $
EAPI=5
@@ -48,13 +48,13 @@
dodoc README.TXT
dolib.so lib/*
- insinto /usr/include/qt4/QtSolutions/
+ 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
+ insinto /usr/share/qt4/mkspecs/features
+ doins "${FILESDIR}"/qtsinglecoreapplication.prf
+ use X && doins "${FILESDIR}"/${PN}.prf
use doc && dohtml -r doc/html
}
1.14 dev-qt/qtsingleapplication/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 2 Mar 2015 09:04:22 -0000 1.13
+++ ChangeLog 10 May 2015 14:16:36 -0000 1.14
@@ -1,6 +1,16 @@
# 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.13
2015/03/02 09:04:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.14
2015/05/10 14:16:36 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r3 (10 May 2015)
+
+ 10 May 2015; Davide Pesavento <[email protected]>
+ +files/qtsinglecoreapplication.prf,
+ +qtsingleapplication-2.6.1_p20130904-r3.ebuild,
+ -files/qtsingleapplication5.prf,
+ -qtsingleapplication-2.6.1_p20130904-r2.ebuild,
files/qtsingleapplication.prf,
+ qtsingleapplication-2.6.1_p20130904-r1.ebuild:
+ Use improved .prf files from Fedora.
02 Mar 2015; Agostino Sarubbo <[email protected]>
qtsingleapplication-2.6.1_p20130904-r1.ebuild,
1.1
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.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild?rev=1.1&content-type=text/plain
Index: qtsingleapplication-2.6.1_p20130904-r3.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-r3.ebuild,v
1.1 2015/05/10 14:16:36 pesa 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 ~ppc ~ppc64 ~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=( $(usev qt4) $(usev qt5) )
}
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}"/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
dolib.so lib/*
}
multibuild_foreach_variant run_in_build_dir myinstall
}
