Compile tutorials and examples when doc is in USE.

Package-Manager: portage-2.0.51-r15

3 files changed, 43 insertions, 37 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 9de3e14a08c7..42e59fb2fa4e 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.202 2005/03/04 03:06:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.203 2005/03/04 13:32:14 greg_g Exp $
+
+  04 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> qt-3.3.4-r3.ebuild:
+  Compile tutorials and examples when doc is in USE.
 
 *qt-3.3.4-r3 (03 Mar 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 7db73a997676..6f90caa523ce 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,42 +1,42 @@
-MD5 9900a81004986cd256593b56ba16644e qt-3.3.4-r3.ebuild 8476
+MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
+MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
+MD5 4364378cd0ea9bfecc19ab5b3b29d198 qt-3.3.4-r3.ebuild 8594
+MD5 6f21c573a4b83d0f170f03bd2c59ed34 ChangeLog 34067
 MD5 048c159df273b9caf9ab683e542c3c4f qt-4.0.0_beta1-r3.ebuild 5840
 MD5 8b326b9cd9d7f99e5a1f7e185de2e837 qt-3.3.4-r2.ebuild 8344
-MD5 d6cddbb323e1bb3e8841cd56ccdf1646 ChangeLog 33942
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
-MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 bbc93b26dddb70c7709d8d579b489a4c files/digest-qt-4.0.0_beta1-r3 99
-MD5 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
 MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
+MD5 bbc93b26dddb70c7709d8d579b489a4c files/digest-qt-4.0.0_beta1-r3 99
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
diff --git a/x11-libs/qt/qt-3.3.4-r3.ebuild b/x11-libs/qt/qt-3.3.4-r3.ebuild
index 0de1ee6e6e71..ede90b679722 100644
--- a/x11-libs/qt/qt-3.3.4-r3.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r3.ebuild,v 1.1 2005/03/04 03:06:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r3.ebuild,v 1.2 2005/03/04 13:32:14 greg_g Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,7 +21,9 @@ KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc ~ia64 ~ppc ~alpha"
 IUSE="cups debug doc firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng media-libs/jpeg media-libs/libmng
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libmng
 	>=media-libs/freetype-2
 	nas? ( >=media-libs/nas-1.5 )
 	odbc? ( dev-db/unixODBC )
@@ -35,7 +37,6 @@ DEPEND="virtual/x11 virtual/xft
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
 QTBASE=/usr/qt/3
-export QTDIR=${S}
 
 pkg_setup() {
 	if use immqt ; then
@@ -46,11 +47,15 @@ pkg_setup() {
 		ewarn
 	fi
 
+	export QTDIR=${S}
+
 	if useq ppc-macos ; then
 		export PLATFORM=darwin-g++
 		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
 		export INSTALL_ROOT=""
 	else
+		# probably this should be 'linux-g++-64' for 64bit archs
+		# in a fully multilib environment (no compatibility symlinks)
 		export PLATFORM=linux-g++
 	fi
 }
@@ -58,7 +63,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	export QTDIR=${S}
 	cd ${S}
 
 	cp configure configure.orig
@@ -99,13 +103,12 @@ src_unpack() {
 }
 
 src_compile() {
-	export QTDIR=${S}
 	export SYSCONF=${D}${QTBASE}/etc/settings
 
 	# Let's just allow writing to these directories during Qt emerge
 	# as it makes Qt much happier.
 	addwrite "${QTBASE}/etc/settings"
-	addwrite "$HOME/.qt"
+	addwrite "${HOME}/.qt"
 
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
@@ -138,18 +141,18 @@ src_compile() {
 		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
 		-fast ${myconf} -dlopen-opengl || die
 
-	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src || die
 	DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \
 	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
+
+	if use doc; then
+		emake sub-tutorial sub-examples || die
+	fi
 }
 
 src_install() {
-	export QTDIR=${S}
-
 	# binaries
-	into $QTBASE
+	into ${QTBASE}
 	dobin bin/*
 
 	# libraries