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 <[email protected]>
+  +files/qtsingleapplication5.prf,
+  +qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+  Add Qt 5 support wrt bug #534304.
 
   14 Jul 2014; Davide Pesavento <[email protected]>
   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
}




Reply via email to