3 files changed, 5 insertions, 139 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 88f02924f050..dbc626ba7aae 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.75 2011/11/28 23:48:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.76 2011/11/28 23:49:46 ssuominen Exp $
+
+  28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.1.ebuild,
+  -midori-0.4.2.ebuild:
+  old
 
 *midori-0.4.2-r300 (28 Nov 2011)
 
diff --git a/www-client/midori/midori-0.4.1.ebuild b/www-client/midori/midori-0.4.1.ebuild
deleted file mode 100644
index eabfd0bfea7b..000000000000
--- a/www-client/midori/midori-0.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.1.ebuild,v 1.2 2011/10/28 20:08:10 ssuominen Exp $
-
-EAPI=3
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-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}/0.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="doc gnome idn libnotify nls +unique"
-
-RDEPEND="dev-libs/libxml2:2
-	>=dev-db/sqlite-3.0
-	>=net-libs/libsoup-2.25.2:2.4
-	net-libs/webkit-gtk:2
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	idn? ( net-dns/libidn )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:0.10
-	dev-util/intltool
-	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-0.10)" \
-	waf-utils_src_configure \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable unique)
-}
-
-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.2.ebuild b/www-client/midori/midori-0.4.2.ebuild
deleted file mode 100644
index ba6d8ccf397e..000000000000
--- a/www-client/midori/midori-0.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.2.ebuild,v 1.1 2011/11/11 16:35:40 angelos Exp $
-
-EAPI=4
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-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}/0.4/${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-libs/libxml2:2
-	dev-db/sqlite:3
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:2
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:0.10
-	dev-util/intltool
-	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-0.10)" \
-	waf-utils_src_configure \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable unique)
-}
-
-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
-}