bump to 2.16.1. g++ 4.3 warning and some bug fixes.

  Cleaning up old revisions.
(Portage version: 2.1.4.4)

5 files changed, 20 insertions, 151 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 60a762882cb3..51b588f2d394 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.105 2008/03/16 21:54:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.106 2008/03/29 22:08:39 eva Exp $
+
+*glibmm-2.16.1 (29 Mar 2008)
+
+  29 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -glibmm-2.4.7-r1.ebuild, -glibmm-2.6.1.ebuild, -glibmm-2.9.1.ebuild,
+  -glibmm-2.12.10.ebuild, +glibmm-2.16.1.ebuild:
+  bump to 2.16.1. g++ 4.3 warning and some bug fixes.
+  Cleaning up old revisions.
 
 *glibmm-2.16.0 (16 Mar 2008)
 
diff --git a/dev-cpp/glibmm/glibmm-2.12.10.ebuild b/dev-cpp/glibmm/glibmm-2.16.1.ebuild
index 11a84dceb13d..4d8fb0cb9f58 100644
--- a/dev-cpp/glibmm/glibmm-2.12.10.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.12.10.ebuild,v 1.9 2007/12/12 01:44:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.16.1.ebuild,v 1.1 2008/03/29 22:08:39 eva Exp $
 
 inherit gnome2
 
@@ -9,24 +9,23 @@ HOMEPAGE="http://gtkmm.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/libsigc++-2.0.11
-	>=dev-libs/glib-2.9"
+		 >=dev-libs/glib-2.16"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
+		dev-util/pkgconfig
+		doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
+DOCS="AUTHORS 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"
+		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die "sed failed"
 	fi
 }
 
@@ -34,11 +33,11 @@ src_install() {
 	gnome2_src_install
 
 	if ! use doc && ! use examples; then
-		rm -fr "${D}"/usr/share/doc/glibmm-2.4
+		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}
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc examples
 	fi
 }
diff --git a/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild b/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild
deleted file mode 100644
index a55a0fad0af6..000000000000
--- a/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild,v 1.13 2007/12/12 01:44:24 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-	>=dev-libs/glib-2.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# don't waste time building the examples
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -fr "${D}"/usr/share/doc/glibmm-2.4
-	if use doc ; then
-		# API Reference
-		dohtml -r docs/reference/html/* docs/images/*
-		dosed -i 's?../../images/??g' /usr/share/doc/${PF}/html/*.html
-		# examples
-		cp -R examples "${D}"/usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.6.1.ebuild b/dev-cpp/glibmm/glibmm-2.6.1.ebuild
deleted file mode 100644
index f5d50996a282..000000000000
--- a/dev-cpp/glibmm/glibmm-2.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.6.1.ebuild,v 1.16 2007/12/12 01:44:24 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-	>=dev-libs/glib-2.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# don't waste time building the examples
-	sed -i 's/^\(SUBDIRS =.*\)examples docs\(.*\)$/\1\2/' Makefile.in || \
-		die "sed Makefile.in failed"
-
-	if use doc ; then
-		sed -i 's|../../images/||g' docs/reference/html/*.html || \
-			die "sed failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	rm -fr "${D}"/usr/share/doc/glibmm-2.4
-	if use doc ; then
-		# API Reference
-		dohtml -r docs/reference/html/* docs/images/*
-		# examples
-		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.9.1.ebuild b/dev-cpp/glibmm/glibmm-2.9.1.ebuild
deleted file mode 100644
index b374bac63fc4..000000000000
--- a/dev-cpp/glibmm/glibmm-2.9.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.9.1.ebuild,v 1.3 2007/12/12 01:44:24 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-	>=dev-libs/glib-2.9"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# don't waste time building the examples
-	sed -i 's/^\(SUBDIRS =.*\)examples docs\(.*\)$/\1\2/' Makefile.in || \
-		die "sed Makefile.in failed"
-
-	# fix image paths
-	if use doc ; then
-		sed -i 's|../../images/||g' docs/reference/html/*.html || \
-			die "sed failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	rm -fr "${D}"/usr/share/doc/glibmm-2.4
-	if use doc ; then
-		# API Reference
-		dohtml -r docs/reference/html/* docs/images/*
-		# examples
-		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
-		cp -R examples "${D}"/usr/share/doc/${PF}
-	fi
-}