diff options
author | Johannes Huber <johu@gentoo.org> | 2012-03-27 18:38:45 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-03-27 18:38:45 +0000 |
commit | a4eb8a00a5acd1b42519f33c4519e61a5f342e21 (patch) | |
tree | 01cf5617276a6a5e9475862a1e0268ff02c0477e /x11-libs/qt-webkit | |
parent | Pin to SLOT="0" of sys-fs/udisks. (diff) | |
download | gentoo-2-a4eb8a00a5acd1b42519f33c4519e61a5f342e21.tar.gz gentoo-2-a4eb8a00a5acd1b42519f33c4519e61a5f342e21.tar.bz2 gentoo-2-a4eb8a00a5acd1b42519f33c4519e61a5f342e21.zip |
Removing Qt-4.6.2
(Portage version: 2.2.0_alpha95/cvs/Linux i686)
Diffstat (limited to 'x11-libs/qt-webkit')
-rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild | 54 | ||||
-rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild | 42 |
3 files changed, 5 insertions, 97 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index ecd84a0cfb80..6d13e02c2a80 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # 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.136 2012/03/10 16:05:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.137 2012/03/27 18:38:45 johu Exp $ + + 27 Mar 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.6.2.ebuild, + -qt-webkit-4.6.2-r1.ebuild: + Drop Qt-4.6.2 10 Mar 2012; Davide Pesavento <pesa@gentoo.org> -qt-webkit-4.8.0.ebuild, qt-webkit-4.8.0-r1.ebuild: diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild deleted file mode 100644 index 112353018c21..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2011 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.6.2-r1.ebuild,v 1.9 2011/03/26 17:06:02 dilfridge Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha 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="dbus kde" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] - ~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=] - ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] - media-libs/phonon[aqua=] ) ) - kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch - "${FILESDIR}"/${PN}-4.5.3-cve-2010-0046-css-format-mem-corruption.patch - "${FILESDIR}"/${PN}-4.5.3-cve-2010-0049-freed-line-boxes-ltr-rtl.patch - "${FILESDIR}"/${PN}-4.5.3-cve-2010-0050-crash-misnested-style-tags.patch - "${FILESDIR}"/${PN}-4.5.3-cve-2010-0052-destroyed-input-cached.patch - "${FILESDIR}"/${P}-cve-2010-0051-lax-css-parsing-cross-domain-theft.patch - "${FILESDIR}"/${P}-cve-2010-0054-image-element-pointer-name-getter.patch -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/WebCore - tools/designer/src/plugins/qwebview" - QT4_EXTRACT_DIRECTORIES=" - include/ - src/ - tools/" - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - qt4-build_src_prepare -} - -src_configure() { - myconf="${myconf} -webkit $(qt_use dbus qdbus)" - qt4-build_src_configure -} diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild deleted file mode 100644 index b218e6bba1aa..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 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.6.2.ebuild,v 1.11 2011/03/26 17:06:02 dilfridge Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha 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="kde dbus" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] - ~x11-libs/qt-dbus-${PV}[aqua=,debug=] - ~x11-libs/qt-gui-${PV}[aqua=,dbus,debug=] - ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=] - media-libs/phonon[aqua=] ) ) - kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/" -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -PATCHES=( - "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch -) - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - qt4-build_src_prepare -} - -src_configure() { - myconf="${myconf} -webkit" - qt4-build_src_configure -} |