| 1 |
commit: f7f3815402c3114d0914f575b5b017ede5ece520 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 29 20:46:27 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 1 02:39:56 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7f38154 |
| 7 |
|
| 8 |
[dev-qt/qtcore:4] Cleanups. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/qtcore/qtcore-4.8.6.ebuild | 21 +++++++++++---------- |
| 14 |
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 21 +++++++++++---------- |
| 15 |
2 files changed, 22 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 18 |
index 577f23a..c40f089 100644 |
| 19 |
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 20 |
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 21 |
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES=" |
| 22 |
src/tools/rcc |
| 23 |
src/tools/uic |
| 24 |
src/corelib |
| 25 |
- src/xml |
| 26 |
src/network |
| 27 |
+ src/xml |
| 28 |
src/plugins/codecs |
| 29 |
tools/linguist/lconvert |
| 30 |
tools/linguist/lrelease |
| 31 |
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES=" |
| 32 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 33 |
include |
| 34 |
src/3rdparty/des |
| 35 |
+ src/3rdparty/easing |
| 36 |
src/3rdparty/harfbuzz |
| 37 |
src/3rdparty/md4 |
| 38 |
src/3rdparty/md5 |
| 39 |
src/3rdparty/sha1 |
| 40 |
- src/3rdparty/easing |
| 41 |
src/3rdparty/zlib_dependency.pri |
| 42 |
src/declarative |
| 43 |
src/gui |
| 44 |
@@ -68,14 +68,14 @@ src_prepare() { |
| 45 |
# bug 172219 |
| 46 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
| 47 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 48 |
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" |
| 49 |
+ qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" |
| 50 |
|
| 51 |
# bug 427782 |
| 52 |
- sed -i -e "/^CPPFLAGS/s/-g//" \ |
| 53 |
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix CPPFLAGS failed" |
| 54 |
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ |
| 55 |
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ |
| 56 |
- "${S}"/configure || die "sed configure setBootstrapVariable failed" |
| 57 |
+ sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ |
| 58 |
+ qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" |
| 59 |
+ sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ |
| 60 |
+ -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ |
| 61 |
+ configure || die "sed configure setBootstrapVariable failed" |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
@@ -119,8 +119,9 @@ src_install() { |
| 66 |
# TODO: do this better |
| 67 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
| 68 |
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
| 69 |
- || die "sed for qconfig.h failed." |
| 70 |
- dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
| 71 |
+ || die "sed for qconfig.h failed" |
| 72 |
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \ |
| 73 |
+ "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
| 74 |
else |
| 75 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
| 76 |
"${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \ |
| 77 |
|
| 78 |
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 79 |
index 577f23a..c40f089 100644 |
| 80 |
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 81 |
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 82 |
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES=" |
| 83 |
src/tools/rcc |
| 84 |
src/tools/uic |
| 85 |
src/corelib |
| 86 |
- src/xml |
| 87 |
src/network |
| 88 |
+ src/xml |
| 89 |
src/plugins/codecs |
| 90 |
tools/linguist/lconvert |
| 91 |
tools/linguist/lrelease |
| 92 |
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES=" |
| 93 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 94 |
include |
| 95 |
src/3rdparty/des |
| 96 |
+ src/3rdparty/easing |
| 97 |
src/3rdparty/harfbuzz |
| 98 |
src/3rdparty/md4 |
| 99 |
src/3rdparty/md5 |
| 100 |
src/3rdparty/sha1 |
| 101 |
- src/3rdparty/easing |
| 102 |
src/3rdparty/zlib_dependency.pri |
| 103 |
src/declarative |
| 104 |
src/gui |
| 105 |
@@ -68,14 +68,14 @@ src_prepare() { |
| 106 |
# bug 172219 |
| 107 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
| 108 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 109 |
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" |
| 110 |
+ qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" |
| 111 |
|
| 112 |
# bug 427782 |
| 113 |
- sed -i -e "/^CPPFLAGS/s/-g//" \ |
| 114 |
- "${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix CPPFLAGS failed" |
| 115 |
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ |
| 116 |
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ |
| 117 |
- "${S}"/configure || die "sed configure setBootstrapVariable failed" |
| 118 |
+ sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ |
| 119 |
+ qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" |
| 120 |
+ sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ |
| 121 |
+ -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ |
| 122 |
+ configure || die "sed configure setBootstrapVariable failed" |
| 123 |
} |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
@@ -119,8 +119,9 @@ src_install() { |
| 127 |
# TODO: do this better |
| 128 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
| 129 |
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
| 130 |
- || die "sed for qconfig.h failed." |
| 131 |
- dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
| 132 |
+ || die "sed for qconfig.h failed" |
| 133 |
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \ |
| 134 |
+ "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
| 135 |
else |
| 136 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
| 137 |
"${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \ |
Archives