old

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 5 insertions, 284 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index e6f00f82371b..c371b9942a48 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.113 2013/07/17 06:02:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.114 2013/07/31 04:50:26 ssuominen Exp $
+
+  31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/midori-0.4.6-dl.patch, -midori-0.4.6-r1.ebuild, -midori-0.5.2.ebuild:
+  old
 
 *midori-0.5.4 (17 Jul 2013)
 
diff --git a/www-client/midori/files/midori-0.4.6-dl.patch b/www-client/midori/files/midori-0.4.6-dl.patch
deleted file mode 100644
index 62b507ea940b..000000000000
--- a/www-client/midori/files/midori-0.4.6-dl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f38715efb279e08bb3ddcd941d5d9ff6091b98c8 Mon Sep 17 00:00:00 2001
-From: André Stösel <andre@stoesel.de>
-Date: Thu, 31 May 2012 14:19:54 +0000
-Subject: Bugfix: "save as" doesn't download anything
-
-Fixes: https://bugs.launchpad.net/midori/+bug/1005881
----
-diff --git a/midori/midori-browser.c b/midori/midori-browser.c
-index 22d74f5..bae714a 100644
---- a/midori/midori-browser.c
-+++ b/midori/midori-browser.c
-@@ -1342,24 +1342,6 @@ midori_view_new_view_cb (GtkWidget*     view,
- }
- 
- static void
--midori_view_download_save_as_response_cb (GtkWidget*      dialog,
--                                          gint            response,
--                                          MidoriBrowser*  browser)
--{
--    WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download");
--    if (response == GTK_RESPONSE_OK)
--    {
--        gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
--        if (midori_browser_prepare_download (browser, download, uri))
--            webkit_download_start (download);
--        g_free (uri);
--    }
--    else
--        g_object_unref (download);
--    gtk_widget_hide (dialog);
--}
--
--static void
- midori_browser_download_status_cb (WebKitDownload*  download,
-                                    GParamSpec*      pspec,
-                                    GtkWidget*       widget)
-@@ -1515,14 +1497,28 @@ midori_view_download_requested_cb (GtkWidget*      view,
-                 g_free (folder);
-                 g_signal_connect (dialog, "destroy",
-                                   G_CALLBACK (gtk_widget_destroyed), &dialog);
--                g_signal_connect (dialog, "response",
--                    G_CALLBACK (midori_view_download_save_as_response_cb), browser);
-             }
-             g_object_set_data (G_OBJECT (dialog), "download", download);
-             filename = sokoke_get_download_filename (download);
-             gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
-             g_free (filename);
--            gtk_widget_show (dialog);
-+
-+            if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-+            {
-+                gtk_widget_hide (dialog);
-+                gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-+                if (!midori_browser_prepare_download (browser, download, uri))
-+                {
-+                    g_free (uri);
-+                    return FALSE;
-+                }
-+                g_free (uri);
-+            }
-+            else
-+            {
-+                gtk_widget_hide (dialog);
-+                return FALSE;
-+            }
-         }
-         else
-         {
---
-cgit v0.9.0.3
diff --git a/www-client/midori/midori-0.4.6-r1.ebuild b/www-client/midori/midori-0.4.6-r1.ebuild
deleted file mode 100644
index 997e96c7903e..000000000000
--- a/www-client/midori/midori-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.5 2013/03/29 21:37:00 angelos Exp $
-
-EAPI=4
-VALA_MIN_API_VERSION=0.14
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-fi
-
-inherit eutils fdo-mime gnome2-utils python waf-utils vala ${_live_inherits}
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="+deprecated doc gnome libnotify nls +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	x11-libs/libXScrnSaver
-	deprecated? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		unique? ( dev-libs/libunique:1 )
-		)
-	!deprecated? (
-		net-libs/webkit-gtk:3
-		x11-libs/gtk+:3
-		unique? ( dev-libs/libunique:3 )
-		)
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dl.patch
-	vala_src_prepare
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	waf-utils_src_configure \
-		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
-		--enable-addons \
-		$(use_enable nls) \
-		$(use_enable !deprecated gtk3) \
-		--disable-granite
-}
-
-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.2.ebuild b/www-client/midori/midori-0.5.2.ebuild
deleted file mode 100644
index 7f84591892c2..000000000000
--- a/www-client/midori/midori-0.5.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.2.ebuild,v 1.1 2013/06/01 14:27:45 ssuominen Exp $
-
-EAPI=5
-VALA_MIN_API_VERSION=0.14
-
-PYTHON_COMPAT=( python2_7 )
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-fi
-
-inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://twotoasts.de/index.php/midori/"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="+deprecated doc gnome libnotify nls +unique webkit2 zeitgeist"
-
-RDEPEND=">=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.34:2.4
-	x11-libs/libXScrnSaver
-	deprecated? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		unique? ( dev-libs/libunique:1 )
-		)
-	!deprecated? (
-		>=app-crypt/gcr-3
-		>=net-libs/webkit-gtk-1.10.2:3
-		x11-libs/gtk+:3
-		unique? ( dev-libs/libunique:3 )
-		webkit2? ( >=net-libs/webkit-gtk-2 )
-		)
-	gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34:2.4 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	# Force disabled because we don't have this custom renamed in Portage
-	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	local myconf
-	use deprecated || myconf="$(use_enable webkit2)"
-
-	waf-utils_src_configure \
-		--disable-docs \
-		$(use_enable doc apidocs) \
-		$(use_enable unique) \
-		$(use_enable libnotify) \
-		--disable-granite \
-		--enable-addons \
-		$(use_enable nls) \
-		$(use_enable !deprecated gtk3) \
-		$(use_enable zeitgeist) \
-		${myconf}
-}
-
-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
-}