[gentoo-commits] proj/gnome:master commit in: app-misc/gnote/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     37ea194da59d86896e84b9d6677e46448f7a4f6f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 11:33:14 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 11:33:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=37ea194d

app-misc/gnote: 0.8.4 → 3.6.0

---
 .../{gnote-9999.ebuild => gnote-3.6.0.ebuild}      |   36 ++++++++++----------
 app-misc/gnote/gnote-9999.ebuild                   |   36 ++++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-3.6.0.ebuild
similarity index 69%
copy from app-misc/gnote/gnote-9999.ebuild
copy to app-misc/gnote/gnote-3.6.0.ebuild
index b6ddbb1..18fd8f9 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-3.6.0.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.4.ebuild,v 1.1 2011/05/02 21:02:38 eva Exp $
 
 EAPI="4"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
@@ -20,36 +21,35 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="applet debug"
+IUSE="debug"
 
-RDEPEND=">=x11-libs/gtk+-3.0:3
+RDEPEND="
+	>=app-crypt/libsecret-0.8
 	>=dev-cpp/glibmm-2.28:2
-	>=dev-cpp/gtkmm-3.0:3.0
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=dev-libs/libpcre-7.8:3[cxx]
+	>=dev-cpp/gtkmm-3.4:3.0
 	>=dev-libs/boost-1.34
+	>=dev-libs/libxml2-2:2
 	>=sys-apps/util-linux-2.16
-	applet? ( >=gnome-base/gnome-panel-3 )"
+	>=x11-libs/gtk+-3.0:3
+	dev-libs/libxslt
+	x11-libs/libX11
+"
 DEPEND="${DEPEND}
-	>=dev-util/intltool-0.35.0
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig"
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		$(use_enable applet)
 		$(use_enable debug)"
-}
 
-src_prepare() {
-	gnome2_src_prepare
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
 
-	# Do not set idiotic defines in a released tarball, bug #311979
-	sed 's/-DG.*_DISABLE_DEPRECATED//g' -i libtomboy/Makefile.* ||
-		die "sed failed"
+	gnome2_src_prepare
 }

diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-9999.ebuild
index b6ddbb1..18fd8f9 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.4.ebuild,v 1.1 2011/05/02 21:02:38 eva Exp $
 
 EAPI="4"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
@@ -20,36 +21,35 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="applet debug"
+IUSE="debug"
 
-RDEPEND=">=x11-libs/gtk+-3.0:3
+RDEPEND="
+	>=app-crypt/libsecret-0.8
 	>=dev-cpp/glibmm-2.28:2
-	>=dev-cpp/gtkmm-3.0:3.0
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=dev-libs/libpcre-7.8:3[cxx]
+	>=dev-cpp/gtkmm-3.4:3.0
 	>=dev-libs/boost-1.34
+	>=dev-libs/libxml2-2:2
 	>=sys-apps/util-linux-2.16
-	applet? ( >=gnome-base/gnome-panel-3 )"
+	>=x11-libs/gtk+-3.0:3
+	dev-libs/libxslt
+	x11-libs/libX11
+"
 DEPEND="${DEPEND}
-	>=dev-util/intltool-0.35.0
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig"
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		$(use_enable applet)
 		$(use_enable debug)"
-}
 
-src_prepare() {
-	gnome2_src_prepare
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
 
-	# Do not set idiotic defines in a released tarball, bug #311979
-	sed 's/-DG.*_DISABLE_DEPRECATED//g' -i libtomboy/Makefile.* ||
-		die "sed failed"
+	gnome2_src_prepare
 }