summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-04-05 15:49:37 +0000
committerJohannes Huber <johu@gentoo.org>2012-04-05 15:49:37 +0000
commitb148f91063fa0018ae9585a1de30092cd570bbc0 (patch)
tree5b30bead24ccd4119077621b0415a5053503f803 /x11-libs/qt-webkit
parentOld. (diff)
downloadhistorical-b148f91063fa0018ae9585a1de30092cd570bbc0.tar.gz
historical-b148f91063fa0018ae9585a1de30092cd570bbc0.tar.bz2
historical-b148f91063fa0018ae9585a1de30092cd570bbc0.zip
Removing Qt-4.8.0
Package-Manager: portage-2.2.0_alpha99/cvs/Linux i686
Diffstat (limited to 'x11-libs/qt-webkit')
-rw-r--r--x11-libs/qt-webkit/ChangeLog5
-rw-r--r--x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild74
2 files changed, 4 insertions, 75 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 90d960c62e39..55e189a50ee9 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-webkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.140 2012/04/04 13:29:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.141 2012/04/05 15:47:39 johu Exp $
+
+ 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.8.0-r1.ebuild:
+ Drop Qt-4.8.0
04 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+files/qt-webkit-4.8.1+glib-2.31.patch, qt-webkit-4.8.1.ebuild:
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
deleted file mode 100644
index 1dda18f9fc4d..000000000000
--- a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.5 2012/03/10 16:05:31 pesa Exp $
-
-EAPI="3"
-inherit qt4-build flag-o-matic
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+gstreamer +jit"
-
-DEPEND="
- dev-db/sqlite:3
- dev-libs/icu
- x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-c++0x-fix.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt
- tools/designer/src/plugins/qwebview"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- use c++0x && append-cxxflags -fpermissive
-
- # Fix version number in generated pkgconfig file, bug 406443
- sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
- # Always enable icu to avoid build failure, bug 407315
- sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
- src/3rdparty/webkit/Source/WebKit.pri || die
-
- qt4-build_src_prepare
-}
-
-src_configure() {
- myconf+="
- -webkit
- -icu -system-sqlite
- $(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)
- "
- qt4-build_src_configure
-}