| 1 |
commit: 24dadd56fbe8e9ab185f2db7142482e16deeb4fa |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 28 00:29:13 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 28 00:29:13 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=24dadd56 |
| 7 |
|
| 8 |
[dev-qt/qtgui:4] Remove obsolete workaround. |
| 9 |
|
| 10 |
IIRC these paths are added by cairo.pc when cairo is built |
| 11 |
with USE=qt4. Since we've been depending on cairo[-qt4] for |
| 12 |
a while now, this hack should no longer be needed. |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.10 |
| 15 |
|
| 16 |
--- |
| 17 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 8 +------- |
| 18 |
1 file changed, 1 insertion(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 21 |
index 5dadd5d..d6de878 100644 |
| 22 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 23 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 24 |
@@ -125,7 +125,7 @@ src_prepare() { |
| 25 |
qt4-build-multilib_src_prepare |
| 26 |
|
| 27 |
# Add -xvideo to the list of accepted configure options |
| 28 |
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure |
| 29 |
+ sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die |
| 30 |
} |
| 31 |
|
| 32 |
src_configure() { |
| 33 |
@@ -151,12 +151,6 @@ src_configure() { |
| 34 |
[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" |
| 35 |
|
| 36 |
qt4-build-multilib_src_configure |
| 37 |
- |
| 38 |
- if use gtkstyle; then |
| 39 |
- sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" |
| 40 |
- fi |
| 41 |
- |
| 42 |
- sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" |
| 43 |
} |
| 44 |
|
| 45 |
src_install() { |
Archives