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