Cleanup.

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

6 files changed, 9 insertions, 306 deletions

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 8e90a8f290ba..f5a5d7acbf51 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.19 2014/01/26 11:55:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.20 2014/01/26 17:59:13 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -files/disable-webkit.patch,
+  -files/qthelp-4.7-fix-compat.patch, -files/qthelp-4.8.2+gcc-4.7.patch,
+  -qthelp-4.8.4.ebuild, metadata.xml:
+  Cleanup.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qthelp-4.8.5-r2.ebuild:
   Stable for ia64, wrt bug #494728
diff --git a/dev-qt/qthelp/files/disable-webkit.patch b/dev-qt/qthelp/files/disable-webkit.patch
deleted file mode 100644
index 61bca05148e5..000000000000
--- a/dev-qt/qthelp/files/disable-webkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
-+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
- TEMPLATE = app
- LANGUAGE = C++
- TARGET = assistant
--contains(QT_CONFIG, webkit):QT += webkit
- CONFIG += qt \
-     warn_on \
-     help
-@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
-     openpageswidget.cpp \
-     openpagesmanager.cpp \
-     openpagesswitcher.cpp
--contains(QT_CONFIG, webkit) {
--    SOURCES += helpviewer_qwv.cpp
--} else {
--    SOURCES += helpviewer_qtb.cpp
--}
-+
-+SOURCES += helpviewer_qtb.cpp
- 
- FORMS += bookmarkdialog.ui \
-     bookmarkmanagerwidget.ui \
\ No newline at end of file
diff --git a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch
deleted file mode 100644
index 1c28c151cfbd..000000000000
--- a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
---- tools/assistant/assistant.pro	2010-09-10 12:04:47.000000000 +0300
-+++ tools/assistant/assistant.pro	2010-06-02 05:03:09.000000000 +0300
-@@ -3,4 +3,6 @@
- 
- SUBDIRS += lib/fulltextsearch \
-            lib \
--           tools
-+           tools \
-+           compat \
-+           compat/lib \
-\ No newline at end of file
---- /dev/null
-+++ tools/assistant/compat/lib/QtAssistant/qassistantclient_global.h
-@@ -0,0 +1 @@
-+#include "../qassistantclient_global.h"
---- /dev/null	2010-09-28 21:07:22.854999850 +0300
-+++ tools/assistant/compat/assistant.pro	2010-06-02 05:03:09.000000000 +0300
-@@ -0,0 +1,84 @@
-+include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
-+
-+TEMPLATE = app
-+LANGUAGE = C++
-+TARGET = assistant_adp
-+
-+CONFIG += qt warn_on
-+
-+unix:contains(QT_CONFIG, dbus):QT += dbus
-+
-+build_all:!build_pass {
-+    CONFIG -= build_all
-+    CONFIG += release
-+}
-+QT += xml network
-+
-+PROJECTNAME = Assistant
-+DESTDIR = ../../../bin
-+
-+FORMS += helpdialog.ui \
-+        mainwindow.ui \
-+        tabbedbrowser.ui \
-+        topicchooser.ui
-+
-+SOURCES += main.cpp \
-+        helpwindow.cpp \
-+        topicchooser.cpp \
-+        docuparser.cpp \
-+        index.cpp \
-+        profile.cpp \
-+        config.cpp \
-+        helpdialog.cpp \
-+        mainwindow.cpp \
-+        tabbedbrowser.cpp \
-+        fontsettingsdialog.cpp
-+
-+HEADERS += helpwindow.h \
-+        topicchooser.h \
-+        docuparser.h \
-+        index.h \
-+        profile.h \
-+        helpdialog.h \
-+        mainwindow.h \
-+        tabbedbrowser.h \
-+        config.h \
-+        fontsettingsdialog.h
-+
-+RESOURCES += assistant.qrc
-+
-+contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-+DEFINES += QT_KEYWORDS
-+#DEFINES +=  QT_PALMTOPCENTER_DOCS
-+
-+win32 {
-+    !wince*:LIBS += -lshell32
-+    RC_FILE = assistant.rc
-+}
-+
-+mac {
-+    ICON = assistant.icns
-+    TARGET = Assistant_adp
-+    QMAKE_INFO_PLIST = Info_mac.plist
-+}
-+
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
-+TRANSLATIONS = assistant_de.ts
-+
-+unix:!contains(QT_CONFIG, zlib):LIBS += -lz
-+
-+contains(CONFIG, static): {
-+    win32 {
-+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
-+            QTPLUGIN += qjpeg
-+            DEFINES += USE_STATIC_JPEG_PLUGIN            
-+        }
-+    } else {
-+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.a) {
-+            QTPLUGIN += qjpeg
-+            DEFINES += USE_STATIC_JPEG_PLUGIN            
-+        }        
-+    }
-+}
diff --git a/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch b/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch
deleted file mode 100644
index 1cf70275f634..000000000000
--- a/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:02:37.539564947 +0200
-+++ tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:03:18.843561620 +0200
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
- 
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
- 
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 5269010b41c0..7e00496dedac 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -3,16 +3,10 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="c++0x">Build Qt using the C++11 standard</flag>
-		<flag name="compat">Build the extra compatibility layer required by a few packages,
-			see http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
+		<flag name="compat">Build the extra compatibility layer required by a few packages, see
+			http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</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>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
-		<flag name="trace">Build the 'qttracereplay' utility which is required to 
-			play drawings recorded with the trace graphicssystem</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/qthelp/qthelp-4.8.4.ebuild b/dev-qt/qthelp/qthelp-4.8.4.ebuild
deleted file mode 100644
index 4cf919c8a91e..000000000000
--- a/dev-qt/qthelp/qthelp-4.8.4.ebuild
+++ /dev/null
@@ -1,135 +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/qthelp/qthelp-4.8.4.ebuild,v 1.3 2013/06/17 16:09:59 bicatali Exp $
-
-EAPI=4
-
-inherit eutils qt4-build
-
-DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
-SRC_URI+="
-	compat? (
-		ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-		http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
-	)"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux"
-fi
-IUSE="compat doc +glib qt3support trace webkit"
-
-DEPEND="
-	~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,sqlite]
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-pkg_setup() {
-	# Pixeltool isn't really assistant related, but it relies on
-	# the assistant libraries.
-	QT4_TARGET_DIRECTORIES="
-		tools/assistant
-		tools/pixeltool
-		tools/qdoc3"
-	QT4_EXTRACT_DIRECTORIES="
-		tools
-		demos
-		examples
-		src
-		include
-		doc"
-
-	use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	# compat version
-	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-	if use compat; then
-		unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
-			qt-assistant-compat-headers-4.7.tar.gz
-		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
-			"${S}"/tools/assistant/compat || die
-		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
-	fi
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
-
-	# bug 401173
-	use webkit || epatch "${FILESDIR}"/disable-webkit.patch
-
-	# bug 348034
-	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
-	myconf+="
-		-no-xkb -no-fontconfig -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-multimedia -no-svg
-		$(qt_use qt3support) $(qt_use webkit)"
-	use glib || myconf+=" -no-glib"
-
-	qt4-build_src_configure
-}
-
-src_compile() {
-	# help libQtHelp find freshly built libQtCLucene (bug #289811)
-	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
-	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
-	qt4-build_src_compile
-
-	# ugly hack to build docs
-	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-
-	if use doc; then
-		emake docs
-	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
-		# live ebuild cannot build qch_docs, it will build them through emake docs
-		emake qch_docs
-	fi
-}
-
-src_install() {
-	qt4-build_src_install
-
-	emake INSTALL_ROOT="${D}" install_qchdocs
-
-	# do not compress .qch files
-	docompress -x "${QTDOCDIR}"/qch
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs
-	fi
-
-	doicon tools/assistant/tools/assistant/images/assistant.png
-	make_desktop_entry assistant Assistant assistant 'Qt;Development'
-
-	if use compat; then
-		insinto /usr/share/qt4/mkspecs/features
-		doins tools/assistant/compat/features/assistant.prf
-	fi
-}