pesa        15/06/29 17:41:16

  Modified:             qtsingleapplication-2.6.1_p20130904-r1.ebuild
                        ChangeLog
  Added:                qtsingleapplication-2.6.1_p20150629.ebuild
  Removed:              qtsingleapplication-2.6.1_p20130904-r4.ebuild
  Log:
  New snapshot. Fixes bug #549170.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.8                  
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.8&view=markup
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
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

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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qtsingleapplication-2.6.1_p20130904-r1.ebuild       16 May 2015 11:19:27 
-0000      1.7
+++ qtsingleapplication-2.6.1_p20130904-r1.ebuild       29 Jun 2015 17:41:16 
-0000      1.8
@@ -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.7 2015/05/16 11:19:27 pacho Exp $
+# $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 $
 
 EAPI=5
 
@@ -9,7 +9,7 @@
 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";
+HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/";
 SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz";
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"



1.19                 dev-qt/qtsingleapplication/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.19&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?rev=1.19&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog   16 May 2015 11:19:27 -0000      1.18
+++ ChangeLog   29 Jun 2015 17:41:16 -0000      1.19
@@ -1,6 +1,14 @@
 # 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.18 
2015/05/16 11:19:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.19 
2015/06/29 17:41:16 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20150629 (29 Jun 2015)
+
+  29 Jun 2015; Davide Pesavento <[email protected]>
+  +qtsingleapplication-2.6.1_p20150629.ebuild,
+  -qtsingleapplication-2.6.1_p20130904-r4.ebuild,
+  qtsingleapplication-2.6.1_p20130904-r1.ebuild:
+  New snapshot. Fixes bug #549170.
 
   16 May 2015; Pacho Ramos <[email protected]>
   qtsingleapplication-2.6.1_p20130904-r1.ebuild:



1.1                  
dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild?rev=1.1&view=markup
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

Index: qtsingleapplication-2.6.1_p20150629.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_p20150629.ebuild,v
 1.1 2015/06/29 17:41:16 pesa Exp $

EAPI=5

inherit multibuild qmake-utils

MY_P=qt-solutions-${PV#*_p}

DESCRIPTION="Qt library to start applications only once per user"
HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/";
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="
        dev-qt/qtlockedfile[qt4?,qt5?]
        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
                )
        )
"
RDEPEND="${DEPEND}"

S=${WORKDIR}/${MY_P}/${PN}

pkg_setup() {
        MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
}

src_prepare() {
        epatch "${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch"
        epatch "${FILESDIR}/2.6.1_p20130904-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() {
                # 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
}




Reply via email to