1 |
commit: 02473e0882210a9e7df86f7cef3c6492f5530018 |
2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 1 23:13:33 2012 +0000 |
4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 23:13:33 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=02473e08 |
7 |
|
8 |
x11-libs/qt-assistant: Remove obsolete patch. Does not apply to live ebuilds |
9 |
|
10 |
--- |
11 |
x11-libs/qt-assistant/Manifest | 5 +- |
12 |
.../files/qt-assistant-4.8.0-install-fix.patch | 59 -------------------- |
13 |
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 5 -- |
14 |
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 5 -- |
15 |
4 files changed, 2 insertions(+), 72 deletions(-) |
16 |
|
17 |
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest |
18 |
index eda7e3b..98ba021 100644 |
19 |
--- a/x11-libs/qt-assistant/Manifest |
20 |
+++ b/x11-libs/qt-assistant/Manifest |
21 |
@@ -1,9 +1,8 @@ |
22 |
AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc |
23 |
AUX qt-assistant-4.7-fix-compat.patch 2987 RMD160 1086b830699b5357388fa0c1b3633c6c4c3f6bd4 SHA1 63dd8200f0a4fcbd29356fbbc11de19f13a75ed2 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc |
24 |
AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 |
25 |
-AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde |
26 |
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d |
27 |
EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3 |
28 |
-EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 |
29 |
-EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 |
30 |
+EBUILD qt-assistant-4.8.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb |
31 |
+EBUILD qt-assistant-4.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb |
32 |
MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f |
33 |
|
34 |
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 |
35 |
deleted file mode 100644 |
36 |
index f18f45e..0000000 |
37 |
--- a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch |
38 |
+++ /dev/null |
39 |
@@ -1,59 +0,0 @@ |
40 |
-fix qt-assistant-4.8.0 not installing |
41 |
- |
42 |
-gentoo bug #395067 |
43 |
-https://bugs.gentoo.org/show_bug.cgi?id=395067 |
44 |
- |
45 |
---- doc/doc.pri.org |
46 |
-+++ doc/doc.pri |
47 |
-@@ -17,11 +17,6 @@ |
48 |
- COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt |
49 |
- COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html |
50 |
- |
51 |
--EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml |
52 |
--DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml |
53 |
--EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples |
54 |
--DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos |
55 |
-- |
56 |
- $$unixstyle { |
57 |
- 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 |
58 |
- } else { |
59 |
-@@ -30,18 +25,12 @@ |
60 |
- COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") |
61 |
- COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\") |
62 |
- COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\") |
63 |
-- EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\") |
64 |
-- DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\") |
65 |
-- EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\") |
66 |
-- DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\") |
67 |
- } |
68 |
- ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf |
69 |
- QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ |
70 |
- linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ |
71 |
- (cd $$QT_BUILD_TREE && \ |
72 |
- $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \ |
73 |
-- $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \ |
74 |
-- $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \ |
75 |
- $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ |
76 |
- $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \ |
77 |
- $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \ |
78 |
-@@ -85,14 +74,6 @@ |
79 |
- htmldocs.path = $$[QT_INSTALL_DOCS] |
80 |
- htmldocs.CONFIG += no_check_exist directory |
81 |
- |
82 |
--examplesmanifest.files = $$EXAMPLESMANIFEST |
83 |
--examplesmanifest.path = $$[QT_INSTALL_EXAMPLES] |
84 |
--examplesmanifest.CONFIG += no_check_exist directory |
85 |
-- |
86 |
--demosmanifest.files = $$DEMOSMANIFEST |
87 |
--demosmanifest.path = $$[QT_INSTALL_DEMOS] |
88 |
--demosmanifest.CONFIG += no_check_exist directory |
89 |
-- |
90 |
- qchdocs.files= $$QT_BUILD_TREE/doc/qch |
91 |
- qchdocs.path = $$[QT_INSTALL_DOCS] |
92 |
- qchdocs.CONFIG += no_check_exist directory |
93 |
-@@ -104,4 +85,4 @@ |
94 |
- sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE)) |
95 |
- |
96 |
- QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP |
97 |
--INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest |
98 |
-+INSTALLS += htmldocs qchdocs docimages |
99 |
|
100 |
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
101 |
index c16ab12..97ad1d2 100644 |
102 |
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
103 |
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
104 |
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace? |
105 |
webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )" |
106 |
RDEPEND="${DEPEND}" |
107 |
|
108 |
-PATCHES=( |
109 |
- # bug 395067 |
110 |
- "${FILESDIR}/${P}-install-fix.patch" |
111 |
-) |
112 |
- |
113 |
pkg_setup() { |
114 |
# Pixeltool isn't really assistant related, but it relies on |
115 |
# the assistant libraries. doc/qch/ |
116 |
|
117 |
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
118 |
index c16ab12..97ad1d2 100644 |
119 |
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
120 |
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
121 |
@@ -23,11 +23,6 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace? |
122 |
webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )" |
123 |
RDEPEND="${DEPEND}" |
124 |
|
125 |
-PATCHES=( |
126 |
- # bug 395067 |
127 |
- "${FILESDIR}/${P}-install-fix.patch" |
128 |
-) |
129 |
- |
130 |
pkg_setup() { |
131 |
# Pixeltool isn't really assistant related, but it relies on |
132 |
# the assistant libraries. doc/qch/ |