From dd17bcd6c8f8d36010c831faeca97a4440097f55 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 24 Feb 2015 18:46:10 +0000 Subject: Version bump. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) --- dev-qt/qtwebkit/ChangeLog | 8 +++- dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild | 90 ----------------------------------- dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild | 90 +++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 91 deletions(-) delete mode 100644 dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild create mode 100644 dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild (limited to 'dev-qt/qtwebkit') diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog index c910325f0b31..d0b1b48ea7d3 100644 --- a/dev-qt/qtwebkit/ChangeLog +++ b/dev-qt/qtwebkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.26 2015/02/02 19:27:28 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.27 2015/02/24 18:46:10 pesa Exp $ + +*qtwebkit-5.4.1 (24 Feb 2015) + + 24 Feb 2015; Davide Pesavento +qtwebkit-5.4.1.ebuild, + -qtwebkit-5.4.0.ebuild: + Version bump. 02 Feb 2015; Mikle Kolyada qtwebkit-5.4.0.ebuild: Add ~arm keyword diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild deleted file mode 100644 index 01221da96249..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild,v 1.3 2015/02/02 19:27:28 zlogene Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm ~x86" -fi - -# TODO: qttestlib, geolocation, orientation/sensors - -IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-qt/qtcore-${PV}:5[debug=,icu] - >=dev-qt/qtgui-${PV}:5[debug=] - >=dev-qt/qtnetwork-${PV}:5[debug=] - >=dev-qt/qtsql-${PV}:5[debug=] - >=dev-qt/qtwidgets-${PV}:5[debug=] - media-libs/fontconfig:1.0 - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] ) - opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) - printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] ) - qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) - udev? ( virtual/udev ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex -" - -src_prepare() { - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ - Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -} diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild new file mode 100644 index 000000000000..f0b42ba28746 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild,v 1.1 2015/02/24 18:46:10 pesa Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 qt5-build + +DESCRIPTION="WebKit rendering library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~x86" +fi + +# TODO: qttestlib, geolocation, orientation/sensors + +IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp" +REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/icu:= + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-qt/qtcore-${PV}:5[debug=,icu] + >=dev-qt/qtgui-${PV}:5[debug=] + >=dev-qt/qtnetwork-${PV}:5[debug=] + >=dev-qt/qtsql-${PV}:5[debug=] + >=dev-qt/qtwidgets-${PV}:5[debug=] + media-libs/fontconfig:1.0 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( + dev-libs/glib:2 + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 + ) + multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] ) + opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) + printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] ) + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) + udev? ( virtual/udev ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/ruby + dev-util/gperf + sys-devel/bison + sys-devel/flex +" + +src_prepare() { + if use gstreamer010; then + epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" + elif ! use gstreamer; then + epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + fi + use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ + Source/QtWebKit.pro || die + use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + Tools/qmake/mkspecs/features/features.prf || die + + # bug 458222 + sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + + qt5-build_src_prepare +} -- cgit v1.2.3-65-gdbad