8 files changed, 24 insertions, 70 deletions
diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index a536448ebcbc..07c21e95f39f 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tomboy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.12 2005/06/17 01:14:25 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.13 2005/08/10 23:08:57 latexer Exp $
+
+*tomboy-0.3.3 (10 Aug 2005)
+
+  10 Aug 2005; Peter Johanson <latexer@gentoo.org> -tomboy-0.3.1.ebuild,
+  -tomboy-0.3.2.ebuild, tomboy-0.3.2-r1.ebuild, +tomboy-0.3.3.ebuild:
+  Bump, and remove a few older versions.
 
 *tomboy-0.3.2-r1 (17 Jun 2005)
 
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 2960c2b63b88..57b13a8ed29f 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9978b552276448a9a6457a9e6da3e87e tomboy-0.3.2.ebuild 1113
 MD5 5f4f41842ff859b9ac623845975743dc tomboy-0.2.2-r1.ebuild 774
-MD5 936f819ac015ed12c012b4e070fa16be tomboy-0.3.2-r1.ebuild 1171
 MD5 e44a33fd7c332cb4c0fb3435ebec1593 tomboy-0.3.1.ebuild 1113
 MD5 5af272518f390aaca217c4ce3728c121 ChangeLog 2196
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
-MD5 17178389ed36e995fdc0b724a23e0af9 files/tomboy-0.3.2-mono-1.1.7-compat.diff 421
-MD5 b1bd635f28782f712b9b36b5aa2a3804 files/tomboy-0.3.2-1.1.x-compat.diff 567
+MD5 9978b552276448a9a6457a9e6da3e87e tomboy-0.3.2.ebuild 1113
+MD5 936f819ac015ed12c012b4e070fa16be tomboy-0.3.2-r1.ebuild 1171
+MD5 5df2c25b9d0902c7764f774281deacc3 tomboy-0.3.3.ebuild 1132
 MD5 63af496a835d4816dc76a26ef1a847ff files/digest-tomboy-0.2.2-r1 64
-MD5 f9b0cda18b91473b3e94744e50bb93fd files/digest-tomboy-0.3.2-r1 64
-MD5 b5e0ab8c69f352631980ececaee73635 files/tomboy-0.3.2-mono-1.1.8-compat.diff 1076
 MD5 a29ae36c54ef8ad24aad99ede4f6c01a files/tomboy-0.3.1-mono-1.1.4-compat.diff 6562
 MD5 a55d790d6f5b13436c5244a0e9465a27 files/digest-tomboy-0.3.1 64
+MD5 17178389ed36e995fdc0b724a23e0af9 files/tomboy-0.3.2-mono-1.1.7-compat.diff 421
+MD5 b1bd635f28782f712b9b36b5aa2a3804 files/tomboy-0.3.2-1.1.x-compat.diff 567
 MD5 f9b0cda18b91473b3e94744e50bb93fd files/digest-tomboy-0.3.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzRe3BXaUFmZvwyMRAnHxAJ4vN/SoArQW6ucbI+EDT2bW+QhfKQCgsy9V
-PRONl3/RNCbOcIbN0ByQ3HU=
-=jzLf
------END PGP SIGNATURE-----
+MD5 b5e0ab8c69f352631980ececaee73635 files/tomboy-0.3.2-mono-1.1.8-compat.diff 1076
+MD5 f9b0cda18b91473b3e94744e50bb93fd files/digest-tomboy-0.3.2-r1 64
+MD5 254359107fb454b3ea24427ccd7d534c files/digest-tomboy-0.3.3 64
diff --git a/app-misc/tomboy/files/digest-tomboy-0.3.1 b/app-misc/tomboy/files/digest-tomboy-0.3.1
deleted file mode 100644
index f0fefdef72bb..000000000000
--- a/app-misc/tomboy/files/digest-tomboy-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5011568beecbdd20768590470613fc9f tomboy-0.3.1.tar.gz 517928
diff --git a/app-misc/tomboy/files/digest-tomboy-0.3.2 b/app-misc/tomboy/files/digest-tomboy-0.3.2
deleted file mode 100644
index 14fa7d8e9823..000000000000
--- a/app-misc/tomboy/files/digest-tomboy-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb4c48860601e636e075644c40b973de tomboy-0.3.2.tar.gz 549963
diff --git a/app-misc/tomboy/files/digest-tomboy-0.3.3 b/app-misc/tomboy/files/digest-tomboy-0.3.3
new file mode 100644
index 000000000000..f2180c13dd79
--- /dev/null
+++ b/app-misc/tomboy/files/digest-tomboy-0.3.3
@@ -0,0 +1 @@
+MD5 7ad987216b484f747f53aa7f9055a46b tomboy-0.3.3.tar.gz 608252
diff --git a/app-misc/tomboy/tomboy-0.3.2-r1.ebuild b/app-misc/tomboy/tomboy-0.3.2-r1.ebuild
index b955e36e737d..b65abc397ce0 100644
--- a/app-misc/tomboy/tomboy-0.3.2-r1.ebuild
+++ b/app-misc/tomboy/tomboy-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.2-r1.ebuild,v 1.2 2005/07/07 11:53:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.2-r1.ebuild,v 1.3 2005/08/10 23:08:57 latexer Exp $
 
 inherit gnome2 mono eutils
 
@@ -27,10 +27,8 @@ DEPEND=">=dev-lang/mono-1.0
 		>=app-text/aspell-0.60.2
 		>=sys-apps/dbus-0.23
 		>=app-text/gtkspell-2"
-# Disable dbus for now, as it's causing some crashes
 
 DOCS="AUTHORS Changelog INSTALL NEWS README"
-#G2CONF="${G2CONF} --disable-dbus"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/tomboy/tomboy-0.3.2.ebuild b/app-misc/tomboy/tomboy-0.3.2.ebuild
deleted file mode 100644
index 80dd1f72064d..000000000000
--- a/app-misc/tomboy/tomboy-0.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.2.ebuild,v 1.3 2005/07/07 11:53:09 agriffis Exp $
-
-inherit gnome2 mono eutils
-
-DESCRIPTION="Desktop note-taking application"
-
-HOMEPAGE="http://www.beatniksoftware.com/tomboy/"
-SRC_URI="http://www.beatniksoftware.com/tomboy/releases/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.0
-		>=dev-dotnet/gtk-sharp-1.0.4-r1
-		>=dev-dotnet/gnome-sharp-1.0.4
-		>=dev-dotnet/gconf-sharp-1.0.4
-		=dev-dotnet/gtk-sharp-1.0*
-		=dev-dotnet/gnome-sharp-1.0*
-		=dev-dotnet/gconf-sharp-1.0*
-		>=gnome-base/gnome-panel-2.8.2
-		>=dev-libs/atk-1.2.4
-		>=app-text/aspell-0.60.2
-		>=sys-apps/dbus-0.23
-		>=app-text/gtkspell-2"
-# Disable dbus for now, as it's causing some crashes
-
-DOCS="AUTHORS Changelog INSTALL NEWS README"
-#G2CONF="${G2CONF} --disable-dbus"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-1.1.x-compat.diff || die
-	epatch ${FILESDIR}/${P}-mono-1.1.7-compat.diff || die
-}
-
diff --git a/app-misc/tomboy/tomboy-0.3.1.ebuild b/app-misc/tomboy/tomboy-0.3.3.ebuild
index 5cd30693a2f8..1a0f1740aa64 100644
--- a/app-misc/tomboy/tomboy-0.3.1.ebuild
+++ b/app-misc/tomboy/tomboy-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.1.ebuild,v 1.6 2005/07/07 11:53:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.3.ebuild,v 1.1 2005/08/10 23:08:57 latexer Exp $
 
 inherit gnome2 mono eutils
 
@@ -12,8 +12,8 @@ SRC_URI="http://www.beatniksoftware.com/tomboy/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc"
 
 DEPEND=">=dev-lang/mono-1.0
 		>=dev-dotnet/gtk-sharp-1.0.4-r1
@@ -25,17 +25,17 @@ DEPEND=">=dev-lang/mono-1.0
 		>=gnome-base/gnome-panel-2.8.2
 		>=dev-libs/atk-1.2.4
 		>=app-text/aspell-0.60.2
+		>=sys-apps/dbus-0.23
 		>=app-text/gtkspell-2"
 # Disable dbus for now, as it's causing some crashes
-		#>=sys-apps/dbus-0.23
 
 DOCS="AUTHORS Changelog INSTALL NEWS README"
-G2CONF="${G2CONF} --disable-dbus"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-mono-1.1.4-compat.diff || die
-	epatch ${FILESDIR}/${PN}-0.3.2-mono-1.1.7-compat.diff || die
+	#epatch ${FILESDIR}/${P}-1.1.x-compat.diff || die
+	#epatch ${FILESDIR}/${P}-mono-1.1.7-compat.diff || die
+	#epatch ${FILESDIR}/${P}-mono-1.1.8-compat.diff || die
 }