[gentoo-commits] proj/qt:master commit in: dev-qt/designer/

[Davide Pesavento]

commit:     010c720a61f9cc71d3aa21600e97144af12be0d1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 10 19:15:03 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 10 19:18:19 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=010c720a

[dev-qt/designer:4] Stop installing private headers and other shit.

Qt Creator (the only user) bundles an internal copy since 2009.

Package-Manager: portage-2.2.10

---
 dev-qt/designer/designer-4.8.6.ebuild    | 19 ++-----------------
 dev-qt/designer/designer-4.8.9999.ebuild | 19 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/dev-qt/designer/designer-4.8.6.ebuild 
b/dev-qt/designer/designer-4.8.6.ebuild
index 0915f41..49a31e3 100644
--- a/dev-qt/designer/designer-4.8.6.ebuild
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -50,23 +50,8 @@ multilib_src_configure() {
        qt4_multilib_src_configure
 }
 
-multilib_src_install() {
-       qt4_multilib_src_install
-
-       # qt-creator
-       # some qt-creator headers are located
-       # under /usr/include/qt4/QtDesigner/private.
-       # those headers are just includes of the headers
-       # which are located under tools/designer/src/lib/*
-       # So instead of installing both, we create the private folder
-       # and drop tools/designer/src/lib/* headers in it.
-       if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-               insinto 
"${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
-       else
-               insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/
-       fi
-       doins "${S}"/tools/designer/src/lib/shared/*
-       doins "${S}"/tools/designer/src/lib/sdk/*
+multilib_src_install_all() {
+       qt4_multilib_src_install_all
 
        doicon tools/designer/src/designer/images/designer.png
        make_desktop_entry designer Designer designer 
'Qt;Development;GUIDesigner'

diff --git a/dev-qt/designer/designer-4.8.9999.ebuild 
b/dev-qt/designer/designer-4.8.9999.ebuild
index 0915f41..49a31e3 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -50,23 +50,8 @@ multilib_src_configure() {
        qt4_multilib_src_configure
 }
 
-multilib_src_install() {
-       qt4_multilib_src_install
-
-       # qt-creator
-       # some qt-creator headers are located
-       # under /usr/include/qt4/QtDesigner/private.
-       # those headers are just includes of the headers
-       # which are located under tools/designer/src/lib/*
-       # So instead of installing both, we create the private folder
-       # and drop tools/designer/src/lib/* headers in it.
-       if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-               insinto 
"${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
-       else
-               insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/
-       fi
-       doins "${S}"/tools/designer/src/lib/shared/*
-       doins "${S}"/tools/designer/src/lib/sdk/*
+multilib_src_install_all() {
+       qt4_multilib_src_install_all
 
        doicon tools/designer/src/designer/images/designer.png
        make_desktop_entry designer Designer designer 
'Qt;Development;GUIDesigner'