summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-12-29 13:34:40 +0000
committerMichael Palimaka <kensington@gentoo.org>2012-12-29 13:34:40 +0000
commit841c4318ecc789f7f8ace207caf457df27c762ec (patch)
tree07105bcdacab6497f799c023ae829a98968b073b /x11-libs/qt-assistant
parentVersion bump (diff)
downloadgentoo-2-841c4318ecc789f7f8ace207caf457df27c762ec.tar.gz
gentoo-2-841c4318ecc789f7f8ace207caf457df27c762ec.tar.bz2
gentoo-2-841c4318ecc789f7f8ace207caf457df27c762ec.zip
Remove old.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'x11-libs/qt-assistant')
-rw-r--r--x11-libs/qt-assistant/ChangeLog8
-rw-r--r--x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch50
-rw-r--r--x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild124
-rw-r--r--x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild125
-rw-r--r--x11-libs/qt-assistant/qt-assistant-4.8.2-r1.ebuild135
-rw-r--r--x11-libs/qt-assistant/qt-assistant-4.8.3.ebuild134
6 files changed, 7 insertions, 569 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 6441bb367fb4..2bd55df3983c 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.162 2012/12/29 08:44:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.163 2012/12/29 13:34:40 kensington Exp $
+
+ 29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+ -files/4.8.2-qatomic-x32.patch, -qt-assistant-4.7.4.ebuild,
+ -qt-assistant-4.8.1-r1.ebuild, -qt-assistant-4.8.2-r1.ebuild,
+ -qt-assistant-4.8.3.ebuild:
+ Remove old.
29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-assistant-4.8.4.ebuild:
Stable for alpha, wrt bug #445956
diff --git a/x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch
deleted file mode 100644
index 5f352b1acc83..000000000000
--- a/x11-libs/qt-assistant/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-assistant/qt-assistant-4.7.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
deleted file mode 100644
index 68ee25b96693..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
+++ /dev/null
@@ -1,124 +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-assistant/qt-assistant-4.7.4.ebuild,v 1.7 2012/05/21 19:54:06 ssuominen Exp $
-
-EAPI="3"
-inherit eutils qt4-build
-
-DESCRIPTION="The assistant help module for the Qt toolkit"
-SRC_URI+="
- compat? (
- ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
- http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
- )"
-
-SLOT="4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-macos"
-IUSE="compat doc +glib qt3support trace"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
- ~x11-libs/qt-webkit-${PV}[aqua=,debug=]
- ~x11-libs/qt-declarative-${PV}[debug=,qt3support=]"
-RDEPEND="${DEPEND}"
-
-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="${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://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-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 348034
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
- myconf="${myconf} -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 -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)"
- ! use glib && myconf="${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
- cd "${S}"
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
- emake qch_docs || die "emake qch_docs failed"
- if use doc; then
- emake docs || die "emake docs failed"
- fi
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-}
-
-src_install() {
- qt4-build_src_install
- cd "${S}"
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs \
- || die "failed to install htmldocs"
- fi
- dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
- # install correct assistant icon, bug 241208
- dodir /usr/share/pixmaps/ || die "dodir failed"
- insinto /usr/share/pixmaps/
- doins tools/assistant/tools/assistant/images/assistant.png ||
- die "doins failed"
- # Note: absolute image path required here!
- make_desktop_entry "${EPREFIX}"/usr/bin/assistant Assistant \
- "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' ||
- die "make_desktop_entry failed"
-
- if use compat; then
- insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
- doins tools/assistant/compat/features/assistant.prf || die "doins failed"
- fi
-}
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild
deleted file mode 100644
index d4e1f6b2343c..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,125 +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-assistant/qt-assistant-4.8.1-r1.ebuild,v 1.11 2012/07/08 17:44:54 armin76 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/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
- http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
- )"
-
-SLOT="4"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="compat doc +glib qt3support trace webkit"
-
-DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
-"
-RDEPEND="${DEPEND}"
-
-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://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-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
- else
- 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
-}
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.2-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.2-r1.ebuild
deleted file mode 100644
index 667a94e05f64..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,135 +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-assistant/qt-assistant-4.8.2-r1.ebuild,v 1.7 2012/10/14 17:16:25 armin76 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/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
- http://dev.gentoo.org/~pesa/distfiles/${PN}-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 ~ppc-macos ~x64-macos"
-fi
-IUSE="compat doc +glib qt3support trace webkit"
-
-DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PV}-qatomic-x32.patch"
- "${FILESDIR}/${P}+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://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-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
-}
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.3.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.3.ebuild
deleted file mode 100644
index 81820e0bdee8..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.8.3.ebuild
+++ /dev/null
@@ -1,134 +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-assistant/qt-assistant-4.8.3.ebuild,v 1.3 2012/09/16 04:18:29 yngwin 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/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
- http://dev.gentoo.org/~pesa/distfiles/${PN}-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 ~ppc-macos ~x64-macos"
-fi
-IUSE="compat doc +glib qt3support trace webkit"
-
-DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${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://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-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
-}