Version bump. New USE flag "zeitgeist" for optional dev-libs/libzeitgeist dependency.

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

4 files changed, 136 insertions, 10 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 8bb0cb72e97c..cbbeaa0a51d1 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,13 @@
 # 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.97 2012/08/18 13:27:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.98 2012/09/20 08:30:56 ssuominen Exp $
+
+*midori-0.4.7 (20 Sep 2012)
+
+  20 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> +midori-0.4.7.ebuild,
+  midori-9999.ebuild, metadata.xml:
+  Version bump. New USE flag "zeitgeist" for optional dev-libs/libzeitgeist
+  dependency.
 
   18 Aug 2012; Johannes Huber <johu@gentoo.org> midori-0.4.6-r1.ebuild:
   Stable for x86, wrt bug #430270
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index 2653f68aafff..756f517676a1 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -5,5 +5,6 @@
   <use>
     <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
     <flag name='unique'>Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
+    <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
   </use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-0.4.7.ebuild b/www-client/midori/midori-0.4.7.ebuild
new file mode 100644
index 000000000000..0c201f7afd71
--- /dev/null
+++ b/www-client/midori/midori-0.4.7.ebuild
@@ -0,0 +1,108 @@
+# 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.7.ebuild,v 1.1 2012/09/20 08:30:56 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}
+
+VALA_VERSION=0.18
+
+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 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}
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/vala:${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_prepare() {
+	# TODO: Both zeitgeist and gcr should have ./configure switch!
+	use zeitgeist || { sed -i -e 's:zeitgeist:&dIsAbLe:' wscript || die; }
+
+	# Force disabled because we don't have this custom renamed in Portage
+	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	VALAC="$(type -P valac-${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
+}
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 66e7412050d0..4c94a72ffd13 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.42 2012/05/15 15:16:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.43 2012/09/20 08:30:56 ssuominen Exp $
 
 EAPI=4
 
@@ -16,19 +16,19 @@ fi
 
 inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
 
-PV_vala_version=0.16
+VALA_VERSION=0.18
 
 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"
+IUSE="+deprecated doc gnome libnotify nls +unique zeitgeist"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND=">=dev-db/sqlite-3.6.19:3
 	>=dev-libs/glib-2.22
 	dev-libs/libxml2
-	net-libs/libsoup:2.4
+	>=net-libs/libsoup-2.34:2.4
 	x11-libs/libXScrnSaver
 	deprecated? (
 		net-libs/webkit-gtk:2
@@ -36,15 +36,17 @@ RDEPEND="dev-db/sqlite:3
 		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.4 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
+	gnome? ( >=net-libs/libsoup-gnome-2.34:2.4 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
+	dev-lang/vala:${VALA_VERSION}
 	dev-util/intltool
 	gnome-base/librsvg
 	doc? ( dev-util/gtk-doc )
@@ -66,10 +68,18 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	# TODO: Both zeitgeist and gcr should have ./configure switch!
+	use zeitgeist || { sed -i -e 's:zeitgeist:&dIsAbLe:' wscript || die; }
+
+	# Force disabled because we don't have this custom renamed in Portage
+	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+}
+
 src_configure() {
 	strip-linguas -i po
 
-	VALAC="$(type -P valac-${PV_vala_version})" \
+	VALAC="$(type -P valac-${VALA_VERSION})" \
 	waf-utils_src_configure \
 		--disable-docs \
 		 $(use_enable doc apidocs) \