old

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

3 files changed, 5 insertions, 172 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/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
-}