Cleanup.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 6 insertions, 65 deletions

diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog
index 323953bb1b42..5323aa668ac3 100644
--- a/dev-qt/qtscript/ChangeLog
+++ b/dev-qt/qtscript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtscript
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.13 2014/01/26 11:56:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.14 2014/01/26 18:06:28 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtscript-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtscript-4.8.5.ebuild:
   Stable for ia64, wrt bug #494728
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 93e5fd3f1e69..e3ba68900f83 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
-		<flag name="c++0x">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>
+			inside the event loop (recommended by upstream)</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtscript/qtscript-4.8.4.ebuild b/dev-qt/qtscript/qtscript-4.8.4.ebuild
deleted file mode 100644
index 27568664d47b..000000000000
--- a/dev-qt/qtscript/qtscript-4.8.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.4.ebuild,v 1.3 2013/04/08 15:18:21 pesa Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The QtScript 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="
-	~dev-qt/qtcore-${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 {} +
-}