Remove old.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

8 files changed, 7 insertions, 342 deletions

diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 40859b6dab51..ae3772435017 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.144 2012/12/29 08:47:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.145 2012/12/29 13:47:10 kensington Exp $
+
+  29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+  -files/4.8.2-javascriptcore-x32.patch, -files/4.8.2-qatomic-x32.patch,
+  -files/qt-script-4.8.1+gcc-4.7.patch, -qt-script-4.7.4.ebuild,
+  -qt-script-4.8.1.ebuild, -qt-script-4.8.2.ebuild, -qt-script-4.8.3.ebuild:
+  Remove old.
 
   29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-script-4.8.4.ebuild:
   Stable for alpha, wrt bug #445956
diff --git a/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch b/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch
deleted file mode 100644
index 35a157337cf9..000000000000
--- a/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
---- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:17:21.328043461 +0200
-+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:42:13.699386250 +0200
-@@ -884,7 +884,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch
deleted file mode 100644
index 5f352b1acc83..000000000000
--- a/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <davidepesa@gmail.com>
-Date: Thu, 14 Jun 2012 00:44:43 +0200
-Subject: [PATCH] Fix qatomic inline asm for x32 ABI.
-
-Drop the 'q' suffix from x86_64 asm instructions. It's not needed,
-because the assembler can automatically determine the proper size
-based on the target, and it is in fact causing compilation failures
-on x32.
-
-Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/arch/qatomic_x86_64.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h
-index c2627c8..dc78140 100644
---- a/src/corelib/arch/qatomic_x86_64.h
-+++ b/src/corelib/arch/qatomic_x86_64.h
-@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- {
-     unsigned char ret;
-     asm volatile("lock\n"
--                 "cmpxchgq %3,%2\n"
-+                 "cmpxchg %3,%2\n"
-                  "sete %1\n"
-                  : "=a" (newValue), "=qm" (ret), "+m" (_q_value)
-                  : "r" (newValue), "0" (expectedValue)
-@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
--    asm volatile("xchgq %0,%1"
-+    asm volatile("xchg %0,%1"
-                  : "=r" (newValue), "+m" (_q_value)
-                  : "0" (newValue)
-                  : "memory");
-@@ -192,7 +192,7 @@ template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
- {
-     asm volatile("lock\n"
--                 "xaddq %0,%1"
-+                 "xadd %0,%1"
-                  : "=r" (valueToAdd), "+m" (_q_value)
-                  : "0" (valueToAdd * sizeof(T))
-                  : "memory");
--- 
-1.7.10
-
diff --git a/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch b/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch
deleted file mode 100644
index e729f962265c..000000000000
--- a/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7ac8d8597db1f58b11338f91fb27f6ad8696b34b Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Fri, 23 Mar 2012 16:29:57 +0100
-Subject: [PATCH] gcc 4.7.0 compatibility fix for javascript
-
-taken from http://qt-project.org/forums/viewthread/15071
-
-Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d
-Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
-Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
----
- .../JavaScriptCore/runtime/JSGlobalObject.h        |    2 +-
- .../JavaScriptCore/runtime/JSStaticScopeObject.h   |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-index 7c20272..9eb86e7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-@@ -59,7 +59,7 @@ namespace JSC {
-     protected:
-         using JSVariableObject::JSVariableObjectData;
- 
--        struct JSGlobalObjectData : public JSVariableObjectData {
-+        struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
-             // We use an explicit destructor function pointer instead of a
-             // virtual destructor because we want to avoid adding a vtable
-             // pointer to this struct. Adding a vtable pointer would force the
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-index 2542878..3cb66a0 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-@@ -33,7 +33,7 @@ namespace JSC{
-     class JSStaticScopeObject : public JSVariableObject {
-     protected:
-         using JSVariableObject::JSVariableObjectData;
--        struct JSStaticScopeObjectData : public JSVariableObjectData {
-+        struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
-             JSStaticScopeObjectData()
-                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
-             {
--- 
-1.7.6
-
diff --git a/x11-libs/qt-script/qt-script-4.7.4.ebuild b/x11-libs/qt-script/qt-script-4.7.4.ebuild
deleted file mode 100644
index 8962a940208d..000000000000
--- a/x11-libs/qt-script/qt-script-4.7.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 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.7.4.ebuild,v 1.6 2012/05/14 21:48:44 pesa Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="iconv +jit private-headers"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/script/"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtScript/
-		src/3rdparty/javascriptcore/
-		src/corelib/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) $(qt_use jit javascript-jit) -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
-}
-
-src_install() {
-	qt4-build_src_install
-	#install private headers
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-		find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
-	fi
-}
diff --git a/x11-libs/qt-script/qt-script-4.8.1.ebuild b/x11-libs/qt-script/qt-script-4.8.1.ebuild
deleted file mode 100644
index 2f200212b524..000000000000
--- a/x11-libs/qt-script/qt-script-4.8.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 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.8.1.ebuild,v 1.11 2012/07/08 17:56:02 armin76 Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-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"
-IUSE="iconv +jit"
-
-DEPEND="
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}+gcc-4.7.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/script"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtScript
-		src/3rdparty/javascriptcore
-		src/corelib"
-
-	QCONFIG_ADD="script"
-	QCONFIG_DEFINE="QT_SCRIPT"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use iconv)
-		$(qt_use jit javascript-jit)
-		-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
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/x11-libs/qt-script/qt-script-4.8.2.ebuild b/x11-libs/qt-script/qt-script-4.8.2.ebuild
deleted file mode 100644
index 2305cabc97c0..000000000000
--- a/x11-libs/qt-script/qt-script-4.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 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.8.2.ebuild,v 1.11 2012/10/14 17:07:13 armin76 Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-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="iconv +jit"
-
-DEPEND="
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-javascriptcore-x32.patch"
-	"${FILESDIR}/${PV}-qatomic-x32.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/script"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtScript
-		src/3rdparty/javascriptcore
-		src/corelib"
-
-	QCONFIG_ADD="script"
-	QCONFIG_DEFINE="QT_SCRIPT"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use iconv)
-		$(qt_use jit javascript-jit)
-		-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
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/x11-libs/qt-script/qt-script-4.8.3.ebuild b/x11-libs/qt-script/qt-script-4.8.3.ebuild
deleted file mode 100644
index 20bcbdf7782b..000000000000
--- a/x11-libs/qt-script/qt-script-4.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 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.8.3.ebuild,v 1.3 2012/09/16 04:42:32 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-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="iconv +jit"
-
-DEPEND="
-	~x11-libs/qt-core-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/script"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtScript
-		src/3rdparty/javascriptcore
-		src/corelib"
-
-	QCONFIG_ADD="script"
-	QCONFIG_DEFINE="QT_SCRIPT"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use iconv)
-		$(qt_use jit javascript-jit)
-		-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
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}