old

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

5 files changed, 13 insertions, 268 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 3b221b376b8e..0085900f6bae 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.109 2013/04/09 07:33:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.110 2013/04/09 15:56:57 ssuominen Exp $
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.8.ebuild,
+  -files/midori-0.4.8-desktop_file_validation.patch, -midori-0.4.9.ebuild:
+  old
 
 *midori-0.5.0 (09 Apr 2013)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 9a0685cf13d8..391e893430ac 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -2,22 +2,21 @@
 Hash: SHA256
 
 AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794333c8bac966b163af259c7 SHA512 b7f5bb965fcbf513813138a6dbad4e56f02809baaf03077aa7f01e91b470a6149b76f81f51ef9a0241a9842e074e1abd33674c24a17479a84b3caab37e7ba678 WHIRLPOOL 9f4d1671e704de539f043321596f7a21b90317741484db93769a99793896e2d6796ce10ad48230dbe53bee471328f90318325fa66df46ee6fe984d60de8588b4
-AUX midori-0.4.8-desktop_file_validation.patch 870 SHA256 615f3f5de1de29f2704e9d347b394236f1861a08cd707a2d247ea8e9a646c45c SHA512 08db8b9d5283f929296b479d3304551da1e8a37ec8a47d2dc44aac7fca10aedd213f892ba2159a32d271546bee30e2c10e42a2f6b40dce39dc74749473f72dc7 WHIRLPOOL 027197332780d44a8b28a71ef942acabef6942cabf51482794a4399c9263d9cb083dbe0c1a0dbddb1536458d8b4012b33af9775e358ab544997f2080fb86df2d
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
-DIST midori-0.4.8.tar.bz2 1047789 SHA256 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f SHA512 ec10fb836f824928cee2df4ca13d65b8436efd8f34af911884fb225b521d1f67dd44bdb5588cd36e0f2db802ed9d1d3c6852563f563b18e20416fcdf3dc3d349 WHIRLPOOL 607c49dd4269a588bd4c33445b3342aa7c785da458aea3abd10deb7c0ffb55a22024e7f1d293e9237b3cd54fc023a0afb70931ed5bdf99df7bd46d67bf889f42
-DIST midori-0.4.9.tar.bz2 1079713 SHA256 f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11 SHA512 02a1f6523c8912c916cbff930712ba87d42487f5f513e59c3adbaeaed533406874074635e96db87f3c4132e4221e60b126002785634d194bb5cbf2f602d3c321 WHIRLPOOL 9aa814b69cfbcb36f0dcb1ddff47c0fda38411cfd788f1c6b0bfd758f10db7ba8598144ef066b677404b85fca3bae408b0e8bb708a33cd1be11d4877644610b2
 DIST midori-0.5.0.tar.bz2 1093278 SHA256 d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0 SHA512 6e4552a2410f642e52d0e165225547b37b6c3f60eda0acb37bb12bd28c707cadfe1af96cf74a93e86b2a4d30f93a72705881b9aafcdfa658498fad168adbc399 WHIRLPOOL d948d1c47f3578903b1af938e8adcbc1805841a452cafb03bc64343a3f84b0d5625dbb812182fa22a6d00f1ee0d85b8cc7a2701c73cf058cc15756e9f3c8be5d
 EBUILD midori-0.4.6-r1.ebuild 2211 SHA256 48e90bc460897c622ae0632c15dc3c033645489e70744670da3b21886d551b69 SHA512 a1414ab2c4976f577f86a9108ad9806cb4f8eebe834b6360e02911ce3d9c34dbca06ab3e4dea5c61eed2a3dbe00cad85276812dbbf55c22c04a7160d89a3a074 WHIRLPOOL a401d18386e3b3556733962b1cc414fc463df4894db459b546b84e6e2c9eb7c7bdd0f916f99e4207c25cfcaaae176fa89acb79501f88a26dfc43e333707a6a25
-EBUILD midori-0.4.8.ebuild 2498 SHA256 e2911ebbbee983bf90264f2a36baaa7962fa35049e3fe38a45b5219f36193ee9 SHA512 033ac41fa5e736e3fb5007c7de7aabf6702792840a367609c091325fa9f624fb836a67912402a51e3555e638ed5f71ab8ec0dc354aeeba800be3cd968c69f4f0 WHIRLPOOL 212769f248a15a7c34058af7943b7288a224910cb2832c83583d6249e9f68f2c9bfabbc789042382503876844675e72ddcb36d957ad638cb3087df1beddbac8a
-EBUILD midori-0.4.9.ebuild 2511 SHA256 fbf24646bf60a4d55f2cc334c07126f7a11d69f3543e97de2416a3990f2bb51e SHA512 3a410147a4552a39e7a5a23faf2bc2cee97d5cb472c28cbb992686753ee26f985d468f515d77dcec711039675b87589b4ce7ceaa48a911b6fb1745b073093085 WHIRLPOOL 3a4bdecb13d8778b519592c4b3bfca4a841b531b61d7fe178ffc11bf219dd5d32358cf653f3d84267f7fad0fdfc84b36b580a1b28698083117c25910e2572d5f
 EBUILD midori-0.5.0.ebuild 2513 SHA256 60b01d1459c5575c0806f3bdc71c17b0bd78e83c79a71d89bc2f820a62c40d23 SHA512 0bf16b23b5dcfc19809efde76bc35307681dd2deef41364bcd24657b316c525cfde19876114962486a2c5526f6adcf6d42eb42b4fc3053283ab24f4fa6bcaed5 WHIRLPOOL 683859c8a96ee959d9f1dc25f147827f8640ff1c20e4796d39dd7e49055a38f2cf5864a6cbf985ac7d687ece4976b81c41315ca8a45a6a50b512a308622e5593
 EBUILD midori-9999.ebuild 2511 SHA256 291715cd6136e94f7ee05b717785be1c45f377cc0844953d7d9438599ee921dd SHA512 4a215b39d8016be8d6e4e8e684bba2563f52fb99e1a12f6096f6149c7c50dc5fd24ffffe4f19b0cef957c15d49de26a7cdf205ddbdb61b906a7effac23c9bc48 WHIRLPOOL 0c8c96938dee5f28f9d2e39f0ffa06c8c2b328c1dc322b6d32fae0f71748c6055d6235621839981246a95dc30e0986c7e47d89447654281ef6daee0c02e3d6d5
-MISC ChangeLog 15988 SHA256 723c6fe81f52809537fd870116c742859c66c256070c7ae017bc9ab0673edbb6 SHA512 60f65f037dde528a4c78d808d685596f83e0da2ad8a8f528be498938a905b2e6620630593ca5de59b188e3aa396eaa0d04c903eab93ddc2634d76a180fcfdccc WHIRLPOOL cf5c83d92d4f93588c4ef0dcde1d21850e39dcdc8ef5c89aa0ed5cfe1596e76f8405fadb4c94a143c5edc05d407a2fcb668df393ef97f03b06aa0179787116da
+MISC ChangeLog 16148 SHA256 ab9e7ba072e5658ee7fa79a5318541b075bcaa72b2144a4c2df2ef22017bd851 SHA512 2ca6ffb1021bb7746ec882832a787a18e9e7ce8a85f062957e1081b8a17a0b2357efd1fef1a2c8bfa011ef04898ba09278d624b970c96f68da631d074df5eece WHIRLPOOL dca2d82d29496f4761c794749544e7d96f6aefbd2789735befe9f8ce039b800ab714faf042f70dad5f8b8a6153580d1a3c00d9f2e62c5092045e609974f16d92
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFjxE8ACgkQmWq1bYTyC0Pf7gEAi2ud7qee/RnH74jYkoOIxsF0
-knqfCT8QDUqZ3JseSn8A/0QAsUeFn6HB+xnihrILn0MeiGzxICwYvsn6KC+oPYVY
-=QFgd
+iQEcBAEBCAAGBQJRZDpJAAoJEEdUh39IaPFN03kH/0ZWqqSN7XTOxoSmn+ueVZQi
+d+Q2mQ2jhCys4Wpg+gKMz+Yvpq3zymYrzIbpzqy5jTYiMBylQg9NWwQ0hZst8QRh
+OlBc+yRFlxsgkUy8qpSlYeTJvWZLoFf1Yx1OKkXABUawKc+T6OGv0DYBc3J2R/OP
+ash85F5bPPUMwY1Rmg0WN3Gk+wS9fteYm30oIFracbT0bIsOj/D4lFzJN9KJCBbF
+JPQ2kXOkUTVS+eNr1fAnX920PyOi5j2NDM2LKLzddq8qaEWkkcmIYMcQV+mxpG9i
+7V0qDWJcOMVthM+AU1wFOjsunZF+rYquSx2L85OTdJNsaHjFddos99ce1rJLDbc=
+=lOwU
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch b/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch
deleted file mode 100644
index 5ddc356e35f7..000000000000
--- a/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=435864
-http://bugs.launchpad.net/midori/+bug/1117543
-
---- data/midori.desktop.in
-+++ data/midori.desktop.in
-@@ -17,17 +17,17 @@
- X-Osso-Service=midori
- X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private
- 
--[TabNew Shortcut Group]
-+[X-TabNew Shortcut Group]
- _Name=New Tab
- Exec=midori -e TabNew
- TargetEnvironment=Unity
- 
--[WindowNew Shortcut Group]
-+[X-WindowNew Shortcut Group]
- _Name=New Window
- Exec=midori -e WindowNew
- TargetEnvironment=Unity
- 
--[Private Shortcut Group]
-+[X-Private Shortcut Group]
- _Name=New Private Browsing Window
- Exec=midori --private
- TargetEnvironment=Unity
---- data/midori-private.desktop.in
-+++ data/midori-private.desktop.in
-@@ -9,7 +9,7 @@
- Icon=midori
- Terminal=false
- StartupNotify=true
--NotShowIn=Pantheon
-+NotShowIn=X-Pantheon;
- X-Osso-Type=application/x-executable
- X-Osso-Service=midori
- 
diff --git a/www-client/midori/midori-0.4.8.ebuild b/www-client/midori/midori-0.4.8.ebuild
deleted file mode 100644
index 39e1167c271d..000000000000
--- a/www-client/midori/midori-0.4.8.ebuild
+++ /dev/null
@@ -1,110 +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.8.ebuild,v 1.4 2013/03/29 21:37:00 angelos 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 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:3
-		x11-libs/gtk+:3
-		unique? ( dev-libs/libunique:3 )
-		)
-	gnome? ( >=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
-
-# FIXME: The code is not compatible with X- in the names
-#	epatch "${FILESDIR}"/${P}-desktop_file_validation.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) \
-		--disable-granite \
-		--enable-addons \
-		$(use_enable nls) \
-		$(use_enable !deprecated gtk3) \
-		$(use_enable zeitgeist)
-}
-
-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.4.9.ebuild b/www-client/midori/midori-0.4.9.ebuild
deleted file mode 100644
index 9ff354518bac..000000000000
--- a/www-client/midori/midori-0.4.9.ebuild
+++ /dev/null
@@ -1,111 +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.9.ebuild,v 1.3 2013/03/31 19:10:56 pacho 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 )
-		)
-	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
-}