gnome-panel dependency is optional, bug #298932, thanks to Olaf for noticing.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

4 files changed, 15 insertions, 60 deletions

diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index 502592c894f5..54f5ad448524 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gnote
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.5 2010/01/11 23:20:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.6 2010/02/23 19:37:22 eva Exp $
+
+  23 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gnote-0.6.2.ebuild,
+  gnote-0.6.3.ebuild, gnote-0.7.1.ebuild:
+  gnome-panel dependency is optional, bug #298932, thanks to Olaf for
+  noticing.
 
 *gnote-0.7.1 (11 Jan 2010)
 
diff --git a/app-misc/gnote/gnote-0.6.2.ebuild b/app-misc/gnote/gnote-0.6.2.ebuild
deleted file mode 100644
index a38570ee9202..000000000000
--- a/app-misc/gnote/gnote-0.6.2.ebuild
+++ /dev/null
@@ -1,52 +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/gnote/gnote-0.6.2.ebuild,v 1.2 2009/08/26 21:54:04 eva Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="applet debug" # dbus
-
-RDEPEND=">=x11-libs/gtk+-2.14
-	>=dev-cpp/glibmm-2
-	>=dev-cpp/gtkmm-2.12
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	>=gnome-base/gconf-2
-	>=dev-libs/libpcre-7.8[cxx]
-	>=app-text/gtkspell-2.0.9
-	>=dev-libs/boost-1.34
-	sys-libs/e2fsprogs-libs
-	>=gnome-base/gnome-panel-2
-	applet? ( >=dev-cpp/libpanelappletmm-2.26 )"
-# Build with dbus is currently not implemented
-#	dbus? ( >=dev-libs/dbus-glib-0.70 )"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dbus
-		--disable-static
-		$(use_enable applet)
-		$(use_enable debug)"
-}
diff --git a/app-misc/gnote/gnote-0.6.3.ebuild b/app-misc/gnote/gnote-0.6.3.ebuild
index 7b6f4c291133..6d93779539cd 100644
--- a/app-misc/gnote/gnote-0.6.3.ebuild
+++ b/app-misc/gnote/gnote-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.6.3.ebuild,v 1.1 2009/12/13 21:51:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.6.3.ebuild,v 1.2 2010/02/23 19:37:22 eva Exp $
 
 EAPI="2"
 
@@ -24,8 +24,9 @@ RDEPEND=">=x11-libs/gtk+-2.14
 	>=app-text/gtkspell-2.0.9
 	>=dev-libs/boost-1.34
 	sys-libs/e2fsprogs-libs
-	>=gnome-base/gnome-panel-2
-	applet? ( >=dev-cpp/libpanelappletmm-2.26 )"
+	applet? (
+		>=gnome-base/gnome-panel-2
+		>=dev-cpp/libpanelappletmm-2.26 )"
 # Build with dbus is currently not implemented
 #	dbus? ( >=dev-libs/dbus-glib-0.70 )"
 DEPEND="${DEPEND}
diff --git a/app-misc/gnote/gnote-0.7.1.ebuild b/app-misc/gnote/gnote-0.7.1.ebuild
index eeab0a4c6bce..e7dc3d26ab99 100644
--- a/app-misc/gnote/gnote-0.7.1.ebuild
+++ b/app-misc/gnote/gnote-0.7.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/gnote/gnote-0.7.1.ebuild,v 1.1 2010/01/11 23:20:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.1.ebuild,v 1.2 2010/02/23 19:37:22 eva Exp $
 
 EAPI="2"
 
@@ -24,8 +24,9 @@ RDEPEND=">=x11-libs/gtk+-2.14
 	>=app-text/gtkspell-2.0.9
 	>=dev-libs/boost-1.34
 	sys-libs/e2fsprogs-libs
-	>=gnome-base/gnome-panel-2
-	applet? ( >=dev-cpp/libpanelappletmm-2.26 )"
+	applet? (
+		>=gnome-base/gnome-panel-2
+		>=dev-cpp/libpanelappletmm-2.26 )"
 # Build with dbus is currently not implemented
 #	dbus? ( >=dev-libs/dbus-glib-0.70 )"
 DEPEND="${DEPEND}