Install qdoc3 when doc use flag is enabled

gentoo-qt · Feb 6, 2009 · c30f3da · c30f3da
1 parent f369977
commit c30f3da
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
+  qt-core-4.5.0_beta1.ebuild, qt-core-4.5.0_rc1.ebuild,
+  qt-core-4.9999.ebuild:
+  Build qdoc3 when doc flag is enabled
+
   06 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
   qt-core-4.5.0_beta1.ebuild, qt-core-4.5.0_rc1.ebuild,
   qt-core-4.9999.ebuild:

diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
@@ -4,8 +4,8 @@ AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff3725
 DIST qt-x11-opensource-src-4.5.0-beta1.tar.bz2 109457534 RMD160 c588629b432286d765952a407a6a9d4e2945fc0f SHA1 d66c559cc2bb3957ac75e49b220870a3a76b1c24 SHA256 265c4c92d38c7b966d4bc2b4aff97a5ed16d4a4b914a7c37acbf127e8cf24800
 DIST qt-x11-opensource-src-4.5.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f55863543fcd4dd3a8105864ec1 SHA1 1dffebc52543ee8dd486ec69fc51d02e216323bd SHA256 94aa6268662a24cec1a20e2fb88fcac418101719c0e1ab2729289fd8b7d475d7
 EBUILD qt-core-4.4.9999.ebuild 5147 RMD160 bec71886653aee50bbc4ed473ceb162ee2dae18e SHA1 9951c24881b9f9ed50de8584471e3d3758e71b66 SHA256 597c9c7ed25ec3145fd474247f36d48e5994e1698a845886d640dab85775e9e1
-EBUILD qt-core-4.5.0_beta1.ebuild 5613 RMD160 a7b2a3d58819581a803c85242670fbcbdacefae0 SHA1 25a7ef7bdd4229b26b4537904f887ae60e159306 SHA256 8f6c87dfe51d8f817b835dd9b46c3758a8c6c5023e62e4acb93b9c83a5f4829c
-EBUILD qt-core-4.5.0_rc1.ebuild 5602 RMD160 6daf83c52833695812f0a6b6ce1861983194c5eb SHA1 8885f703d14921e59caa97af6d928e8a18e04de6 SHA256 ef6831e1f3c47f54950231b0cc70fb71c2b89f4a2377829efdf6c6e2554daaf3
-EBUILD qt-core-4.9999.ebuild 5298 RMD160 1f9e3c66f269152f4523afeee81a2b915878a33b SHA1 e3883eddf25aba4262283aca9fad4a4447e10bf2 SHA256 4be4ebcd1cf111167b59a36ec24796236b48e2593d62e76e633b4070a80fd753
-MISC ChangeLog 2239 RMD160 71094c80fbf924ced978b66c250a85fd6265dd10 SHA1 c16edd39e5a61227024e5b0ba5533fb72995c186 SHA256 0f80e058126d77bf2f2256761b9cf8e2ba345f0a12cdbfe7d8ade67ff1a88e7d
+EBUILD qt-core-4.5.0_beta1.ebuild 5618 RMD160 d2ee9e1a471a0e47481cc561c54644c063ceadff SHA1 005cd563f5a3110bcd00336e747baed4e55f8031 SHA256 410c9bcdb2bba13c3af810ac168578401ac6002f521f362eedfbf1cd36431631
+EBUILD qt-core-4.5.0_rc1.ebuild 5603 RMD160 bf6527365cc87927e49bd6d1f2229dd5c013fc8f SHA1 df8a281f2090e6184c8d4ec9026ce813a91faf5a SHA256 a9080e26dd3b9ab2f6412ad488a0b6216b7cbc7edbd62d574bb313f67d88a85a
+EBUILD qt-core-4.9999.ebuild 5299 RMD160 b010a01637056907083b0fcece754ecd0aac7650 SHA1 2136eb7173e378146601780562f272d415c387ba SHA256 5ac7871b8f37141d568eb4821a3c1045e533b76a927240b78735026aede79237
+MISC ChangeLog 2413 RMD160 2053842d48137e08b5937bc22b0bcfd521b3501b SHA1 4bd21db8ff2fece105465333e26190e26720a926 SHA256 0586c2c03f093fc5ce598174a1a07b3ad2cbf7c4d80eee9ef4b7b478b6404840
 MISC metadata.xml 405 RMD160 7ad4cec9a392e8164062dae2935e2c59ba52b503 SHA1 104a2a88f1cf174e9e4827b639a73d79bd0fba2d SHA256 cce5d387ade0a1412bf70c58c7b0ab28fd488cc60e458ac66296ee632d893bf8
diff --git a/x11-libs/qt-core/qt-core-4.5.0_beta1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_beta1.ebuild
@@ -140,15 +140,15 @@ src_configure() {
 
 src_install() {
 	dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
-	# install qdoc3. Required at least for qt-creator package
-	dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
 
 	install_directories src/{corelib,xml,network,plugins/codecs}
 
 	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
 
 	if use doc; then
 		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed."
+		# install qdoc3. Required at least for qt-creator package
+	    dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
 	fi
 
 	emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"

diff --git a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
@@ -138,16 +138,15 @@ src_configure() {
 
 src_install() {
 	dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
-	# install qdoc3. Required at least for qt-creator package
-	dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
-
 
 	install_directories src/{corelib,xml,network,plugins/codecs}
 
 	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
 
 	if use doc; then
 		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed."
+		# install qdoc3. Required at least for qt-creator package
+		dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
 	fi
 
 	emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"

diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
@@ -126,7 +126,6 @@ src_compile() {
 
 src_install() {
 	dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
-	dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
 
 	install_directories src/{corelib,xml,network,plugins/codecs}
 
@@ -137,6 +136,7 @@ src_install() {
 		# due to unknown reason, make install_htmldocs fail
 		# insinto ${QTDOCDIR} || die "insinto html docs failed"
 		# doins -r ${S}/doc/html/ || die "doins html docs failed"
+		dobin ${S}/tools/qdoc3/qdoc3 || die "dobin failed"
 	fi
 
 	emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"