old

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 13 insertions, 183 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index cbbeaa0a51d1..b5d1ee7bffa4 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.98 2012/09/20 08:30:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.99 2012/10/21 11:18:48 ssuominen Exp $
+
+  21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.3.ebuild,
+  -midori-0.4.6.ebuild:
+  old
 
 *midori-0.4.7 (20 Sep 2012)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 224926181c3c..c6a9ce964dea 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -2,24 +2,21 @@
 Hash: SHA256
 
 AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794333c8bac966b163af259c7 SHA512 b7f5bb965fcbf513813138a6dbad4e56f02809baaf03077aa7f01e91b470a6149b76f81f51ef9a0241a9842e074e1abd33674c24a17479a84b3caab37e7ba678 WHIRLPOOL 9f4d1671e704de539f043321596f7a21b90317741484db93769a99793896e2d6796ce10ad48230dbe53bee471328f90318325fa66df46ee6fe984d60de8588b4
-DIST midori-0.4.3.tar.bz2 928660 SHA256 fca4a0eab03358f20d7700069dbf2faaf8fa5c11aaad97f4208aea608f4bed9f SHA512 98e08d85c3a2b1c0b52199967a2de1644580052f5e6bd0177714e71416e31a972b3dbd7d9791aa45731483c691d07f426796251d63e0c35ddebd93e61b9add82 WHIRLPOOL 365ce5ba7db3c7badfdc04db211e2abe1150f79d497c46d2f3a955b8a90bf349c2b4767b5c89a20ec284bd07bd786d4f7b09a057908e7df3791116a0a7f527eb
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.4.7.tar.bz2 1015921 SHA256 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d SHA512 2a943ef19cb21826b2239dbcd5180ad46240326bc8b5f87fbf6095ca99cea277cf92bb8ed9db8cf96761a8b1af31f4849c25a2bc27b80cd29d14f288875f9e9b WHIRLPOOL 7f7c94fefd3eae2c3d2a827da93b64d738db32d3cff4d27aeb8e7cdf511472943539392dbe62c55043aa41f53f507b0547d2af36898811f500963a42c1aa4ad7
-EBUILD midori-0.4.3.ebuild 1777 SHA256 0e36b52d3e0c902c2a7a20dcb3f65fa151cedd2c20ba684e90b5dfd8b423f890 SHA512 f827c006416a27a0937f3010fc1601a5954bc75165d18ae97038e721de80c53bb927f4d11aeca9cf2ff1e2cd51cb997d60a64139b160efd32e37c6142afffb88 WHIRLPOOL 86921cef1d519699fadafea1eebcf41b0ca3411a26c6d1db04b356aee7ba3172722dadb001d48c633b9b8bbb4e9581e471c7a661a6f26bb05ed2b6f7746bd41c
 EBUILD midori-0.4.6-r1.ebuild 2246 SHA256 02f9afa0790834dded6e7153ed1307fc1537497223c3066fa557fb5d4b765699 SHA512 f5a6dfd6e85a76cacdbf4d73957047cf37bb6c19174e14e586874a94abfa91f6973ccd45c128a4ca373f355aec05779e48f0587b22c3a2fc277e2d916636ca76 WHIRLPOOL 283c97500a5862f3f06e1f8b7ae279a5654c63a7d46598a41d1e7767198e8f05e32a0385a4281c9d887b6f14156d3e3fa4aaf48bc4cfbf893a197bc82efc93b8
-EBUILD midori-0.4.6.ebuild 2193 SHA256 2cefe9dde3232111d72382b83371d3122bae9de11d6d8c777a70e5aa8352f158 SHA512 38375d03f3c11609481481b7debd3d8d04947485dbcd9b03149d759ff9b4fdfdaa86f2d06f73f4aac9cd845b012dd26908b9d42b0526e72b4c3ca93589bb4fbe WHIRLPOOL dc9859cd1850bc67ba4259208bd534fff3bdc07ea9df428fce8fa54e641cca18f1c6ae027d7c948e19de43e6708ec5d42a9ec540a07cbbf21f96c4b7b7874263
 EBUILD midori-0.4.7.ebuild 2565 SHA256 4bf489ed7006afd7630df14ff5ebe88a8951c8d487c01ddf2a51ca320272a42a SHA512 ab3026fb0ae4db6bed7d0c3026fe9deb11318f6d9bc6cb69414443e361b892cc29dbc0c5c3ee2709bad7135f6fcd4befe5b4c2adef7bd0d5ef025bd3d4832166 WHIRLPOOL f48f77fe6283b701897d8b3686d3dd03a63ff035978ae448bdbab2269c88d6715835d15b0bbfb84d0eaac679e3954dc41527970add4bc332f272c1982b3a3320
 EBUILD midori-9999.ebuild 2565 SHA256 0ccd6215861949560e54957e1d74c60f5f1a1b6e74b8b6d13edf9b44a5aa0222 SHA512 c0041a39e4656bbeca4b580a8164aeb9ef0f1e1c64c5dab2a3448e37c9822b881f7e0681752621485338c2be080cf263ff87a0b80faeecb6d417b0189b979498 WHIRLPOOL 74a83bc793dd8493f7f97e59b952dc5fb92ee8e682c27ab6683628a5f5fd340384a529d7bbbf4c61aa465ca3b157fdffb2361a38e82b21642e8c461ea363d5d7
-MISC ChangeLog 14455 SHA256 26cbcd291c66c8e0c09ccd6b11cadab3168b8decd4bce40096b0c3be8af8f522 SHA512 2c57dd9307241eea8c07ceb6445c56c27fcd1d9228e8343f8c935eba78b375a9b40cbcfdccf3c28c3920794c035a50efc495ea61c3329b6743dffd0806e29857 WHIRLPOOL 625a931aff65980f92940f06363f37900a43a2106d7ef57f74dd269fc40a5bc4e35aa6943e0e5b76d319513db3547f168308c215dbb2a6adfcfb814cdf782bc7
+MISC ChangeLog 14562 SHA256 d968a1da6859824684d203bc7b4f3806597f6a4171f964a5f129436e58babf9e SHA512 f0eda981fe2aeafbb72009571f01d403e901d5845b7f8d0581d6baaa1a4003f3183f9f5f343bdfe4da5f16c452fc8b47b2ebf003f626ecace673180af62e651f WHIRLPOOL 0920d7e5a9f24b4056ff31a78df11df5ea4d899f8eba6bf3ccc0995d31f1e7d6a9b6a8dbd423da1dce3dfe4f8f778bdbf2631f4db095defb2c6ac4a2f62dc834
 MISC metadata.xml 468 SHA256 19eecb99ad642e6a8fbd63ed7f3d484eab5d11acb109734121b23e58710b9ba2 SHA512 2d5d7f847a8df75adb35d577658702b96d9838faff55f93e82188b9533f9929c405e1e811eec72ab2df2ab8067f63e8ddfb19da65ac25de42c1e9d56bbe0bc6e WHIRLPOOL a10dc65b031e62c8a20b5b365d3b0769083e1e609eab189cc1403719d66de2da3237dd254d6093091b7a1f7dd826e4f685161318c9bc5fb6ea22b17801b1acb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQWtPEAAoJEEdUh39IaPFNkgUIAIuRzT1rBVzZBz116PbP+W/v
-hqMcl4JfzXnynwm8FCn2ypeJThWMuFdpem6zVyrRmXA9vdk/x9RwIneppSRdlnSU
-gQc+yuEJ6SGIlenPqtOLAleVCK6QEgygVfyMznxqwjMJ2SU71mcFxUIKlcqmIIB7
-0ylwrQaCq4yBIvlB/LbJaKgq5FKGj5V0SfP7o68WENGZ4Just5aERYnxmBfYnS8s
-lw/UnooU5EDKan8PenlvxuBzKKBM9XHwWazMGnW5Qmb0pfE/zpxQpYUYgr4qU6UQ
-UNHhZxgsheEjq2rH3F+DEWw0CvaAONlLRSwRPgq21fjGA7P6JfyDlauo0ga8q5I=
-=f2zc
+iQEcBAEBCAAGBQJQg9kxAAoJEEdUh39IaPFNbusIAJH+Fp9mGfwpZve8RK4F/WJ2
+bF6ou3croKL3xuqgwUHvzntDIzDqYBQlTKQHU/+zHnplP3V7WVGK2zg7r6Qds7+T
+HLkxh52lDlvbcSnn9f59ie1lz22JpBKzAfNcQtIpDnTkbm/KLIYdTKYB/R/oxVrf
+sX3jjgCX94Mt2Rig1yTdxw+LIWVjWA8+sS6hkkd0vKCfic7EfA+38AjF9qd9qbGj
+KyyD6YbU0wgwhuBgmlvzCqfUhcbW1hYrHbsfdFzblv1brvJ15ekO8NMDjdeVSOsR
+hH7Pr1vzLLGlpKv3rOjAY/mJjst+7HSIhqkfQNIxTCBYfw/W9nCc7t4X3l2zyzk=
+=MOlS
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.4.3.ebuild b/www-client/midori/midori-0.4.3.ebuild
deleted file mode 100644
index 210799b175f7..000000000000
--- a/www-client/midori/midori-0.4.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.3.ebuild,v 1.3 2012/02/10 12:23:48 ssuominen Exp $
-
-EAPI=4
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-PV_vala_version=0.14
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE="doc gnome libnotify nls +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:3 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
-	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_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -P valac-${PV_vala_version})" \
-	waf-utils_src_configure \
-		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
-		--enable-addons \
-		$(use_enable nls) \
-		--enable-gtk3
-}
-
-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.6.ebuild b/www-client/midori/midori-0.4.6.ebuild
deleted file mode 100644
index a019c7c805cc..000000000000
--- a/www-client/midori/midori-0.4.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.4 2012/07/02 16:49:07 ssuominen Exp $
-
-EAPI=4
-
-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 ${_live_inherits}
-
-PV_vala_version=0.14
-
-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 )
-	dev-lang/vala:${PV_vala_version}
-	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_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -P valac-${PV_vala_version})" \
-	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
-}