app-misc/gnote: bump to 0.5.0

    * Sticky Notes import addin.
    * Import from Tomboy on first startup. (Closes #578981)
    * Now uses libpcrepp for regex support
    * Drop libxmlpp usage

3 files changed, 6 insertions, 74 deletions

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 0246eec9..b5b45547 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,7 +1,5 @@
 AUX gnote-0.3.1-automagic.patch 2853 RMD160 4c0ef593113c780e812cf2690390f0146728381f SHA1 c79a48e3feac4446bff32501cf2cf065df2aa64e SHA256 0d9ea331b24acf533a276ca7e048151f71c9355241bbb0fc1b5c21315d38dc75
 AUX gnote-0.3.1-boost-update-v10.patch 22669 RMD160 304995d3c1d988ec4a7dd009be65f7f3bacc6974 SHA1 10ff73addf831a84ac695a10f1bd83f0cdd62b09 SHA256 1f9767ec6c026c69e80d8c7f4633fa2567e7e94b5aee415943acd4f79ab52243
 AUX gnote-0.3.1-fix-ldflags-as-needed.patch 883 RMD160 5c92d8180b5483d9edcd94c461aa6a4a798757b5 SHA1 5f1dddedee0c2aa7b23a2dcbf31f6986ea773192 SHA256 d3cf4c251f2a480a65d5c544c9d0e219f7423dff65992e3ee56474c28e7707f1
-DIST gnote-0.3.1.tar.bz2 1485612 RMD160 a7dfabadcb777365b9e160bb6d4b7df429c2efd7 SHA1 082cf2c402241eec5f88663b214b39326966cad1 SHA256 73436300e5699a4ef3a3cee6c0e5fe7bbfbf8c42800f1500767b67c86147c1b0
-DIST gnote-0.4.0.tar.bz2 1538371 RMD160 ee670223fedd01f2d0f6f8f29345e03cefc15ba7 SHA1 9c997d0020e42ab1be58d28574551ccfbaea696f SHA256 04a7ba40e29ef766099409a09d6687e697ed404d49676d54e9c8a39bd2f15041
-EBUILD gnote-0.3.1.ebuild 1327 RMD160 19589b0d1c38e901fb9b7e1a2d42e504a5c11ee2 SHA1 1e06475360b7bbab617337bd6a2ae6c33f047bc4 SHA256 c24367190bc3503f54077de590313dd539288cbf661af8a05c2f8df77c34c86e
-EBUILD gnote-0.4.0.ebuild 1285 RMD160 89ddefc94de945176f0019d7a684730ab9088bfb SHA1 0706e63fbcdb49577964081efb2313300dd70019 SHA256 2980e774ef5b308979fc898f1f611e3b44883e6adf6ca56d9d4937c45e810abe
+DIST gnote-0.5.0.tar.bz2 1134441 RMD160 f7b69baf3dc9bb7f99c7303e76b58a1fe95be1dd SHA1 2c24d832caa484e217da4912c60f90b57dfab0b3 SHA256 19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2
+EBUILD gnote-0.5.0.ebuild 1176 RMD160 76183e9dee513d7db8770f988474cd6e07da18d7 SHA1 f752ad7acf8e713bb741b89f2d068972bcacdafb SHA256 0738934da9b4d59d0af760bb9a00acfa4d9c0ca260641db21ec542d7944dc4b5
diff --git a/app-misc/gnote/gnote-0.3.1.ebuild b/app-misc/gnote/gnote-0.3.1.ebuild
deleted file mode 100644
index bf97547d..00000000
--- a/app-misc/gnote/gnote-0.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug" # dbus
-
-RDEPEND=">=x11-libs/gtk+-2.14
-	>=dev-cpp/glibmm-2
-	>=dev-cpp/gtkmm-2.12
-	>=dev-libs/libxml2-2
-	>=dev-cpp/libxmlpp-2.6
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/gtkspell-2.0.9
-	>=dev-libs/boost-1.34
-	sys-libs/e2fsprogs-libs
-	>=gnome-base/gnome-panel-2"
-# Build with dbus is currently broken
-#	>=dev-cpp/libpanelappletmm-2.22
-#	dbus? ( >=dev-libs/dbus-glib-0.70 )"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0
-	app-text/gnome-doc-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Update boost macro
-	epatch ${FILESDIR}/${P}-boost-update-v10.patch
-
-	# Fix failure ot build with -Wl,--as-needed
-	epatch ${FILESDIR}/${P}-fix-ldflags-as-needed.patch
-
-	# Fix automagic dependency on libpanelappletmm
-	epatch "${FILESDIR}/${P}-automagic.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dbus
-		--disable-applet
-		--disable-static
-		$(use_enable debug)"
-}
diff --git a/app-misc/gnote/gnote-0.4.0.ebuild b/app-misc/gnote/gnote-0.5.0.ebuild
index 1a49bf0f..f75fdbf7 100644
--- a/app-misc/gnote/gnote-0.4.0.ebuild
+++ b/app-misc/gnote/gnote-0.5.0.ebuild
@@ -19,15 +19,15 @@ RDEPEND=">=x11-libs/gtk+-2.14
 	>=dev-cpp/gtkmm-2.12
 	>=dev-libs/libxml2-2
 	dev-libs/libxslt
-	>=dev-cpp/libxmlpp-2.26
 	>=gnome-base/gconf-2
+	>=dev-libs/libpcre-7.8[cxx]
 	>=gnome-base/libgnomeui-2
 	>=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 broken
+# Build with dbus is currently not implemented
 #	dbus? ( >=dev-libs/dbus-glib-0.70 )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
@@ -39,14 +39,8 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 src_prepare() {
 	gnome2_src_prepare
 
-	# Update boost macro
-	epatch "${FILESDIR}/${PN}-0.3.1-boost-update-v10.patch"
-
-	# Fix automagic dependency on libpanelappletmm
-	epatch "${FILESDIR}/${PN}-0.3.1-automagic.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
 }
 
 pkg_setup() {