New version for GNOME 2.26. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 73 insertions, 52 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index b6feea9e182a..9b8fbd906ede 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.125 2009/01/07 17:56:58 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.126 2009/05/10 22:15:53 eva Exp $
+
+*glibmm-2.20.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org> glibmm-2.8.4.ebuild,
+  -glibmm-2.14.2.ebuild, glibmm-2.16.1.ebuild, +glibmm-2.20.0.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
 
   07 Jan 2009; Raúl Porcel <armin76@gentoo.org> glibmm-2.16.4.ebuild:
   arm/sh stable
diff --git a/dev-cpp/glibmm/glibmm-2.14.2.ebuild b/dev-cpp/glibmm/glibmm-2.14.2.ebuild
deleted file mode 100644
index fc3d19ed9eb3..000000000000
--- a/dev-cpp/glibmm/glibmm-2.14.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.12 2008/07/18 09:14:12 aballier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-	>=dev-libs/glib-2.14"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${D}"/usr/share/doc/glibmm-2.4
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
-		cp -R examples "${D}"/usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.16.1.ebuild b/dev-cpp/glibmm/glibmm-2.16.1.ebuild
index d1715082a290..d2e375942d04 100644
--- a/dev-cpp/glibmm/glibmm-2.16.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.16.1.ebuild,v 1.9 2008/07/10 15:10:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.16.1.ebuild,v 1.10 2009/05/10 22:15:53 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="ppc64"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/libsigc++-2.2
diff --git a/dev-cpp/glibmm/glibmm-2.20.0.ebuild b/dev-cpp/glibmm/glibmm-2.20.0.ebuild
new file mode 100644
index 000000000000..5b4dd631446d
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.20.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.20.0.ebuild,v 1.1 2009/05/10 22:15:53 eva Exp $
+
+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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/libsigc++-2.2
+	>=dev-libs/glib-2.19.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	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 || die "emake check failed"
+
+	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 "${D}/usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc examples
+	fi
+}
diff --git a/dev-cpp/glibmm/glibmm-2.8.4.ebuild b/dev-cpp/glibmm/glibmm-2.8.4.ebuild
index 148179104f9a..a9ca4e1168bd 100644
--- a/dev-cpp/glibmm/glibmm-2.8.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.8.4.ebuild,v 1.13 2008/07/10 15:12:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.8.4.ebuild,v 1.14 2009/05/10 22:15:53 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~mips"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/libsigc++-2.0.11