Version bump for Gnome 2.32 (but also works with 2.30). Applet is now optional but enabled by default until gnome-shell becomes the preferred on Gnome. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 29 insertions, 105 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 191484398abb..8c3bb6d305ca 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/tomboy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.104 2010/09/11 18:56:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.105 2010/10/06 18:27:53 pacho Exp $
+
+*tomboy-1.4.0 (06 Oct 2010)
+
+  06 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/tomboy-0.8.1-insecure-ldpath.patch, -tomboy-0.12.2.ebuild,
+  -tomboy-1.0.1.ebuild, +tomboy-1.4.0.ebuild, metadata.xml:
+  Version bump for Gnome 2.32 (but also works with 2.30). Applet is now
+  optional but enabled by default until gnome-shell becomes the preferred on
+  Gnome. Remove old.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> tomboy-1.2.1.ebuild:
   Marked ppc for bug #324077.
diff --git a/app-misc/tomboy/files/tomboy-0.8.1-insecure-ldpath.patch b/app-misc/tomboy/files/tomboy-0.8.1-insecure-ldpath.patch
deleted file mode 100644
index b2133139fe0f..000000000000
--- a/app-misc/tomboy/files/tomboy-0.8.1-insecure-ldpath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: Tomboy/tomboy-panel.in
-===================================================================
---- Tomboy/tomboy-panel.in	(revision 1611)
-+++ Tomboy/tomboy-panel.in	(working copy)
-@@ -1,6 +1,6 @@
--#!/bin/sh
-+#!/bin/sh
- 
--export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-+export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
- export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- 
-Index: Tomboy/tomboy.in
-===================================================================
---- Tomboy/tomboy.in	(revision 1611)
-+++ Tomboy/tomboy.in	(working copy)
-@@ -1,15 +1,15 @@
--#!/bin/sh
-+#!/bin/sh
- 
- if [ "x$PWD" = "x@srcdir@" ] ; then
-     echo "*** Running uninstalled @target@ ***"
- 
--    export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH:./Addins/PrintNotes/.libs"
-+    export LD_LIBRARY_PATH="../libtomboy/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:./Addins/PrintNotes/.libs"
-     export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-     export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
- 
-     THIS_EXE="--debug ./@target@"
- else
--    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-+    export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-     export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
-     export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- 
diff --git a/app-misc/tomboy/metadata.xml b/app-misc/tomboy/metadata.xml
index 81d64aa36cdf..7edb5202ca7b 100644
--- a/app-misc/tomboy/metadata.xml
+++ b/app-misc/tomboy/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 <use>
-  <flag name='galago'>Add support for the galago desktop presence framework
-    (<pkg>dev-dotnet/galago-sharp</pkg>)</flag>
+	<flag name="applet">Enable tomboy applet for
+		<pkg>gnome-base/gnome-panel</pkg></flag>
+	<flag name='galago'>Add support for the galago desktop presence framework
+		(<pkg>dev-dotnet/galago-sharp</pkg>)</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/tomboy/tomboy-0.12.2.ebuild b/app-misc/tomboy/tomboy-0.12.2.ebuild
deleted file mode 100644
index b81453f8b63c..000000000000
--- a/app-misc/tomboy/tomboy-0.12.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.12.2.ebuild,v 1.5 2010/07/03 17:20:00 pacho Exp $
-
-EAPI=2
-
-inherit eutils gnome2 mono
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://www.beatniksoftware.com/tomboy/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc eds galago"
-
-RDEPEND=">=dev-lang/mono-2
-	 >=dev-dotnet/gtk-sharp-2.12.6-r1
-	 >=dev-dotnet/gconf-sharp-2.24.0
-	 >=dev-dotnet/gnome-sharp-2.24.0
-	 >=dev-dotnet/gnome-panel-sharp-2.24.0
-	 >=dev-dotnet/gnome-desktop-sharp-2.16.1
-	 >=dev-dotnet/dbus-sharp-0.4
-	 >=dev-dotnet/dbus-glib-sharp-0.3
-	 >=dev-dotnet/mono-addins-0.3
-	 >=x11-libs/gtk+-2.12.0
-	 >=dev-libs/atk-1.2.4
-	 >=gnome-base/gconf-2
-	 >=app-text/gtkspell-2.0.9
-	 >=gnome-base/gnome-panel-2.24.0
-	 eds? ( dev-libs/gmime:2.4[mono] )
-	 galago? ( =dev-dotnet/galago-sharp-0.5* )
-	 >=gnome-base/libgnomeprintui-2.18.3
-	 >=gnome-base/libgnomeprint-2.2"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/rarian
-	dev-libs/libxml2[python]
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-src_prepare() {
-	sed -i -e 's:gmime-sharp:gmime-sharp-2.4:g' configure || die "sed failed"
-}
-
-src_configure() {
-	G2CONF="${G2CONF} $(use_enable galago) $(use_enable eds evolution) --with-mono-addins=system"
-	gnome2_src_configure
-}
-
-src_compile() {
-	default
-}
diff --git a/app-misc/tomboy/tomboy-1.0.1.ebuild b/app-misc/tomboy/tomboy-1.4.0.ebuild
index 7a2fd1b2b053..b39e79a2b824 100644
--- a/app-misc/tomboy/tomboy-1.0.1.ebuild
+++ b/app-misc/tomboy/tomboy-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.0.1.ebuild,v 1.4 2010/07/03 17:20:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.0.ebuild,v 1.1 2010/10/06 18:27:53 pacho Exp $
 
 EAPI=2
 
@@ -11,8 +11,8 @@ HOMEPAGE="http://www.beatniksoftware.com/tomboy/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="eds galago"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+applet eds galago"
 
 RDEPEND=">=dev-lang/mono-2
 	>=dev-dotnet/gtk-sharp-2.12.6-r1
@@ -31,19 +31,24 @@ RDEPEND=">=dev-lang/mono-2
 	eds? ( dev-libs/gmime:2.4[mono] )
 	galago? ( =dev-dotnet/galago-sharp-0.5* )"
 DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
+	>=app-text/gnome-doc-utils-0.17.3
 	app-text/rarian
 	dev-libs/libxml2[python]
 	sys-devel/gettext
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35"
 
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' $(find . -name 'Makefile.in') || die
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable applet panel-applet)
+		$(use_enable eds evolution)
+		$(use_enable galago)
+		--disable-update-mimedb"
 }
 
-src_configure() {
-	gnome2_src_configure $(use_enable galago) $(use_enable eds evolution)
-}
+src_compile() {
+	# Not parallel build safe due upstream bug #631546
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
+}
\ No newline at end of file