old

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 13 insertions, 297 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/Manifest b/www-client/midori/Manifest
index 49fa2d868400..c395b5450a07 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794333c8bac966b163af259c7 SHA512 b7f5bb965fcbf513813138a6dbad4e56f02809baaf03077aa7f01e91b470a6149b76f81f51ef9a0241a9842e074e1abd33674c24a17479a84b3caab37e7ba678 WHIRLPOOL 9f4d1671e704de539f043321596f7a21b90317741484db93769a99793896e2d6796ce10ad48230dbe53bee471328f90318325fa66df46ee6fe984d60de8588b4
-DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
-DIST midori-0.5.2.tar.bz2 1119716 SHA256 a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c SHA512 4fdd93107db9fb472fc55a75e363395a49852970c2619d291e0117ac882412cfa2be9c4fef82ab7cd79935d4aebc0af78e990e370388304343543c7b86c6d8f1 WHIRLPOOL 3041cb20a7959b22728c405e0fa18cb8231a78ae95f31f92d437604594bee5f9d0a8619d1e73d3fdd2c34a0c9369269c1269ab3b3b45abedd6eef0bd0ce75b77
 DIST midori_0.5.4_all_.tar.bz2 1229169 SHA256 d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022 SHA512 94d71eb5b4addb184b356d2434550c40adc717f105518a78b42df40830467a91a6acc5bd04a02891cd4ad3343e0a881d063bdb7ea979dfa0cbe19a84271e3138 WHIRLPOOL eecda1f91c7b740cbaeae7e44ea90ad41dbb261c543cc1e5a17c2ce50ffba4c7e42218572347b3e1b2101bf4a5fc14511364789819aa54724be6045dfa1db329
-EBUILD midori-0.4.6-r1.ebuild 2211 SHA256 48e90bc460897c622ae0632c15dc3c033645489e70744670da3b21886d551b69 SHA512 a1414ab2c4976f577f86a9108ad9806cb4f8eebe834b6360e02911ce3d9c34dbca06ab3e4dea5c61eed2a3dbe00cad85276812dbbf55c22c04a7160d89a3a074 WHIRLPOOL a401d18386e3b3556733962b1cc414fc463df4894db459b546b84e6e2c9eb7c7bdd0f916f99e4207c25cfcaaae176fa89acb79501f88a26dfc43e333707a6a25
-EBUILD midori-0.5.2.ebuild 2554 SHA256 f75d7663990cb41fd612483b2d2e27968e7341b97f59688bb66b4bb4d2d467e3 SHA512 1b938c7c6a95cc8adf3875116885f3fe9744223570daa3f07240701c1a59f012cb8e40e2362e8fbe6897a87bb43828ca7d6643f4a7833b8dbdb5be349b2ae8dc WHIRLPOOL aba27710c4ea48a36f6fd0c019c729ada7949bf2abc944bf9a381eea71943576f35d0413b0818416c01e0fa8aa9213efd4ee25f45a8ffe2b1926dc193bf94902
 EBUILD midori-0.5.4.ebuild 2554 SHA256 0c7ba73d1ac9e14a40d9df693141426ee8c581eac4899076c8317f6aaee9d03d SHA512 60b361292fadb34a69bf56df9f2b3167eb9be02d7a843d448aff7cf2ae14095449be836082705659594a98f9dfb04e86ce6860162f9220b90b49d131f64fdbc4 WHIRLPOOL 4083e26d02d5c097417ff9c60d0fe7ad921859d597988892fcd36c2b0d027ef888e21f16d88d05a976846cc84103a3ab831f347cbad4d7ca77b850a0534fdd8c
-MISC ChangeLog 16588 SHA256 1e0fb87a5f4aba7663fe36b1d337a4329a4d3cd916ee243e8916baa3dedb73ca SHA512 4ea674984ed9cf618b81385487e582e07d0467660e9c46691ed526148131730545d1567656c654067361e28d5d022f315e3b30e163567f3895d1c93626bcdefb WHIRLPOOL 4f9ffd40f43fe3ca86961d35e56de52ea3cff0fb029378fa6c8f23dae1a918910fcd43407ae2cd15e88363c8cf4e96c7c11def7ecd8507dba3fd937094d5c6bc
+MISC ChangeLog 16728 SHA256 202696c787c0563e2299a8661a995ade99ab4be9ab182aa0e58282a3207e9dac SHA512 a6a1c7007a62dcc8fa0404533cd9db574786fe12f3791161f79f517559ee4a2dcb8c58fb3d20974ef528483c0a565e0054e3f449740167839e130b631cb60a0c WHIRLPOOL dc6b503102938c91e02538ba7e94dac97c10dad675b2049ad3e19d4d574dc8048a857374a2676e72df76f807b8ae4d274c1cdfd3e8c8eef1a6939c953872036a
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR5jNNAAoJEEdUh39IaPFNv/wH/3SZSoFwOaL+QfwQ4tbe+h7Q
-ngdVYmHCuhmCMkiiRCGTtx/80IDe0walDd3LEs0ctBhtm13Znq+tzq+YPgSdeoLt
-uGbwwqpv2hUSlo4fG3fKqu3HwPaVTRXX+qCpTA1tB9WcMNlDFhllljoIYiWAj6jH
-uWh42MoTwmn6U4hML7rAmXHuRV8z2twYdSD6o7c2ffa9kpPSu0sfm8p+L3kaJz1A
-IQrcv+evkUqstOl5S+3QeLxnPiji3J2g5WMJR3kgChWpWJev06N801NtaNCJOrmt
-j1h+BAlmgax60BmFLmCzAy85ddi6CkvkMpDX0LLaOrOb32m4xPF9tWbaWsOxPeA=
-=vrZL
+iQEcBAEBCAAGBQJR+JdCAAoJEEdUh39IaPFN9j8H+gLYUBG9htuLBo3wvcPvPVj4
+j5LvgTtHn1JYb+jTUqJi8jOyApjXQWswTl7TMwJHIRNaw5fu+v0zz1DRRmUgYVpy
+BdM2pBIBUAlTGhG9vlS7laOpmwjnlnq7b/tp3WoEtyh9MKcyzsTNJYMSUMqlMJdE
+BkMhVLD0c+WGxTxhITyZSvxvV16JAI8UuxFJeotWEiTIZDkhGf8AhWen6YM7KrJR
+7UXrm1wfSrRcZEVS5CqpdH1nME4iyW/wLEg0Q7AJCCZlo41Jk1W8d0OxXU35m91r
+UOTj581YNXqCKN5aK/c1ncYbO6cHAbT6DE7mQXK5V8dYQPXUqPQqnheb9/5i7RM=
+=MXrn
 -----END PGP SIGNATURE-----
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
-}