| 1 |
commit: 2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f |
| 2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 3 09:26:27 2012 +0000 |
| 4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 3 09:26:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2f5e6e58 |
| 7 |
|
| 8 |
x11-libs/qt-gui:Sync with portage ebuild |
| 9 |
|
| 10 |
--- |
| 11 |
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 25 ++++++++++++++----------- |
| 12 |
x11-libs/qt-gui/qt-gui-4.9999.ebuild | 25 ++++++++++++++----------- |
| 13 |
2 files changed, 28 insertions(+), 22 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |
| 16 |
index 6fee2ac..43f119b 100644 |
| 17 |
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |
| 18 |
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |
| 19 |
@@ -3,7 +3,10 @@ |
| 20 |
# $Header: $ |
| 21 |
|
| 22 |
EAPI="4" |
| 23 |
-inherit eutils confutils qt4-build-edge |
| 24 |
+if [[ ${PV} == 4*9999 ]]; then |
| 25 |
+ QT_ECLASS="-edge" |
| 26 |
+fi |
| 27 |
+inherit qt4-build${QT_ECLASS} |
| 28 |
|
| 29 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 30 |
SLOT="4" |
| 31 |
@@ -103,11 +106,11 @@ pkg_setup() { |
| 32 |
# mac version does not contain qtconfig? |
| 33 |
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
| 34 |
|
| 35 |
- qt4-build-edge_pkg_setup |
| 36 |
+ qt4-build${QT_ECLASS}_pkg_setup |
| 37 |
} |
| 38 |
|
| 39 |
src_prepare() { |
| 40 |
- qt4-build-edge_src_prepare |
| 41 |
+ qt4-build${QT_ECLASS}_src_prepare |
| 42 |
|
| 43 |
# Don't build plugins this go around, because they depend on qt3support lib |
| 44 |
sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die |
| 45 |
@@ -140,7 +143,7 @@ src_configure() { |
| 46 |
-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit |
| 47 |
-no-phonon -no-opengl" |
| 48 |
|
| 49 |
- qt4-build-edge_src_configure |
| 50 |
+ qt4-build${QT_ECLASS}_src_configure |
| 51 |
|
| 52 |
if use gtkstyle; then |
| 53 |
einfo "patching the Makefile to fix qgtkstyle compilation" |
| 54 |
@@ -167,7 +170,7 @@ src_install() { |
| 55 |
$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR |
| 56 |
$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" |
| 57 |
|
| 58 |
- qt4-build-edge_src_install |
| 59 |
+ qt4-build${QT_ECLASS}_src_install |
| 60 |
|
| 61 |
# qt-creator |
| 62 |
# some qt-creator headers are located |
| 63 |
@@ -185,12 +188,12 @@ src_install() { |
| 64 |
doins "${S}"/tools/designer/src/lib/sdk/* || die |
| 65 |
|
| 66 |
#touch the available graphics systems |
| 67 |
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" || |
| 68 |
- die "could not create ${D}/usr/share/qt4/graphicssystems/" |
| 69 |
- echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" || |
| 70 |
- die "could not create ${D}/usr/share/qt4/graphicssystems/raster" |
| 71 |
- touch "${D}/usr/share/qt4/graphicssystems/native" || |
| 72 |
- die "could not touch ${D}/usr/share/qt4/graphicssystems/native" |
| 73 |
+ mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || |
| 74 |
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/" |
| 75 |
+ echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" || |
| 76 |
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/raster" |
| 77 |
+ touch "${ED}/usr/share/qt4/graphicssystems/native" || |
| 78 |
+ die "could not touch ${ED}/usr/share/qt4/graphicssystems/native" |
| 79 |
|
| 80 |
#install private headers |
| 81 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
| 82 |
|
| 83 |
diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild |
| 84 |
index 6fee2ac..43f119b 100644 |
| 85 |
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild |
| 86 |
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild |
| 87 |
@@ -3,7 +3,10 @@ |
| 88 |
# $Header: $ |
| 89 |
|
| 90 |
EAPI="4" |
| 91 |
-inherit eutils confutils qt4-build-edge |
| 92 |
+if [[ ${PV} == 4*9999 ]]; then |
| 93 |
+ QT_ECLASS="-edge" |
| 94 |
+fi |
| 95 |
+inherit qt4-build${QT_ECLASS} |
| 96 |
|
| 97 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 98 |
SLOT="4" |
| 99 |
@@ -103,11 +106,11 @@ pkg_setup() { |
| 100 |
# mac version does not contain qtconfig? |
| 101 |
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
| 102 |
|
| 103 |
- qt4-build-edge_pkg_setup |
| 104 |
+ qt4-build${QT_ECLASS}_pkg_setup |
| 105 |
} |
| 106 |
|
| 107 |
src_prepare() { |
| 108 |
- qt4-build-edge_src_prepare |
| 109 |
+ qt4-build${QT_ECLASS}_src_prepare |
| 110 |
|
| 111 |
# Don't build plugins this go around, because they depend on qt3support lib |
| 112 |
sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die |
| 113 |
@@ -140,7 +143,7 @@ src_configure() { |
| 114 |
-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit |
| 115 |
-no-phonon -no-opengl" |
| 116 |
|
| 117 |
- qt4-build-edge_src_configure |
| 118 |
+ qt4-build${QT_ECLASS}_src_configure |
| 119 |
|
| 120 |
if use gtkstyle; then |
| 121 |
einfo "patching the Makefile to fix qgtkstyle compilation" |
| 122 |
@@ -167,7 +170,7 @@ src_install() { |
| 123 |
$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR |
| 124 |
$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" |
| 125 |
|
| 126 |
- qt4-build-edge_src_install |
| 127 |
+ qt4-build${QT_ECLASS}_src_install |
| 128 |
|
| 129 |
# qt-creator |
| 130 |
# some qt-creator headers are located |
| 131 |
@@ -185,12 +188,12 @@ src_install() { |
| 132 |
doins "${S}"/tools/designer/src/lib/sdk/* || die |
| 133 |
|
| 134 |
#touch the available graphics systems |
| 135 |
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" || |
| 136 |
- die "could not create ${D}/usr/share/qt4/graphicssystems/" |
| 137 |
- echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" || |
| 138 |
- die "could not create ${D}/usr/share/qt4/graphicssystems/raster" |
| 139 |
- touch "${D}/usr/share/qt4/graphicssystems/native" || |
| 140 |
- die "could not touch ${D}/usr/share/qt4/graphicssystems/native" |
| 141 |
+ mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || |
| 142 |
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/" |
| 143 |
+ echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" || |
| 144 |
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/raster" |
| 145 |
+ touch "${ED}/usr/share/qt4/graphicssystems/native" || |
| 146 |
+ die "could not touch ${ED}/usr/share/qt4/graphicssystems/native" |
| 147 |
|
| 148 |
#install private headers |
| 149 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
Archives