Fix bug #348034, patch by Michael (kensington).

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 39 insertions, 22 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 46fb55ad3a77..3377ccaa90cb 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,10 @@
 # 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.119 2012/01/29 23:22:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.120 2012/02/10 00:51:18 pesa Exp $
+
+  10 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt-assistant-4.7.4.ebuild,
+  qt-assistant-4.8.0.ebuild:
+  Fix bug #348034, patch by Michael (kensington).
 
   29 Jan 2012; Joseph Jezak <josejx@gentoo.org> qt-assistant-4.7.4.ebuild:
   Marked ppc ppc64 stable for bug #390963.
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 71bdd03a69f7..f65670ed3d6b 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc
 AUX qt-assistant-4.6.1-tools.patch 1295 RMD160 56bb84147cd6026a567cc5a355be4a8f048609c4 SHA1 c352cc869b252beb9241a26835b8e714911c0c09 SHA256 d41d566f76fe9184c4a1f055d08999946c4c820bb1a6ae391483f8f1f6be4494
@@ -17,14 +17,24 @@ EBUILD qt-assistant-4.6.2-r2.ebuild 2777 RMD160 dddad24b73c6f5062d1495d7ccba2528
 EBUILD qt-assistant-4.6.2.ebuild 2549 RMD160 88f29c069969d8901372d0481bd117c34d9d4d93 SHA1 8e614c96d31549654da6a06d172aced74aeb5bde SHA256 f6d2d35c74d9654a91c187e42c803664b34393004e628abeae4222dc05e35f17
 EBUILD qt-assistant-4.6.3.ebuild 2776 RMD160 167af12b5a95de475491ff2a338d8dc90646d19c SHA1 80aa16f9a5839a78a066b3ec1bd1dfed7a87a8d3 SHA256 d33b737fdff42548eff3f930e64ad93eae4f9d975e038d92d03b3afe6159476b
 EBUILD qt-assistant-4.7.2.ebuild 3750 RMD160 4f9256b6bb6dbf28bc2c668ef84d57974a0ebb0c SHA1 023d6d0ec7bfef5cd044c8fd58650ec535ebbc70 SHA256 3c7322b1ce6abd596fd0d780a457feca70c4f8f70091d17f27731dd1da5bf4df
-EBUILD qt-assistant-4.7.4.ebuild 3758 RMD160 dad3eef9270633941c5c4f4e89cf28b842a254fa SHA1 d937dcb3afbf9de63b08678d64f47ee77688e4e7 SHA256 e9d4674572b94a8eaf3dfa1670992ca9252bf6a7992083fb94339a4e71b9ec98
-EBUILD qt-assistant-4.8.0.ebuild 4564 RMD160 9d1e762ac56f0d1238cd3fc0a5096bd72d039539 SHA1 be4427e0200551613c7573074273a8a584fd8f5f SHA256 b63ed7dd36b6dd35b31031126f9ee7c74f1ff9c4fd5093806eba90dc576881cb
-MISC ChangeLog 16038 RMD160 4d5414ad37356ad297c97e0bab311ec0adb163a3 SHA1 1cb3f56d11e525aab97eb73c61c671f367c8c4e3 SHA256 19ae27715b8cace3268a438635b60b649038ba42ecb091c6e7b6127674c29732
+EBUILD qt-assistant-4.7.4.ebuild 3813 RMD160 0cf83c2e1d0ceee9fe7c6193df009b1a8f008357 SHA1 bfba88d3e2935f0a749439f4fc6109c58183dd3c SHA256 b93bc674d0bfae369453dcb3d009d0cbad63348681917fc322db79b480ac570c
+EBUILD qt-assistant-4.8.0.ebuild 4518 RMD160 c4944cf7c38ce4504d59b93211e213e02190f798 SHA1 358e6b8c5ffb78309f9693e9e56e32528823d34e SHA256 2bc0d0dd3d8bcbdeb55768b2aeeb028f5ce05bf3fd8f8eacbcd54171f76480bd
+MISC ChangeLog 16193 RMD160 14be946b3f7c283a2b1f32e4c52e4cdf990fb76c SHA1 e1b489ad1dac654d5c4bcd44fa0f9961fbff9d9e SHA256 b9f4be687a45b8b2818b2cae4d9ee101cdd28f08f9e8c5c380fd34edeba876d5
 MISC metadata.xml 1086 RMD160 ce6419ab9a7df55e05adca6403a728735e874524 SHA1 775beea724b2823361bc01c0b5569c6c24fc5cbf SHA256 72d77a6228a9010378d4f9eae1cbc0730d5c38e03754906a95d895947d5d574f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8l1L4ACgkQcsIHjyDViGRZRgCg2Z5xrBTrkUZFKNv0hoCqnxOp
-BrQAn0yMuan5rRV+81p5z48PIeueKJOY
-=i8c5
+iQIcBAEBCgAGBQJPNGoYAAoJENXLsxwXqFxyd8wP/3ZgzZTC6iPWnnt/fz7JEWjr
+oUqzZgIiMIcMqP1rHgfYYMSu3T56hMXKKcxYVyn6quAeK81p1or+e6jopj3x+OIX
+ix+x4iRfnUTyo8yL+J12eZoMquhvA6qL09Vh3EVtb41j8E3xGTXS1hcTTaCuNtPs
+d6qc4ziCFVAOicPfgX9K5CxW2y3SdpDVFVQUrkB5P+rIQ4/QEuKEx1eHp9LTpXBt
+DPXBJN47hl+wlWnvqWgIjSBPXZNcml8j9rSO0poXpxynE8qbOX7bkPkVviMDrPSF
+nt6hDWvPXPGmxLgHsAaqyii/3hZ89R2BzSR5sh5Kuss32xM7saWeTSyjcsCG4UB9
+f32gss9rZz69v7Vl3VmZnfA1aQOeF+NKnJr21KlJIQTyVI97pYqeyaKQ1i00hWdS
+Ruw2ssN91V+kgPTiv+/KRkjlCZXSGlh4xdY3+7QmSYp+iEdf5l2NERtJ+ic/MLuE
+DJ2s43YY/0GEhVHQzyzhYOMvruur2rXdBbzQdFVTON/eAmQG99D5O3VciUhnYufC
+nsx1XlWP4Xf9yvYU6xqhY37XY8DXHaPWFKqZWClJkX4Ovpkaul04OPWiEmwrBMRk
+g2INC+4shj1/DvfV9lxmXO5am8TueuXXZp5Zpa3g0RhGjIHrU2SbkPnzsXAQngig
+kedfbV9knSFV1B+bPhA2
+=AkvG
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
index 3814301480a3..4b2230c1ba02 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2012/01/29 23:22:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild,v 1.5 2012/02/10 00:51:18 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -55,9 +55,11 @@ src_unpack() {
 
 src_prepare() {
 	qt4-build_src_prepare
-	if use compat; then
-		epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
-	fi
+
+	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() {
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild
index 25bcefae316a..583e631b6ef7 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2012/01/29 16:59:14 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.0.ebuild,v 1.2 2012/02/10 00:51:18 pesa Exp $
 
 EAPI="3"
 if [[ ${PV} == 4*9999 ]]; then
@@ -69,13 +69,14 @@ src_unpack() {
 
 src_prepare() {
 	qt4-build${ECLASS}_src_prepare
-	if use compat; then
-		epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
-	fi
-	sed -e "s/\(sub-qdoc3\.depends =\).*/\1/" \
-		-i doc/doc.pri || die "patching qdoc3 depends failed"
+
+	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+
 	# bug 401173
-	! use webkit && epatch "${FILESDIR}"/disable-webkit.patch
+	use webkit || epatch "${FILESDIR}"/disable-webkit.patch
+
+	# bug 348034
+	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
 }
 
 src_configure() {
@@ -84,8 +85,8 @@ src_configure() {
 		-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)"
+		-no-fontconfig -no-multimedia -no-svg
+		$(qt_use qt3support) $(qt_use webkit)"
 	! use glib && myconf="${myconf} -no-glib"
 
 	qt4-build${ECLASS}_src_configure