Version bump. Make license more precise. Drop old.

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

5 files changed, 20 insertions, 13 deletions

diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index 2bce2904ce05..3907896ee74c 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/gnote
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.23 2012/07/02 18:48:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.24 2012/09/18 11:07:37 tetromino Exp $
+
+*gnote-0.8.4 (18 Sep 2012)
+
+  18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnote-0.7.4.ebuild,
+  gnote-0.8.2.ebuild, -gnote-0.8.2-r10.ebuild, gnote-0.8.3.ebuild,
+  +gnote-0.8.4.ebuild:
+  Version bump. Make license more precise. Drop old.
 
   02 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnote-0.8.2.ebuild,
   gnote-0.8.2-r10.ebuild, +files/gnote-0.8.2-signal_idle-header.patch:
diff --git a/app-misc/gnote/gnote-0.7.4.ebuild b/app-misc/gnote/gnote-0.7.4.ebuild
index 18eb0d7a0e43..35cf1b8dc8c3 100644
--- a/app-misc/gnote/gnote-0.7.4.ebuild
+++ b/app-misc/gnote/gnote-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.4.ebuild,v 1.5 2012/05/22 11:20:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.4.ebuild,v 1.6 2012/09/18 11:07:37 tetromino Exp $
 
 EAPI="3"
 GNOME2_LA_PUNT="yes"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="applet debug" # dbus
diff --git a/app-misc/gnote/gnote-0.8.2.ebuild b/app-misc/gnote/gnote-0.8.2.ebuild
index bc0c330c0cf5..a8516fd0ce24 100644
--- a/app-misc/gnote/gnote-0.8.2.ebuild
+++ b/app-misc/gnote/gnote-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.6 2012/07/02 18:46:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.7 2012/09/18 11:07:37 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -10,7 +10,7 @@ inherit eutils gnome2
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="applet debug"
diff --git a/app-misc/gnote/gnote-0.8.3.ebuild b/app-misc/gnote/gnote-0.8.3.ebuild
index a5bbaf8cc4b2..3e66d553b156 100644
--- a/app-misc/gnote/gnote-0.8.3.ebuild
+++ b/app-misc/gnote/gnote-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.3.ebuild,v 1.3 2012/05/20 20:52:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.3.ebuild,v 1.4 2012/09/18 11:07:37 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="applet debug"
diff --git a/app-misc/gnote/gnote-0.8.2-r10.ebuild b/app-misc/gnote/gnote-0.8.4.ebuild
index c090aae0ff31..a4950fbec293 100644
--- a/app-misc/gnote/gnote-0.8.2-r10.ebuild
+++ b/app-misc/gnote/gnote-0.8.4.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2-r10.ebuild,v 1.3 2012/07/02 18:46:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.4.ebuild,v 1.1 2012/09/18 11:07:37 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="applet debug"
 
-COMMON_DEPEND=">=x11-libs/gtk+-3.0:3
+# Automagic glib-2.32 dep
+COMMON_DEPEND=">=dev-libs/glib-2.32
+	>=x11-libs/gtk+-3.0:3
 	>=dev-cpp/glibmm-2.28:2
 	>=dev-cpp/gtkmm-3.0:3.0
 	>=dev-libs/libxml2-2:2
@@ -42,8 +44,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-signal_idle-header.patch" #424317
-
 	gnome2_src_prepare
 
 	# Do not set idiotic defines in a released tarball, bug #311979