[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Markos Chandras" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/
Date: Sat,  3 Mar 2012 09:33:53 +0000 (UTC)	[thread overview]
Message-ID: <1330766787.2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f.hwoarang@gentoo> (raw)

commit:     2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 09:26:27 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 09:26:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2f5e6e58

x11-libs/qt-gui:Sync with portage ebuild

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |   25 ++++++++++++++-----------
 x11-libs/qt-gui/qt-gui-4.9999.ebuild   |   25 ++++++++++++++-----------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 6fee2ac..43f119b 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils confutils qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
@@ -103,11 +106,11 @@ pkg_setup() {
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
-	qt4-build-edge_src_prepare
+	qt4-build${QT_ECLASS}_src_prepare
 
 	# Don't build plugins this go around, because they depend on qt3support lib
 	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die
@@ -140,7 +143,7 @@ src_configure() {
 		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
 		-no-phonon -no-opengl"
 
-	qt4-build-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 
 	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
@@ -167,7 +170,7 @@ src_install() {
 			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
 			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
 
-	qt4-build-edge_src_install
+	qt4-build${QT_ECLASS}_src_install
 
 	# qt-creator
 	# some qt-creator headers are located
@@ -185,12 +188,12 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${D}/usr/share/qt4/graphicssystems/" || 
-		die "could not create ${D}/usr/share/qt4/graphicssystems/"
-	echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/raster"
-	touch "${D}/usr/share/qt4/graphicssystems/native" ||
-		die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
+	touch "${ED}/usr/share/qt4/graphicssystems/native" ||
+		die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
 
 	#install private headers
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then

diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index 6fee2ac..43f119b 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils confutils qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
@@ -103,11 +106,11 @@ pkg_setup() {
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
-	qt4-build-edge_src_prepare
+	qt4-build${QT_ECLASS}_src_prepare
 
 	# Don't build plugins this go around, because they depend on qt3support lib
 	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die
@@ -140,7 +143,7 @@ src_configure() {
 		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
 		-no-phonon -no-opengl"
 
-	qt4-build-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 
 	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
@@ -167,7 +170,7 @@ src_install() {
 			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
 			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
 
-	qt4-build-edge_src_install
+	qt4-build${QT_ECLASS}_src_install
 
 	# qt-creator
 	# some qt-creator headers are located
@@ -185,12 +188,12 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${D}/usr/share/qt4/graphicssystems/" || 
-		die "could not create ${D}/usr/share/qt4/graphicssystems/"
-	echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/raster"
-	touch "${D}/usr/share/qt4/graphicssystems/native" ||
-		die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
+	touch "${ED}/usr/share/qt4/graphicssystems/native" ||
+		die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
 
 	#install private headers
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then

next             reply	other threads:[~2012-03-03  9:34 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-03  9:33 Markos Chandras [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-02-22  8:40 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ Davide Pesavento
2013-02-13  8:38 Davide Pesavento
2013-01-29 18:04 Michael Palimaka
2013-01-26 11:24 Davide Pesavento
2013-01-25  9:07 Davide Pesavento
2013-01-02  1:15 Davide Pesavento
2012-12-23  3:35 Davide Pesavento
2012-12-10  8:35 Davide Pesavento
2012-11-14 10:28 Davide Pesavento
2012-09-19 23:23 Davide Pesavento
2012-09-03  8:11 Davide Pesavento
2012-08-28  3:06 Davide Pesavento
2012-08-12  9:27 Davide Pesavento
2012-07-23 18:10 Davide Pesavento
2012-07-22  2:20 Davide Pesavento
2012-07-13 11:19 Ben de Groot
2012-07-05 15:58 Davide Pesavento
2012-07-02 17:26 Davide Pesavento
2012-07-02 16:00 Davide Pesavento
2012-06-10 21:29 Davide Pesavento
2012-05-06 15:09 Davide Pesavento
2012-03-17 15:57 Michael Palimaka
2012-03-11 12:59 Markos Chandras
2012-02-12  9:17 Markos Chandras

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6fee2ac dfblob:43f119b dfblob:6fee2ac dfblob:43f119b )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330766787.2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f.hwoarang@gentoo \
    --to=hwoarang@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox