[gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/

[Davide Pesavento]

commit:     553d44ebef8a9221f9717216a34c30de5730e94c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 18:26:06 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 18:26:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=553d44eb

[dev-qt/qthelp] Sync with portage.

Package-Manager: portage-2.2.0_alpha190

---
 dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch   | 123 ----------------------
 dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch |  21 ++++
 dev-qt/qthelp/qthelp-4.8.9999.ebuild              |  12 ++-
 3 files changed, 31 insertions(+), 125 deletions(-)

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 1c28c15..0000000
--- 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.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
new file mode 100644
index 0000000..cc76219
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
@@ -0,0 +1,21 @@
+--- 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 \

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 0ee9df7..4749453 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -26,6 +26,10 @@ DEPEND="
 	~dev-qt/qtcore-${PV}[aqua=,debug=]
 	~dev-qt/qtgui-${PV}[aqua=,debug=]
 	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+	compat? (
+		~dev-qt/qtdbus-${PV}[aqua=,debug=]
+		sys-libs/zlib
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -45,6 +49,10 @@ pkg_setup() {
 		src
 		tools"
 
+	use compat && QT4_TARGET_DIRECTORIES+="
+		tools/assistant/compat
+		tools/assistant/compat/lib"
+
 	qt4-build_pkg_setup
 }
 
@@ -65,7 +73,7 @@ src_unpack() {
 src_prepare() {
 	qt4-build_src_prepare
 
-	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+	use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
 
 	# bug 348034
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
@@ -77,7 +85,7 @@ src_configure() {
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
 		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
 		-no-multimedia -no-opengl -no-phonon -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-dbus -no-cups -no-nis -fontconfig"
+		-no-nas-sound -no-cups -no-nis -fontconfig"
 
 	qt4-build_src_configure
 }