kensington    15/01/02 16:51:33

  Modified:             ChangeLog
  Added:                qtlockedfile-2.4.1_p20130904-r1.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.11                 dev-qt/qtlockedfile/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   14 Jul 2014 11:52:44 -0000      1.10
+++ ChangeLog   2 Jan 2015 16:51:33 -0000       1.11
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtlockedfile
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.10 
2014/07/14 11:52:44 pesa Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.11 
2015/01/02 16:51:33 kensington Exp $
+
+*qtlockedfile-2.4.1_p20130904-r1 (02 Jan 2015)
+
+  02 Jan 2015; Michael Palimaka <[email protected]>
+  +files/qtlockedfile5.prf, +qtlockedfile-2.4.1_p20130904-r1.ebuild:
+  Add Qt 5 support wrt bug #534304.
 
   14 Jul 2014; Davide Pesavento <[email protected]>
   qtlockedfile-2.4.1_p20130904.ebuild:



1.1                  dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild?rev=1.1&content-type=text/plain

Index: qtlockedfile-2.4.1_p20130904-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v
 1.1 2015/01/02 16:51:33 kensington Exp $

EAPI=5

inherit multibuild multilib qmake-utils

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

DESCRIPTION="QFile extension with advisory locking functions"
HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtlockedfile/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"

REQUIRED_USE="|| ( qt4 qt5 )"

DEPEND="
        qt4? ( dev-qt/qtcore:4 )
        qt5? ( dev-qt/qtcore:5 )
"
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() {
        echo 'SOLUTIONS_LIBRARY = yes' > config.pri
        echo 'QT -= gui' >> src/qtlockedfile.pri

        sed -i -e "s/-head/-${PV%.*}/" common.pri || die
        sed -i -e '/SUBDIRS+=example/d' ${PN}.pro || die

        multibuild_copy_sources
}

src_configure() {
        myconfigure() {
                if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
                        eqmake4 buildlib/buildlib.pro
                fi
                if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
                        eqmake5 buildlib/buildlib.pro
                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/QtLockedFile src/${PN}.h

                        insinto /usr/share/qt4/mkspecs/features
                        doins "${FILESDIR}"/${PN}.prf
                fi

                if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
                        insinto /usr/include/qt5/QtSolutions
                        doins src/QtLockedFile src/${PN}.h

                        insinto /usr/$(get_libdir)/qt5/mkspecs/features
                        newins "${FILESDIR}"/${PN}5.prf ${PN}.prf
                fi

                dolib.so lib/*
        }

        multibuild_foreach_variant run_in_build_dir myinstall
}




Reply via email to