commit: 93e39a3f4770510684d148eb7b482650ccf3cd95 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Mon Aug 22 10:35:14 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Mon Aug 22 10:35:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e39a3f
www-client/midori: Drop old Package-Manager: portage-2.3.0 www-client/midori/Manifest | 1 - .../midori-0.5.10-fix-webkit2-build-breakage.patch | 22 ---- www-client/midori/metadata.xml | 2 - www-client/midori/midori-0.5.10.ebuild | 138 --------------------- www-client/midori/midori-0.5.11-r1.ebuild | 138 --------------------- www-client/midori/midori-0.5.11.ebuild | 135 -------------------- 6 files changed, 436 deletions(-) diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest index 02df760..d13ad47 100644 --- a/www-client/midori/Manifest +++ b/www-client/midori/Manifest @@ -1,2 +1 @@ -DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7 DIST midori_0.5.11_all_.tar.bz2 1428791 SHA256 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d WHIRLPOOL 6825d1b28e269f9fb158458cd4a3ddbdb09ab241ced32c4ccc5df0c1f9a921a275baf0dcdac24aa84c58f7a3371ef74941bcd06a8303c95dd3ffb48d99de6bba diff --git a/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch deleted file mode 100644 index 3c6059c..0000000 --- a/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://launchpadlibrarian.net/204464340/0002-fix-webkit2-build-breakage.patch - -webkit_web_view_get_main_frame() is a webkit1 API function. -Using it without a check breaks webkit2 builds. - -Signed-off-by: Gustavo Zacarias <gust...@zacarias.com.ar> - -diff -Nura midori-0.5.10.orig/midori/midori-view.c midori-0.5.10.wk2/midori/midori-view.c ---- midori-0.5.10.orig/midori/midori-view.c 2015-04-24 08:50:24.940501790 -0300 -+++ midori-0.5.10.wk2/midori/midori-view.c 2015-04-25 07:19:21.707132362 -0300 -@@ -1256,9 +1256,11 @@ - message, error->message, NULL, - _("Try Again"), web_frame); - -+#ifdef WEBKIT2 - /* if the main frame for the whole tab has a network error, set tab error status */ - if (web_frame == webkit_web_view_get_main_frame (web_view)) - midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK); -+#endif - - g_free (message); - g_free (title); diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml index a04dda3..de07702 100644 --- a/www-client/midori/metadata.xml +++ b/www-client/midori/metadata.xml @@ -6,9 +6,7 @@ <name>XFCE Team</name> </maintainer> <use> - <flag name="deprecated">Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag> <flag name="granite">Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag> <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag> - <flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag> </use> </pkgmetadata> diff --git a/www-client/midori/midori-0.5.10.ebuild b/www-client/midori/midori-0.5.10.ebuild deleted file mode 100644 index 7667988..0000000 --- a/www-client/midori/midori-0.5.10.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -unset _live_inherits - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" - _live_inherits=git-2 -else - KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd" - SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"; -fi - -inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits} - -DESCRIPTION="A lightweight web browser based on WebKitGTK+" -HOMEPAGE="http://www.midori-browser.org/"; - -LICENSE="LGPL-2.1 MIT" -SLOT="0" -IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist" - -RDEPEND=" - >=app-crypt/gcr-3[gtk] - >=dev-db/sqlite-3.6.19:3 - >=dev-libs/glib-2.32.3 - dev-libs/libxml2 - >=net-libs/libsoup-2.38:2.4 - >=net-libs/libsoup-gnome-2.38:2.4 - >=x11-libs/libnotify-0.7 - x11-libs/libXScrnSaver - deprecated? ( - >=net-libs/webkit-gtk-1.8.1:2[jit=] - >=x11-libs/gtk+-2.24:2 - ) - !deprecated? ( - x11-libs/gtk+:3 - webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) - !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) - ) - granite? ( >=dev-libs/granite-0.2 ) - introspection? ( dev-libs/gobject-introspection:= ) - zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(vala_depend) - dev-util/intltool - gnome-base/librsvg - sys-devel/gettext - doc? ( dev-util/gtk-doc ) -" -REQUIRED_USE=" - granite? ( !deprecated ) - introspection? ( deprecated ) - webkit2? ( !deprecated ) -" - -S=${WORKDIR} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_src_unpack - else - default - fi -} - -src_prepare() { - epatch "${FILESDIR}/${P}-fix-webkit2-build-breakage.patch" - vala_src_prepare - sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die -} - -src_configure() { - strip-linguas -i po - - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - $(cmake-utils_use_use doc APIDOCS) - $(cmake-utils_use_use introspection GIR) - $(cmake-utils_use_use granite) - $(cmake-utils_use_use zeitgeist) - -DVALA_EXECUTABLE="${VALAC}" - ) - - if use deprecated; then - mycmakeargs+=( - -DUSE_GTK3=OFF - -DHALF_BRO_INCOM_WEBKIT2=OFF - ) - else - mycmakeargs+=( - -DUSE_GTK3=ON - $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2) - ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local jit_is_enabled - if use deprecated; then - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes - else - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes - fi - [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/www-client/midori/midori-0.5.11-r1.ebuild b/www-client/midori/midori-0.5.11-r1.ebuild deleted file mode 100644 index d311ad3..0000000 --- a/www-client/midori/midori-0.5.11-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -VALA_MIN_API_VERSION="0.30" - -unset _live_inherits - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" - _live_inherits=git-2 -else - KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd" - SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"; -fi - -inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits} - -DESCRIPTION="A lightweight web browser based on WebKitGTK+" -HOMEPAGE="http://www.midori-browser.org/"; - -LICENSE="LGPL-2.1 MIT" -SLOT="0" -IUSE="deprecated doc granite introspection xscreensaver +jit +webkit2 zeitgeist" - -RDEPEND=" - >=app-crypt/gcr-3[gtk] - >=dev-db/sqlite-3.6.19:3 - >=dev-libs/glib-2.32.3 - dev-libs/libxml2 - >=net-libs/libsoup-2.38:2.4 - >=net-libs/libsoup-gnome-2.38:2.4 - >=x11-libs/libnotify-0.7 - xscreensaver? ( x11-libs/libXScrnSaver ) - deprecated? ( - >=net-libs/webkit-gtk-1.8.1:2[jit=] - >=x11-libs/gtk+-2.24:2 - ) - !deprecated? ( - >=x11-libs/gtk+-3.10.0:3 - webkit2? ( >=net-libs/webkit-gtk-2.3.91:4[jit=] ) - !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) - ) - granite? ( >=dev-libs/granite-0.2 ) - introspection? ( dev-libs/gobject-introspection:= ) - zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(vala_depend) - dev-util/intltool - gnome-base/librsvg - sys-devel/gettext - doc? ( dev-util/gtk-doc ) -" -REQUIRED_USE=" - granite? ( !deprecated ) - introspection? ( deprecated ) - webkit2? ( !deprecated ) -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_src_unpack - else - default - fi -} - -src_prepare() { - vala_src_prepare - sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die - eapply_user -} - -src_configure() { - strip-linguas -i po - - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DUSE_APIDOCS="$(usex doc)" - -DUSE_GIR="$(usex introspection)" - -DUSE_GRANITE="$(usex granite)" - -DUSE_ZEITGEIST="$(usex zeitgeist)" - -DUSE_XSCREENSAVER="$(usex xscreensaver)" - -DVALA_EXECUTABLE="${VALAC}" - ) - - if use deprecated; then - mycmakeargs+=( - -DUSE_GTK3=OFF - -DHALF_BRO_INCOM_WEBKIT2=OFF - ) - else - mycmakeargs+=( - -DUSE_GTK3=ON - -DHALF_BRO_INCOM_WEBKIT2="$(usex webkit2)" - ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local jit_is_enabled - if use deprecated; then - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes - else - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes - fi - [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/www-client/midori/midori-0.5.11.ebuild b/www-client/midori/midori-0.5.11.ebuild deleted file mode 100644 index cc9f88d..0000000 --- a/www-client/midori/midori-0.5.11.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -unset _live_inherits - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.xfce.org/apps/${PN}" - _live_inherits=git-2 -else - KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd" - SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"; -fi - -inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits} - -DESCRIPTION="A lightweight web browser based on WebKitGTK+" -HOMEPAGE="http://www.midori-browser.org/"; - -LICENSE="LGPL-2.1 MIT" -SLOT="0" -IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist" - -RDEPEND=" - >=app-crypt/gcr-3[gtk] - >=dev-db/sqlite-3.6.19:3 - >=dev-libs/glib-2.32.3 - dev-libs/libxml2 - >=net-libs/libsoup-2.38:2.4 - >=net-libs/libsoup-gnome-2.38:2.4 - >=x11-libs/libnotify-0.7 - x11-libs/libXScrnSaver - deprecated? ( - >=net-libs/webkit-gtk-1.8.1:2[jit=] - >=x11-libs/gtk+-2.24:2 - ) - !deprecated? ( - >=x11-libs/gtk+-3.10.0:3 - webkit2? ( >=net-libs/webkit-gtk-2.3.91:4[jit=] ) - !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) - ) - granite? ( >=dev-libs/granite-0.2 ) - introspection? ( dev-libs/gobject-introspection:= ) - zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(vala_depend) - dev-util/intltool - gnome-base/librsvg - sys-devel/gettext - doc? ( dev-util/gtk-doc ) -" -REQUIRED_USE=" - granite? ( !deprecated ) - introspection? ( deprecated ) - webkit2? ( !deprecated ) -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_src_unpack - else - default - fi -} - -src_prepare() { - vala_src_prepare - sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die -} - -src_configure() { - strip-linguas -i po - - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - $(cmake-utils_use_use doc APIDOCS) - $(cmake-utils_use_use introspection GIR) - $(cmake-utils_use_use granite) - $(cmake-utils_use_use zeitgeist) - -DVALA_EXECUTABLE="${VALAC}" - ) - - if use deprecated; then - mycmakeargs+=( - -DUSE_GTK3=OFF - -DHALF_BRO_INCOM_WEBKIT2=OFF - ) - else - mycmakeargs+=( - -DUSE_GTK3=ON - $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2) - ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local jit_is_enabled - if use deprecated; then - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes - else - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes - fi - [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -}
