summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-misc/tomboy/ChangeLog8
-rw-r--r--app-misc/tomboy/tomboy-0.14.3.ebuild48
-rw-r--r--app-misc/tomboy/tomboy-1.1.1.ebuild48
-rw-r--r--app-misc/tomboy/tomboy-1.2.1.ebuild (renamed from app-misc/tomboy/tomboy-1.0.0.ebuild)11
4 files changed, 17 insertions, 98 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/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() {