Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 23 insertions, 108 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 54f4cb224315..8ce436696ed9 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.98 2010/06/04 21:00:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.99 2010/06/13 21:34:41 pacho Exp $
+
+*tomboy-1.2.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -tomboy-0.14.3.ebuild,
+  -tomboy-1.0.0.ebuild, -tomboy-1.1.1.ebuild, +tomboy-1.2.1.ebuild:
+  Add new version for Gnome 2.30 and drop old testing.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> tomboy-1.0.1.ebuild:
   x86 stable, bug #314899
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 0abe66fc2c79..b0891d84d34a 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -3,21 +3,17 @@ Hash: SHA1
 
 AUX tomboy-0.8.1-insecure-ldpath.patch 1442 RMD160 bd28d17a16e144d64628b51d9101f74f8e59a2ce SHA1 8faa1e0ef1dadb9847cc44c58fd411c22847fe2b SHA256 feeb4caf13e562a3cfae8b437024eb07a35165684c7aac185722b6d88e3d5f9d
 DIST tomboy-0.12.2.tar.bz2 4406374 RMD160 54fb2bba82b25f886f91204c9c84ce02551da355 SHA1 e9587f9db261120223c1b60b2024d158a9bc3de4 SHA256 7a870d99d3c4758ad9a94fd56fd55cae9639a872321f8b23cf43cd4efdbc995f
-DIST tomboy-0.14.3.tar.bz2 5267497 RMD160 b3f35ea166c72dc4ad2a9936bb46d8d1f4419fbb SHA1 52bc611f0447099880581e41905c17752ace6955 SHA256 126e22543c221021848d7bfc74eca9286238f2ebe7383d602f09710cd4ecc9e0
-DIST tomboy-1.0.0.tar.bz2 5862243 RMD160 36c1b75c0041756c16ded7024cee0159a861d44f SHA1 bfe65920cb563ba5a66a6c74f2f9616757b899cc SHA256 e92a5babd6d105a8b0ce0d9de9ce9bfe7d0d6602ba1cc62b79e1a8882d5bf84e
 DIST tomboy-1.0.1.tar.bz2 6485124 RMD160 d6dcbae55cdefd3e98dfc8bd7f423c4b8501374c SHA1 8e92a7fcb6081cc6da68c9ca7975de7920e068ba SHA256 d52dadfad56f175bff2d806d269ad2427841c1958554f5a198993265cb9a18de
-DIST tomboy-1.1.1.tar.bz2 6495936 RMD160 3d7518493d3a6c1e773cf8851ba2b7c1553bef8a SHA1 de16a54a0a5ea9c0a0c5b2426c90f5c6aed13d50 SHA256 691c6375cc465673a366adbc83a8eb8071330977aef2f1887e087f5457c0cf01
+DIST tomboy-1.2.1.tar.bz2 6548915 RMD160 ddd17f0c53fd82490e66a2e7e769e5846a2ff0f4 SHA1 cf50b648dc40cf1ea066647ce6a6e818d160de26 SHA256 9cb69d399e25e2a773cce5518c60b65dfdb70a46f487527e38cc013688762f99
 EBUILD tomboy-0.12.2.ebuild 1491 RMD160 a0e5b86906ff7deb73aced465bfb24f787a1dbcb SHA1 8df08b8ccef0487fc0c5a00340967c982df80b36 SHA256 08ed17edf11fc136f810b8bc2afb10af7a003265e3ed8d692732f70f5e974416
-EBUILD tomboy-0.14.3.ebuild 1301 RMD160 eafc63fa184cc860e33ae0d909b601c3d359cac8 SHA1 f30d60dcd3b9287bd2e1c4442650e1a950a6d437 SHA256 93a5100f329a2d9ea185957a316c033501dadce0df57e19362f0f59682b96e7e
-EBUILD tomboy-1.0.0.ebuild 1295 RMD160 d4a50dc262c8452ac7a09630075d10bdc552ebf3 SHA1 ae1200960e7fd8a3c074486e78f816395032127f SHA256 e51d531931b50f1af80e8588d343631c665f53417b847143df8f18cfdd27da1e
 EBUILD tomboy-1.0.1.ebuild 1294 RMD160 b23a9b9544122aab5ea9d25b4d35ba5273083906 SHA1 62eb7977aa695f9e1375a58eab16cfc2ee4957fa SHA256 9100bf6164beb4528ee3933b2f8f14f67ce4d1c1a4c24cc5e0e730c0a22ce31b
-EBUILD tomboy-1.1.1.ebuild 1295 RMD160 9a0c128324ae5b882a314bb642b5cee8f6f4a684 SHA1 129822308e1262e4cecc2faf975d7b9772ec699a SHA256 df6eb913363ea607c12fef642fbd1aeed2037cc68664ce1dbd4d7d718272c371
-MISC ChangeLog 14601 RMD160 118c5e536433945ce83ad52c2ae5b5a95ae2cd3c SHA1 eea50b199937d2e1bc07e45299e961c059e5616b SHA256 0ec7cb5df7f6a019511ad8059fd636dc44cbfc7f567354abe837352b118d5a09
+EBUILD tomboy-1.2.1.ebuild 1500 RMD160 c598bab942644e4e9d41342cd25ff0e0ee1974af SHA1 d71c4de2571c62db0a11e5bd319c14455a15ee50 SHA256 cdc4d8ec6992fad718adf3ecd234441beaa689e7ab13de9bccc28675f469f519
+MISC ChangeLog 14822 RMD160 8da9b4585fcf05ac87f3065d59177a9ec2f9a366 SHA1 0157351f0e807f4ae000c1eab23860a808f57e92 SHA256 043a1178868d7806068a8c9f1efb30aab34a5e0e69d5151170e64fcda58365ad
 MISC metadata.xml 296 RMD160 f5b0101980d9dd3b951b3dfef290e1679138a92e SHA1 165381c2e60b10418d05a8b2971f3225d764c45e SHA256 4d85bd538eb78ee19cb84fff77b6e02fc5112e8b07501eec990263b896676660
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJaP0ACgkQkKaRLQcq0GJhrACcDfuljaGdEcJnvYSIQB6bs0bd
-y1sAoK7BTtNFGLlfZ0SBjrMB/TN/WGmT
-=X4N6
+iEYEARECAAYFAkwVTvYACgkQCaWpQKGI+9SBcwCfUiR6VBh1V77stCssQ4dXglNs
+d9MAn2NVRdmp7yMdEM8GquSbmIs8KVAo
+=KzR/
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tomboy/tomboy-0.14.3.ebuild b/app-misc/tomboy/tomboy-0.14.3.ebuild
deleted file mode 100644
index dbc2fa7e1e0b..000000000000
--- a/app-misc/tomboy/tomboy-0.14.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.14.3.ebuild,v 1.1 2009/08/04 17:49:47 ford_prefect 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="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.24.0
-	>=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:0[mono] )
-	galago? ( =dev-dotnet/galago-sharp-0.5* )"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	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 '/DISABLE_DEPRECATED/d' $(find . -name 'Makefile.in') || die
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable galago) $(use_enable eds evolution)
-}
diff --git a/app-misc/tomboy/tomboy-1.1.1.ebuild b/app-misc/tomboy/tomboy-1.1.1.ebuild
deleted file mode 100644
index 3433083c3d0b..000000000000
--- a/app-misc/tomboy/tomboy-1.1.1.ebuild
+++ /dev/null
@@ -1,48 +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-1.1.1.ebuild,v 1.2 2010/04/16 09:18:09 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="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.24.0
-	>=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* )"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	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 '/DISABLE_DEPRECATED/d' $(find . -name 'Makefile.in') || die
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable galago) $(use_enable eds evolution)
-}
diff --git a/app-misc/tomboy/tomboy-1.0.0.ebuild b/app-misc/tomboy/tomboy-1.2.1.ebuild
index 5571daf261b2..8f01a38edc0e 100644
--- a/app-misc/tomboy/tomboy-1.0.0.ebuild
+++ b/app-misc/tomboy/tomboy-1.2.1.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.0.ebuild,v 1.2 2010/04/16 09:18:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.2.1.ebuild,v 1.1 2010/06/13 21:34:41 pacho Exp $
 
 EAPI=2
 
@@ -39,8 +39,17 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb"
+}
+
 src_prepare() {
 	sed -i -e '/DISABLE_DEPRECATED/d' $(find . -name 'Makefile.in') || die
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }
 
 src_configure() {