Version bump.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

5 files changed, 47 insertions, 21 deletions

diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index c45c600874d1..913aecd82e56 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.61 2010/02/09 21:08:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.62 2010/02/15 15:11:28 spatz Exp $
+
+*qt-script-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-script-4.6.1.ebuild, +qt-script-4.6.2.ebuild,
+  +files/qt-4.6-nolibx11.patch, -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-script-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-script/files/qt-4.6-nolibx11.diff b/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-script/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-script/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-script/qt-script-4.6.1.ebuild b/x11-libs/qt-script/qt-script-4.6.1.ebuild
index 9e19c114875e..058f58009afa 100644
--- a/x11-libs/qt-script/qt-script-4.6.1.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.1.ebuild
@@ -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-script/qt-script-4.6.1.ebuild,v 1.2 2010/01/20 12:34:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.1.ebuild,v 1.3 2010/02/15 15:11:28 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -23,7 +23,7 @@ src/3rdparty/javascriptcore/
 "
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-script/qt-script-4.6.2.ebuild b/x11-libs/qt-script/qt-script-4.6.2.ebuild
new file mode 100644
index 000000000000..c1c12e0c59e3
--- /dev/null
+++ b/x11-libs/qt-script/qt-script-4.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.2.ebuild,v 1.1 2010/02/15 15:11:28 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The ECMAScript module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="iconv"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/script/"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/Qt/
+include/QtCore/
+include/QtScript/
+src/corelib/
+src/3rdparty/javascriptcore/
+"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+src_configure() {
+	myconf="${myconf} $(qt_use iconv) -script -no-xkb  -no-fontconfig -no-xrender -no-xrandr
+		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
+		-no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle"
+	qt4-build_src_configure
+}