[gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.6.1.ebuild ChangeLog

[Ben de Groot (yngwin)]

yngwin      10/02/10 20:11:57

  Modified:             qt-gui-4.6.1.ebuild ChangeLog
  Log:
  Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on Darwin (bug 302391).
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  x11-libs/qt-gui/qt-gui-4.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild?r1=1.5&r2=1.6

Index: qt-gui-4.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-gui-4.6.1.ebuild	23 Jan 2010 15:50:24 -0000	1.5
+++ qt-gui-4.6.1.ebuild	10 Feb 2010 20:11:56 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild,v 1.5 2010/01/23 15:50:24 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild,v 1.6 2010/02/10 20:11:56 yngwin Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -47,26 +47,23 @@
 	fi
 
 	confutils_use_depend_all gtk glib
-	qt4-build_pkg_setup
-}
 
-src_unpack() {
-QT4_TARGET_DIRECTORIES="
-src/gui
-src/scripttools
-tools/designer
-tools/linguist/linguist
-src/plugins/imageformats/gif
-src/plugins/imageformats/ico
-src/plugins/imageformats/jpeg
-src/plugins/inputmethods"
-
-QT4_EXTRACT_DIRECTORIES="
-include
-src
-tools/linguist/phrasebooks
-tools/linguist/shared
-tools/shared"
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		tools/designer
+		tools/linguist/linguist
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
 
 	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
 	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
@@ -74,7 +71,7 @@
 	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
 
-	qt4-build_src_unpack
+	qt4-build_pkg_setup
 }
 
 src_prepare() {



1.97                 x11-libs/qt-gui/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog	9 Feb 2010 21:05:57 -0000	1.96
+++ ChangeLog	10 Feb 2010 20:11:56 -0000	1.97
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.96 2010/02/09 21:05:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.97 2010/02/10 20:11:56 yngwin Exp $
+
+  10 Feb 2010; Ben de Groot <yngwin@g.o> qt-gui-4.6.1.ebuild:
+  Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on
+  Darwin (bug 302391).
 
   09 Feb 2010; Dror Levin <spatz@g.o> -qt-gui-4.6.0-r2.ebuild:
   Remove old.