Go eapi-2, try to make the depends tighter, bug 249038.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

3 files changed, 26 insertions, 26 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 47dc8cbc1262..ac3493ccc3f4 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/tomboy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.74 2008/11/26 15:31:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.75 2008/11/26 23:22:53 loki_val Exp $
+
+  26 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> tomboy-0.12.1.ebuild:
+  Go eapi-2, try to make the depends tighter, bug 249038.
 
   26 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> tomboy-0.12.1.ebuild:
   We need to dep on gnome-desktop-sharp too. Thanks to thansen for reporting
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 452a66966f66..e66405adeda5 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -2,6 +2,6 @@ AUX tomboy-0.8.1-insecure-ldpath.patch 1442 RMD160 bd28d17a16e144d64628b51d9101f
 DIST tomboy-0.10.2.tar.bz2 3623097 RMD160 5d0364272953bff4b391094a9ea7b2cbf53fe708 SHA1 2866d84f30eaf78f2be984828621849c136a3b7d SHA256 ec2dc39fea2df6b9c520a6b5e493f857e97a0b43116d114a986e4acff674e9f3
 DIST tomboy-0.12.1.tar.bz2 4406611 RMD160 1704427e77d903b1d67602e2918e96f185d3a6f0 SHA1 4b7f5b2153e6d396ad9ddbb8ef7f41b3f383770d SHA256 a87fde95bc9848407bf9c6c735b1c50d4b6843740818cf34c361f16d331d4856
 EBUILD tomboy-0.10.2.ebuild 1669 RMD160 82429e5c09e0cf964386f25a73567ea7df5b2bd7 SHA1 e853b0449962ee18456badb796a2181ed2f8c01f SHA256 5603b8ef83df4a56404de6965b5d77fbed1c761bc95de11b7856d252733d97f3
-EBUILD tomboy-0.12.1.ebuild 1688 RMD160 2c1089a108515e31b72a329ec85fed8dd5794fca SHA1 6cf7c53eb0ce99490d5b31c1c07e22c9db91d61c SHA256 56dea95a99cb9288231e904db35d01bb2a804c6d03f7f7bc8a0f2748ab09220f
-MISC ChangeLog 11274 RMD160 c58e7abb17b3a7c3f73ef9f8503b51455692b72b SHA1 ac4ffd8ba71859dba305ad8b10999f7cfa0ef42a SHA256 7395d00abf99177e9b955cae37c6812a375d81d6afd7f77ddb184fc0d9146588
+EBUILD tomboy-0.12.1.ebuild 1369 RMD160 6d90170e6031ccc5b43ddb38d6efc20077e200e4 SHA1 52249744ab7d7f9315d12f1d86e01cf87a6ad906 SHA256 e655c2c3c8dd26832c3eaac3d11f0b5469c4c06bcd9d4cf1cc68f267fe37586c
+MISC ChangeLog 11408 RMD160 21363458fdf8fc5190369af32ea2b05eb616d3db SHA1 73250dd06a3d52b7b48cfa7fe87b2c9cf3f33c4b SHA256 e0fdd4382d9817d743b3ca317dbc4840cd02afb8729865e69d60c9c017a89a41
 MISC metadata.xml 360 RMD160 8e6da5c98dbdbe4c21cc98efdafe8c9bee2bd959 SHA1 1bec2dafbffea3b465b73fd22218085e45fee92a SHA256 675efa34abcee7bf48d055f873fbe7ef56a50a3e5fd6c02bc01b6ec7ee3b47e0
diff --git a/app-misc/tomboy/tomboy-0.12.1.ebuild b/app-misc/tomboy/tomboy-0.12.1.ebuild
index ab4aba6d1dce..3bad48cc5a5f 100644
--- a/app-misc/tomboy/tomboy-0.12.1.ebuild
+++ b/app-misc/tomboy/tomboy-0.12.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.12.1.ebuild,v 1.3 2008/11/26 15:31:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.12.1.ebuild,v 1.4 2008/11/26 23:22:53 loki_val Exp $
+
+EAPI=2
 
 inherit eutils gnome2 mono
 
@@ -12,42 +14,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc eds galago"
 
-RDEPEND=">=dev-lang/mono-1.9
-		 >=dev-dotnet/gtk-sharp-2.10.4
-		 >=dev-dotnet/gconf-sharp-2
-		 >=dev-dotnet/gnome-sharp-2.16.1
+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.10.0
+		 >=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.8.2
-		 eds? ( dev-libs/gmime )
+		 >=gnome-base/gnome-panel-2.24.0
+		 eds? ( dev-libs/gmime[mono] )
 		 galago? ( =dev-dotnet/galago-sharp-0.5* )
-		 >=gnome-base/libgnomeprintui-2.18.3"
+		 >=gnome-base/libgnomeprintui-2.18.3
+		 >=gnome-base/libgnomeprint-2.2"
 DEPEND="${RDEPEND}
-		  dev-libs/libxml2
+		  dev-libs/libxml2[python]
 		  sys-devel/gettext
 		  dev-util/pkgconfig
 		>=dev-util/intltool-0.35"
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
-pkg_setup() {
-	if ! built_with_use 'dev-libs/libxml2' 'python' ; then
-		eerror "Please build libxml2 with the python USE-flag"
-		einfo "echo \"dev-libs/libxml2 python\" >> /etc/portage/package.use"
-		die "dev-libs/libxml2 without python bindings detected"
-	fi
-
-	if use eds && ! built_with_use 'dev-libs/gmime' mono ; then
-		eerror "Please build gmime with the mono USE-flag"
-		einfo "echo \"dev-libs/gmime mono\" >> /etc/portage/package.use"
-		die "gmime without mono support detected"
-	fi
-
+src_configure() {
 	G2CONF="${G2CONF} $(use_enable galago) $(use_enable eds evolution) --with-mono-addins=system"
+	gnome2_src_configure
+}
+
+src_compile() {
+	default
 }