Version bump; 2.6.1 stable on x86. Fixed deps.

(Portage version: 2.0.51.22-r1)

7 files changed, 80 insertions, 23 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index cedf41054c39..f15f561ad3a8 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.34 2005/06/04 17:04:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.35 2005/06/28 13:40:48 ka0ttic Exp $
+
+*glibmm-2.7.1 (28 Jun 2005)
+
+  28 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> glibmm-2.4.4.ebuild,
+  glibmm-2.4.7-r1.ebuild, glibmm-2.6.1.ebuild, +glibmm-2.7.1.ebuild:
+  Version bump; 2.6.1 stable on x86. Fixed deps.
 
   04 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   glibmm-2.4.7-r1.ebuild:
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 068e8be077e6..b1480df14fb1 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,8 +1,10 @@
-MD5 290d91c32d485cc2a9d948ddef7b81e7 ChangeLog 3876
-MD5 59de08ba1f65a18d2b7e8d4a4050a5d1 glibmm-2.4.4.ebuild 537
-MD5 5efeac5faae3af82825f785d459188b6 glibmm-2.4.7-r1.ebuild 1050
-MD5 a75178698c77c5d08db9f0a6e1620b20 glibmm-2.6.1.ebuild 1085
+MD5 eff69388c516ea0a1fea64fa7d1901af glibmm-2.6.1.ebuild 1167
+MD5 197c28568cd73c42400873b2a95e8e88 glibmm-2.4.7-r1.ebuild 1052
+MD5 54a96e017a9ce65b5c9a4636e2947f31 glibmm-2.7.1.ebuild 1168
+MD5 c08b0236209df7b21de6b380c663557d glibmm-2.4.4.ebuild 536
+MD5 1f2f4b7f3af350a23031a6d329817c13 ChangeLog 4094
 MD5 09d3293038c3ef6ba2ff98ef6609680a metadata.xml 252
-MD5 6228c75d9e841f3fc6883a344a98e7c3 files/digest-glibmm-2.4.4 65
 MD5 d645a289371e18df9c33719baa37d25d files/digest-glibmm-2.4.7-r1 65
+MD5 6228c75d9e841f3fc6883a344a98e7c3 files/digest-glibmm-2.4.4 65
 MD5 df31c402a8203f95b628cad41a9bafa0 files/digest-glibmm-2.6.1 66
+MD5 905294b11834927aaa6da37bd3edf0b7 files/digest-glibmm-2.7.1 66
diff --git a/dev-cpp/glibmm/files/digest-glibmm-2.7.1 b/dev-cpp/glibmm/files/digest-glibmm-2.7.1
new file mode 100644
index 000000000000..d9114086c8ef
--- /dev/null
+++ b/dev-cpp/glibmm/files/digest-glibmm-2.7.1
@@ -0,0 +1 @@
+MD5 52119c6a7e570f1429a7ee66242a551b glibmm-2.7.1.tar.bz2 2500908
diff --git a/dev-cpp/glibmm/glibmm-2.4.4.ebuild b/dev-cpp/glibmm/glibmm-2.4.4.ebuild
index 559258188963..63cdea8f7973 100644
--- a/dev-cpp/glibmm/glibmm-2.4.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.4.4.ebuild
@@ -1,22 +1,22 @@
 # 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.4.ebuild,v 1.9 2005/03/28 15:55:20 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.4.4.ebuild,v 1.10 2005/06/28 13:40:48 ka0ttic Exp $
 
 inherit gnome2
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
+
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="x86 ppc amd64 sparc ppc64 hppa"
-
 IUSE=""
 
+RDEPEND=">=dev-libs/libsigc++-2.0
+	>=dev-libs/glib-2.4"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RDEPEND=">=dev-libs/libsigc++-2.0
-		>=dev-libs/glib-2.4"
-
 DOCS="AUTHORS CHANGES ChangeLog NEWS README"
 
diff --git a/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild b/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild
index c15b7fd0a281..f4f0054ba6ca 100644
--- a/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2005/06/04 17:04:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.4.7-r1.ebuild,v 1.10 2005/06/28 13:40:48 ka0ttic Exp $
 
 inherit gnome2
 
@@ -12,13 +12,13 @@ SLOT="2"
 KEYWORDS="~alpha amd64 hppa ia64 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 )"
 
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-		>=dev-libs/glib-2.4"
-
 DOCS="AUTHORS CHANGES ChangeLog NEWS README"
 
 src_unpack() {
@@ -31,7 +31,7 @@ src_unpack() {
 
 src_install() {
 	gnome2_src_install
-	rm -fr ${D}/usr/share/doc/${P%.*}
+	rm -fr ${D}/usr/share/doc/glibmm-2.4
 	if use doc ; then
 		# API Reference
 		dohtml -r docs/reference/html/* docs/images/*
diff --git a/dev-cpp/glibmm/glibmm-2.6.1.ebuild b/dev-cpp/glibmm/glibmm-2.6.1.ebuild
index 9230e1a93ac0..1e24a2099aa8 100644
--- a/dev-cpp/glibmm/glibmm-2.6.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2005/05/10 18:16:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.6.1.ebuild,v 1.6 2005/06/28 13:40:48 ka0ttic Exp $
 
 inherit gnome2
 
@@ -9,23 +9,23 @@ HOMEPAGE="http://gtkmm.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~alpha ~hppa"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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 )"
 
-RDEPEND=">=dev-libs/libsigc++-2.0.11
-		>=dev-libs/glib-2.4"
-
 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 || \
+	sed -i 's/^\(SUBDIRS =.*\)examples docs\(.*\)$/\1\2/' Makefile.in || \
 		die "sed Makefile.in failed"
 
 	if use doc ; then
@@ -36,11 +36,12 @@ src_unpack() {
 
 src_install() {
 	gnome2_src_install
-	rm -fr ${D}/usr/share/doc/${PN}*
+	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.7.1.ebuild b/dev-cpp/glibmm/glibmm-2.7.1.ebuild
new file mode 100644
index 000000000000..f2b1ab970e6f
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.7.1.ebuild
@@ -0,0 +1,47 @@
+# 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.7.1.ebuild,v 1.1 2005/06/28 13:40:48 ka0ttic Exp $
+
+inherit gnome2
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://gtkmm.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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 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
+}