public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-02-01 20:56 Markos Chandras
  0 siblings, 0 replies; 12+ messages in thread
From: Markos Chandras @ 2012-02-01 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     25db785c67487d14bde6c9b0cb3512a6772650b9
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 20:55:44 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 20:55:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=25db785c

x11-lbs/qt-core: Use correct name for qurl patch

---
 x11-libs/qt-core/Manifest                |    4 ++--
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    2 +-
 x11-libs/qt-core/qt-core-4.9999.ebuild   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index ce1e8fa..d2d0138 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,5 +1,5 @@
 AUX qt-core-4.8.0-qurl-regression-fix.patch 742 RMD160 0fc99db2d43af1784c5dfcdf948915dc34749536 SHA1 44463c6f8faf5857d238778d0b57b12c36364096 SHA256 4a799c2948966a7c746e98e680db38fd05da8bf9fea581a1780ad3f94305f5dc
 EBUILD qt-core-4.7.9999.ebuild 4022 RMD160 fa68febaa31c0cce43b5c350d06459e2f38dfa9e SHA1 318ce1b9622e8054a8ca89c4c6b18cbc464135d5 SHA256 c60b5ceb76f8190464cf494aa7209666ec97a0a23693e8059de461766e2991a2
-EBUILD qt-core-4.8.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324
-EBUILD qt-core-4.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324
+EBUILD qt-core-4.8.9999.ebuild 4986 RMD160 2d437ba3a15e74048d76a6b39bb381bc1f12dae5 SHA1 c7ca0ba24a32211be7602f33b1b9f5ad82440c9a SHA256 0dd5074acb1ce93592caf04a46a33715aec368f8334a98e39dfcf1c6a00b79bf
+EBUILD qt-core-4.9999.ebuild 4986 RMD160 2d437ba3a15e74048d76a6b39bb381bc1f12dae5 SHA1 c7ca0ba24a32211be7602f33b1b9f5ad82440c9a SHA256 0dd5074acb1ce93592caf04a46a33715aec368f8334a98e39dfcf1c6a00b79bf
 MISC metadata.xml 803 RMD160 83aa032a8ce070f8cb633679563d4c9a501a0eda SHA1 332f440bedc7f39993f64d7d18508c6eac55cb08 SHA256 33c8d5ca13dfc9ea047db0078e8f9a9e4ecd47694a937f47f8f499df07428681

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 8d2099b..0c59c82 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-qurl-regression-fix.patch"
+	"${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch"
 )
 
 pkg_setup() {

diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
index 8d2099b..0c59c82 100644
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-qurl-regression-fix.patch"
+	"${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-05-20 19:40 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-05-20 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     16abdccea073699a49f79855d584a28b1a30b687
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun May 20 19:39:34 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 20 19:39:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=16abdcce

[x11-libs/qt-core] Introduce USE="icu".

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index edc937a..2341b70 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -13,11 +13,12 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="+glib iconv optimized-qmake qt3support ssl"
+IUSE="+glib iconv icu optimized-qmake qt3support ssl"
 
 DEPEND="
 	sys-libs/zlib
-	glib? ( dev-libs/glib )
+	glib? ( dev-libs/glib:2 )
+	icu? ( >=dev-libs/icu-49 )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/cairo-1.10.2-r2
 	!<x11-libs/qt-4.4.0:4
@@ -98,6 +99,7 @@ src_configure() {
 		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
 		$(qt_use glib)
 		$(qt_use iconv)
+		$(qt_use icu)
 		$(qt_use optimized-qmake)
 		$(qt_use ssl openssl)
 		$(qt_use qt3support)"



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-05-22 14:11 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-05-22 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     78b0c9299ff3a798ad42fab97f60a0abb7693b00
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue May 22 14:07:50 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 22 14:07:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=78b0c929

[x11-libs/qt-core] Updates for 4.8.2.

  * Pass -no-openvg to configure.
  * Link to openssl at build-time if USE=ssl is enabled, instead of
    relying on run-time loading.

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 2341b70..18b773a 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	icu? ( >=dev-libs/icu-49 )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/cairo-1.10.2-r2
-	!<x11-libs/qt-4.4.0:4
+	!x11-libs/qt:4
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
@@ -94,14 +94,14 @@ src_configure() {
 		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
 		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
 		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
 		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
 		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
 		$(qt_use glib)
 		$(qt_use iconv)
 		$(qt_use icu)
 		$(qt_use optimized-qmake)
-		$(qt_use ssl openssl)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
 		$(qt_use qt3support)"
 
 	qt4-build_src_configure



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-06-06 17:53 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-06-06 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     14884ae1aa26eb941ca4b2ddbe67f3326d1ed06d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jun  6 17:52:43 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 17:52:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=14884ae1

[x11-libs/qt-core] Add preliminary live ebuild for Qt5 core modules.

Includes libQt{Core,Network,Concurrent}, qmake, moc, rcc and qdoc.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-core/metadata.xml          |    1 +
 x11-libs/qt-core/qt-core-5.9999.ebuild |   57 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
index 476b591..a81a5bd 100644
--- a/x11-libs/qt-core/metadata.xml
+++ b/x11-libs/qt-core/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>qt</herd> 
 	<use>
 		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="c++11">Build Qt using the C++11 standard</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
new file mode 100644
index 0000000..0c9b04f
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="glib icu ssl"
+
+DEPEND="
+	>=dev-libs/libpcre-8.30[pcre16]
+	sys-libs/zlib
+	virtual/libiconv
+	glib? ( dev-libs/glib:2 )
+	icu? ( >=dev-libs/icu-49 )
+	ssl? ( dev-libs/openssl:0 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qdoc
+	src/corelib
+	src/network
+	src/concurrent
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use glib)
+		-iconv
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		-no-accessibility -no-gui -no-cups -no-dbus
+		-no-xcb -no-eglfs -no-directfb -no-opengl
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+	emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
+	popd >/dev/null || die
+}



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-06-07 13:42 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-06-07 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8af2d6af32f15222e8f5e50a91a70b1a98410d86
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  7 13:41:17 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 13:41:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8af2d6af

[qt-core:5] Enable USE=glib by default.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-core/qt-core-5.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index 0c9b04f..eb950f1 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="glib icu ssl"
+IUSE="+glib icu ssl"
 
 DEPEND="
 	>=dev-libs/libpcre-8.30[pcre16]



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-06-29  0:17 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-06-29  0:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e6ac10bed3d49a0d36c7f1083d78923d5818cc25
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 00:13:01 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 00:13:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6ac10be

[x11-libs/qt-core:5] Drop a few problematic parameters from myconf.

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-core/qt-core-5.9999.ebuild |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index 881e035..fe419b7 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -40,8 +40,7 @@ src_configure() {
 		$(qt_use glib)
 		-iconv
 		$(qt_use icu)
-		-no-accessibility -no-gui -no-cups -no-dbus
-		-no-xcb -no-eglfs -no-directfb -no-opengl
+		-no-xcb -no-eglfs -no-directfb
 	)
 	qt5-build_src_configure
 }



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-07-02 17:01 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-07-02 17:01 UTC (permalink / raw
  To: gentoo-commits

commit:     e766ed011023de58ac339838f1fc069a0a6ef697
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jul  2 16:59:52 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 16:59:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e766ed01

[x11-libs/qt-core:5] Add QCONFIG_{DEFINE,REMOVE}.

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-core/qt-core-5.9999.ebuild |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index fe419b7..7a5ec17 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -34,6 +34,14 @@ QT5_TARGET_SUBDIRS=(
 	src/corelib
 	src/concurrent
 )
+QCONFIG_DEFINE="QT_ZLIB"
+
+pkg_setup() {
+	QCONFIG_REMOVE="$(usev !glib)
+			$(usev !icu)"
+
+	qt5-build_pkg_setup
+}
 
 src_configure() {
 	local myconf=(



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-07-25 14:46 Michael Palimaka
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2012-07-25 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f6d5e4c8af8db3e84cac7cac719b8383c4247d64
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 14:05:08 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 14:05:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f6d5e4c8

[x11-libs/qt-core] More respect for *FLAGS.

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 18eb5d5..77229ec 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -87,6 +87,13 @@ src_prepare() {
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
 	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+
+	# bug #427782
+	sed -i -e "/^CPPFLAGS/s/-g//" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+		"${S}/configure" || die "sed configure setBootstrapVariable failed"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-09-22 12:01 Markos Chandras
  0 siblings, 0 replies; 12+ messages in thread
From: Markos Chandras @ 2012-09-22 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c9776a241534567058f045e4f175d1e2a130275d
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 10:26:01 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 10:26:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c9776a24

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

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 77229ec..242cd7b 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
 
-	# bug #427782
+	# bug 427782
 	sed -i -e "/^CPPFLAGS/s/-g//" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
 	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-11-27  9:21 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-11-27  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c6854cd8a6ccd392ac5d48ccc0788a21d7343d4b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Nov 27 09:19:21 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 09:19:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c6854cd8

[x11-libs/qt-core:4] Remove USE=optimized-qmake wrt bug 434780.

---
 x11-libs/qt-core/metadata.xml            |    1 -
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    3 +--
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
index eb61685..7d709fa 100644
--- a/x11-libs/qt-core/metadata.xml
+++ b/x11-libs/qt-core/metadata.xml
@@ -8,7 +8,6 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
-		<flag name="optimized-qmake">Enable qmake optimization</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 	</use>

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 242cd7b..f4e2ed6 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="+glib iconv icu optimized-qmake qt3support ssl"
+IUSE="+glib iconv icu qt3support ssl"
 
 DEPEND="
 	sys-libs/zlib
@@ -107,7 +107,6 @@ src_configure() {
 		$(qt_use glib)
 		$(qt_use iconv)
 		$(qt_use icu)
-		$(qt_use optimized-qmake)
 		$(use ssl && echo -openssl-linked || echo -no-openssl)
 		$(qt_use qt3support)"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2012-11-27  9:35 Davide Pesavento
  0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2012-11-27  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5b5b52df578d2b21d8d564fe73b576aeb0fc2b9f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Nov 27 09:34:32 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 09:34:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5b5b52df

[x11-libs/qt-core:4] Use prune_libtool_files().

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index f4e2ed6..a1e330d 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -171,7 +171,7 @@ src_install() {
 	install_qconfigs
 
 	# remove .la files
-	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
+	prune_libtool_files
 
 	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
@ 2013-01-03 15:57 Michael Palimaka
  0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2013-01-03 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7f4042df1a65eb87a17ae95f10cccfb92fe23563
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 15:53:37 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 15:53:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7f4042df

[x11-libs/qt-core] Use subslots for automatic icu rebuild.

Package-Manager: portage-2.1.11.38

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |    4 ++--
 x11-libs/qt-core/qt-core-5.0.0-r1.ebuild |    2 +-
 x11-libs/qt-core/qt-core-5.0.9999.ebuild |    2 +-
 x11-libs/qt-core/qt-core-5.9999.ebuild   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 4ad41b9..37baee3 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit qt4-build
 
@@ -18,7 +18,7 @@ IUSE="+glib iconv icu qt3support ssl"
 DEPEND="
 	sys-libs/zlib
 	glib? ( dev-libs/glib:2 )
-	icu? ( >=dev-libs/icu-49 )
+	icu? ( >=dev-libs/icu-49:= )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/cairo-1.10.2-r2
 	!x11-libs/qt:4

diff --git a/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild b/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
index 3d3efb3..0de31f7 100644
--- a/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
+++ b/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	glib? ( dev-libs/glib:2 )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/x11-libs/qt-core/qt-core-5.0.9999.ebuild b/x11-libs/qt-core/qt-core-5.0.9999.ebuild
index aab1d93..d6f9bd9 100644
--- a/x11-libs/qt-core/qt-core-5.0.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.0.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	glib? ( dev-libs/glib:2 )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index aab1d93..d6f9bd9 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	glib? ( dev-libs/glib:2 )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-01-03 15:57 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-03 15:57 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2012-11-27  9:35 Davide Pesavento
2012-11-27  9:21 Davide Pesavento
2012-09-22 12:01 Markos Chandras
2012-07-25 14:46 Michael Palimaka
2012-07-02 17:01 Davide Pesavento
2012-06-29  0:17 Davide Pesavento
2012-06-07 13:42 Davide Pesavento
2012-06-06 17:53 Davide Pesavento
2012-05-22 14:11 Davide Pesavento
2012-05-20 19:40 Davide Pesavento
2012-02-01 20:56 Markos Chandras

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