| 1 |
commit: 010c720a61f9cc71d3aa21600e97144af12be0d1 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 10 19:15:03 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 10 19:18:19 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=010c720a |
| 7 |
|
| 8 |
[dev-qt/designer:4] Stop installing private headers and other shit. |
| 9 |
|
| 10 |
Qt Creator (the only user) bundles an internal copy since 2009. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.10 |
| 13 |
|
| 14 |
--- |
| 15 |
dev-qt/designer/designer-4.8.6.ebuild | 19 ++----------------- |
| 16 |
dev-qt/designer/designer-4.8.9999.ebuild | 19 ++----------------- |
| 17 |
2 files changed, 4 insertions(+), 34 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild |
| 20 |
index 0915f41..49a31e3 100644 |
| 21 |
--- a/dev-qt/designer/designer-4.8.6.ebuild |
| 22 |
+++ b/dev-qt/designer/designer-4.8.6.ebuild |
| 23 |
@@ -50,23 +50,8 @@ multilib_src_configure() { |
| 24 |
qt4_multilib_src_configure |
| 25 |
} |
| 26 |
|
| 27 |
-multilib_src_install() { |
| 28 |
- qt4_multilib_src_install |
| 29 |
- |
| 30 |
- # qt-creator |
| 31 |
- # some qt-creator headers are located |
| 32 |
- # under /usr/include/qt4/QtDesigner/private. |
| 33 |
- # those headers are just includes of the headers |
| 34 |
- # which are located under tools/designer/src/lib/* |
| 35 |
- # So instead of installing both, we create the private folder |
| 36 |
- # and drop tools/designer/src/lib/* headers in it. |
| 37 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 38 |
- insinto "${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ |
| 39 |
- else |
| 40 |
- insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/ |
| 41 |
- fi |
| 42 |
- doins "${S}"/tools/designer/src/lib/shared/* |
| 43 |
- doins "${S}"/tools/designer/src/lib/sdk/* |
| 44 |
+multilib_src_install_all() { |
| 45 |
+ qt4_multilib_src_install_all |
| 46 |
|
| 47 |
doicon tools/designer/src/designer/images/designer.png |
| 48 |
make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' |
| 49 |
|
| 50 |
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild |
| 51 |
index 0915f41..49a31e3 100644 |
| 52 |
--- a/dev-qt/designer/designer-4.8.9999.ebuild |
| 53 |
+++ b/dev-qt/designer/designer-4.8.9999.ebuild |
| 54 |
@@ -50,23 +50,8 @@ multilib_src_configure() { |
| 55 |
qt4_multilib_src_configure |
| 56 |
} |
| 57 |
|
| 58 |
-multilib_src_install() { |
| 59 |
- qt4_multilib_src_install |
| 60 |
- |
| 61 |
- # qt-creator |
| 62 |
- # some qt-creator headers are located |
| 63 |
- # under /usr/include/qt4/QtDesigner/private. |
| 64 |
- # those headers are just includes of the headers |
| 65 |
- # which are located under tools/designer/src/lib/* |
| 66 |
- # So instead of installing both, we create the private folder |
| 67 |
- # and drop tools/designer/src/lib/* headers in it. |
| 68 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 69 |
- insinto "${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ |
| 70 |
- else |
| 71 |
- insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/ |
| 72 |
- fi |
| 73 |
- doins "${S}"/tools/designer/src/lib/shared/* |
| 74 |
- doins "${S}"/tools/designer/src/lib/sdk/* |
| 75 |
+multilib_src_install_all() { |
| 76 |
+ qt4_multilib_src_install_all |
| 77 |
|
| 78 |
doicon tools/designer/src/designer/images/designer.png |
| 79 |
make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' |
Archives