[gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/

["Markos Chandras" <hwoarang@gentoo.org>]

commit:     02473e0882210a9e7df86f7cef3c6492f5530018
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:13:33 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:13:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=02473e08

x11-libs/qt-assistant: Remove obsolete patch. Does not apply to live ebuilds

---
 x11-libs/qt-assistant/Manifest                     |    5 +-
 .../files/qt-assistant-4.8.0-install-fix.patch     |   59 --------------------
 x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |    5 --
 x11-libs/qt-assistant/qt-assistant-4.9999.ebuild   |    5 --
 4 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index eda7e3b..98ba021 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,9 +1,8 @@
 AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc
 AUX qt-assistant-4.7-fix-compat.patch 2987 RMD160 1086b830699b5357388fa0c1b3633c6c4c3f6bd4 SHA1 63dd8200f0a4fcbd29356fbbc11de19f13a75ed2 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc
 AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580
-AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
 EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3
-EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
-EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6
+EBUILD qt-assistant-4.8.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb
+EBUILD qt-assistant-4.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb
 MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f

diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
deleted file mode 100644
index f18f45e..0000000
--- a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-fix qt-assistant-4.8.0 not installing
-
-gentoo bug #395067
-https://bugs.gentoo.org/show_bug.cgi?id=395067
-
---- doc/doc.pri.org
-+++ doc/doc.pri
-@@ -17,11 +17,6 @@
- COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt
- COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html
- 
--EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml
--DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml
--EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples
--DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos
--
- $$unixstyle {
-     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
- } else {
-@@ -30,18 +25,12 @@
-     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
-     COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
-     COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
--    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\")
--    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\")
--    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\")
--    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\")
- }
- ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
- QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
-                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
-                (cd $$QT_BUILD_TREE && \
-                     $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \
--                    $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \
--                    $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \
-                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
-                     $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
-                     $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
-@@ -85,14 +74,6 @@
- htmldocs.path = $$[QT_INSTALL_DOCS]
- htmldocs.CONFIG += no_check_exist directory
- 
--examplesmanifest.files = $$EXAMPLESMANIFEST
--examplesmanifest.path = $$[QT_INSTALL_EXAMPLES]
--examplesmanifest.CONFIG += no_check_exist directory
--
--demosmanifest.files = $$DEMOSMANIFEST
--demosmanifest.path = $$[QT_INSTALL_DEMOS]
--demosmanifest.CONFIG += no_check_exist directory
--
- qchdocs.files= $$QT_BUILD_TREE/doc/qch
- qchdocs.path = $$[QT_INSTALL_DOCS]
- qchdocs.CONFIG += no_check_exist directory
-@@ -104,4 +85,4 @@
- sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE))
- 
- QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP
--INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest
-+INSTALLS += htmldocs qchdocs docimages

diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index c16ab12..97ad1d2 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?
 	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	# bug 395067
-	"${FILESDIR}/${P}-install-fix.patch"
-)
-
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
 	# the assistant libraries. doc/qch/

diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
index c16ab12..97ad1d2 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?
 	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	# bug 395067
-	"${FILESDIR}/${P}-install-fix.patch"
-)
-
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
 	# the assistant libraries. doc/qch/