Bump for gtk+-3.6 support. Update license and description. Drop old.

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 29 insertions, 25 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 8497a00c4e07..1507005fb3dc 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.240 2012/11/26 13:18:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.241 2012/12/09 22:23:58 tetromino Exp $
+
+*gtkmm-3.6.0 (09 Dec 2012)
+
+  09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gtkmm-2.24.2.ebuild,
+  gtkmm-3.2.0.ebuild, gtkmm-3.4.0.ebuild, -gtkmm-3.4.1.ebuild,
+  gtkmm-3.4.2.ebuild, +gtkmm-3.6.0.ebuild:
+  Bump for gtk+-3.6 support. Update license and description. Drop old.
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
index 21e94d7b4c0f..99f18ec1737c 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild,v 1.9 2012/05/04 03:44:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild,v 1.10 2012/12/09 22:23:58 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
diff --git a/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
index c6aaa975aa20..3360b05f42e4 100644
--- a/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.2.0.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/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild,v 1.9 2012/05/20 19:36:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild,v 1.10 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc examples test"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
index aff7e2666aa5..ce26d09c0201 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.4.0.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/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.10 2012/10/28 16:40:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.11 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild
index 4554c5531501..5440ffc87983 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.4.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/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild,v 1.2 2012/10/14 20:32:24 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild,v 1.3 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild
index 63aafd5888cd..bd5698374399 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild,v 1.1 2012/09/15 09:21:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild,v 1.1 2012/12/09 22:23:58 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
-SLOT="3.0"
+LICENSE="LGPL-2.1+"
+SLOT="3.0/1" # subslot is libgtkmm-3.0 soname suffix
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="
-	>=dev-cpp/glibmm-2.32.0:2
-	>=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?]
+	>=dev-cpp/glibmm-2.34:2
+	>=x11-libs/gtk+-3.5.12:3[aqua?,wayland?,X?]
 	>=x11-libs/gdk-pixbuf-2.22.1:2
 	>=dev-cpp/atkmm-2.22.2
 	>=dev-cpp/cairomm-1.9.2.2
@@ -31,11 +31,10 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 		dev-libs/libxslt
 		app-doc/doxygen )"
-
 #	dev-cpp/mm-common"
 # eautoreconf needs mm-common
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog PORTING NEWS README"
 	targets=
 	G2CONF="${G2CONF}
@@ -44,9 +43,7 @@ pkg_setup() {
 		$(use_enable aqua quartz-backend)
 		$(use_enable wayland wayland-backend)
 		$(use_enable X x11-backend)"
-}
 
-src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \