[gentoo-commits] gentoo-x86 commit in x11-libs/qtscriptgenerator: qtscriptgenerator-0.2.0.ebuild ChangeLog

["Davide Pesavento (pesa)" <pesa@gentoo.org>]

pesa        15/06/22 14:33:49

  Modified:             qtscriptgenerator-0.2.0.ebuild ChangeLog
  Log:
  Switch to qmake-utils.eclass
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

Revision  Changes    Path
1.10                 x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild?r1=1.9&r2=1.10

Index: qtscriptgenerator-0.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qtscriptgenerator-0.2.0.ebuild	31 Dec 2014 13:43:43 -0000	1.9
+++ qtscriptgenerator-0.2.0.ebuild	22 Jun 2015 14:33:49 -0000	1.10
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.9 2014/12/31 13:43:43 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.10 2015/06/22 14:33:49 pesa Exp $
 
 EAPI=4
 
-MY_PN="${PN}-src"
-MY_P="${MY_PN}-${PV}"
+inherit eutils qmake-utils
 
-inherit eutils multilib qt4-r2
+MY_P=${PN}-src-${PV}
 
 DESCRIPTION="Tool for generating Qt bindings for Qt Script"
 HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
@@ -19,8 +18,9 @@
 IUSE="debug kde"
 
 DEPEND="
+	dev-qt/designer:4
 	dev-qt/qtcore:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
+	dev-qt/qtgui:4
 	dev-qt/qtopengl:4
 	!kde? ( || (
 		dev-qt/qtphonon:4
@@ -35,9 +35,7 @@
 "
 RDEPEND="${DEPEND}"
 
-PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns"
-
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# remove phonon
@@ -45,28 +43,27 @@
 	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
 
 	use arm && epatch "${FILESDIR}"/${P}-arm.patch
-
-	qt4-r2_src_prepare
 }
 
 src_configure() {
-	cd "${S}"/generator
+	cd "${S}"/generator || die
 	eqmake4 generator.pro
-	cd "${S}"/qtbindings
+
+	cd "${S}"/qtbindings || die
 	eqmake4 qtbindings.pro
 }
 
 src_compile() {
-	cd "${S}"/generator
+	cd "${S}"/generator || die
 	emake
-	./generator --include-paths="/usr/include/qt4/" || die "running generator failed"
+	./generator --include-paths="$(qt4_get_headerdir)" || die
 
-	cd "${S}"/qtbindings
+	cd "${S}"/qtbindings || die
 	emake
 }
 
 src_install() {
-	insinto /usr/$(get_libdir)/qt4/plugins/script/
+	insinto "$(qt4_get_libdir)"/plugins/script
 	insopts -m0755
-	doins -r "${S}"/plugins/script/*
+	doins "${S}"/plugins/script/*
 }



1.32                 x11-libs/qtscriptgenerator/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	31 Dec 2014 13:43:43 -0000	1.31
+++ ChangeLog	22 Jun 2015 14:33:49 -0000	1.32
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qtscriptgenerator
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.31 2014/12/31 13:43:43 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.32 2015/06/22 14:33:49 pesa Exp $
+
+  22 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  qtscriptgenerator-0.2.0.ebuild:
+  Switch to qmake-utils.eclass
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   qtscriptgenerator-0.2.0.ebuild: