Bump for glib-2.34 support. Update license. Drop old.

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

6 files changed, 20 insertions, 158 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 86106cf2003d..2faa71f40a5d 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.194 2012/10/28 15:24:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.195 2012/12/09 22:05:30 tetromino Exp $
+
+*glibmm-2.34.1 (09 Dec 2012)
+
+  09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -glibmm-2.28.2.ebuild, -glibmm-2.30.0.ebuild, glibmm-2.30.1.ebuild,
+  -glibmm-2.32.0.ebuild, glibmm-2.32.1.ebuild, +glibmm-2.34.1.ebuild:
+  Bump for glib-2.34 support. Update license. Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> glibmm-2.32.1.ebuild:
   ia64/sh/sparc stable wrt #427544
diff --git a/dev-cpp/glibmm/glibmm-2.28.2.ebuild b/dev-cpp/glibmm/glibmm-2.28.2.ebuild
deleted file mode 100644
index 9b63ad159d01..000000000000
--- a/dev-cpp/glibmm/glibmm-2.28.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.28.2.ebuild,v 1.9 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	>=dev-libs/glib-2.28:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug debug-refcounting)
-		$(use_enable doc documentation)
-		--disable-schemas-compile
-		--enable-deprecated-api"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building examples
-		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/"
-	emake check
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.30.0.ebuild b/dev-cpp/glibmm/glibmm-2.30.0.ebuild
deleted file mode 100644
index 9ff5dd271b82..000000000000
--- a/dev-cpp/glibmm/glibmm-2.30.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.30.0.ebuild,v 1.2 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	>=dev-libs/glib-2.30.0:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-# dev-cpp/mm-common needed for eautoreconf
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug debug-refcounting)
-		$(use_enable doc documentation)
-		--disable-schemas-compile
-		--enable-deprecated-api"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building examples
-		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/"
-	emake check
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.30.1.ebuild b/dev-cpp/glibmm/glibmm-2.30.1.ebuild
index 398bab7d22b4..fc42bcc07e8b 100644
--- a/dev-cpp/glibmm/glibmm-2.30.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.30.1.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/glibmm/glibmm-2.30.1.ebuild,v 1.9 2012/05/04 03:44:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.30.1.ebuild,v 1.10 2012/12/09 22:05:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
diff --git a/dev-cpp/glibmm/glibmm-2.32.1.ebuild b/dev-cpp/glibmm/glibmm-2.32.1.ebuild
index 391290fea73c..f4234df0b78e 100644
--- a/dev-cpp/glibmm/glibmm-2.32.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.32.1.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/glibmm/glibmm-2.32.1.ebuild,v 1.9 2012/10/28 15:24:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.32.1.ebuild,v 1.10 2012/12/09 22:05:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
diff --git a/dev-cpp/glibmm/glibmm-2.32.0.ebuild b/dev-cpp/glibmm/glibmm-2.34.1.ebuild
index 20fedc85a16b..4a1746d51c90 100644
--- a/dev-cpp/glibmm/glibmm-2.32.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.34.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.32.0.ebuild,v 1.2 2012/05/04 03:44:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.34.1.ebuild,v 1.1 2012/12/09 22:05:30 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,29 +11,24 @@ inherit gnome2
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="2"
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2/1" # subslot is libglibmm-2.4 soname suffix
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
 
 RDEPEND=">=dev-libs/libsigc++-2.2.10:2
-	>=dev-libs/glib-2.32.0:2"
+	>=dev-libs/glib-2.34:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 # dev-cpp/mm-common needed for eautoreconf
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable debug debug-refcounting)
 		$(use_enable doc documentation)
-		--disable-schemas-compile
 		--enable-deprecated-api"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	if ! use test; then
 		# don't waste time building tests
@@ -46,6 +41,8 @@ src_prepare() {
 		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
 			-i Makefile.am Makefile.in || die "sed 2 failed"
 	fi
+
+	gnome2_src_prepare
 }
 
 src_test() {