[gentoo-commits] proj/gnome:master commit in: dev-cpp/glibmm/, dev-cpp/gtkmm/

[gentoo-commits] proj/gnome:master commit in: dev-cpp/glibmm/, dev-cpp/gtkmm/

[Nirbheek Chauhan]

commit:     d5c24b405174dfa405bdf0898936dbfa7d1f3e90
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 20:52:56 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 20:52:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d5c24b40

dev-cpp/{glib,gtk}mm: bump to latest

---
 ...glibmm-2.27.96.ebuild => glibmm-2.27.97.ebuild} |    8 --------
 .../{gtkmm-2.99.5.ebuild => gtkmm-2.99.6.ebuild}   |    1 +
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dev-cpp/glibmm/glibmm-2.27.96.ebuild b/dev-cpp/glibmm/glibmm-2.27.97.ebuild
similarity index 85%
rename from dev-cpp/glibmm/glibmm-2.27.96.ebuild
rename to dev-cpp/glibmm/glibmm-2.27.97.ebuild
index 70a626d..54e5ef1 100644
--- a/dev-cpp/glibmm/glibmm-2.27.96.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.27.97.ebuild
@@ -20,12 +20,10 @@ DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen
 		>=dev-cpp/mm-common-0.9.3 )"
-# mm-common needed for mm-common-prepare
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
-	# Documentation utils are now only in mm-common
 	G2CONF="${G2CONF}
 		$(use_enable doc documentation)
 		--disable-schemas-compile
@@ -43,12 +41,6 @@ src_prepare() {
 			-i Makefile.am Makefile.in || die "sed 2 failed"
 	fi
 
-	if use doc; then
-		# Needed due to commit 9635fffd
-		# REPORT A BUG: This shouldn't be needed, should be run during make dist
-		mm-common-prepare --copy --force || die
-	fi
-
 	gnome2_src_prepare
 }
 

diff --git a/dev-cpp/gtkmm/gtkmm-2.99.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.99.6.ebuild
similarity index 97%
rename from dev-cpp/gtkmm/gtkmm-2.99.5.ebuild
rename to dev-cpp/gtkmm/gtkmm-2.99.6.ebuild
index dd1d198..ec95f1a 100644
--- a/dev-cpp/gtkmm/gtkmm-2.99.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.99.6.ebuild
@@ -26,6 +26,7 @@ RDEPEND=">=dev-cpp/glibmm-2.27.93:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? (
+		>=dev-cpp/mm-common-0.9.3
 		media-gfx/graphviz
 		dev-libs/libxslt
 		app-doc/doxygen )"

[gentoo-commits] proj/gnome:master commit in: dev-cpp/glibmm/, dev-cpp/gtkmm/

[Nirbheek Chauhan]

commit:     ee163f091224598e80cc627f3e7bd8c32d12ea7a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 07:04:35 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 07:04:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ee163f09

glibmm/gtkmm: moved to tree

---
 dev-cpp/glibmm/glibmm-2.28.0.ebuild |   69 -----------------------------------
 dev-cpp/gtkmm/gtkmm-3.0.0.ebuild    |   56 ----------------------------
 2 files changed, 0 insertions(+), 125 deletions(-)

diff --git a/dev-cpp/glibmm/glibmm-2.28.0.ebuild b/dev-cpp/glibmm/glibmm-2.28.0.ebuild
deleted file mode 100644
index bc9a820..0000000
--- a/dev-cpp/glibmm/glibmm-2.28.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.24.2-r1.ebuild,v 1.5 2011/01/04 18:10:11 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-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 ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	>=dev-libs/glib-2.28:2"
-DEPEND="${RDEPEND}
-	dev-util/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() {
-	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
-
-	gnome2_src_prepare
-}
-
-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 "${ED}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/gtkmm/gtkmm-3.0.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.0.0.ebuild
deleted file mode 100644
index a96f5d3..0000000
--- a/dev-cpp/gtkmm/gtkmm-3.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild,v 1.2 2010/11/20 23:58:01 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GTK+2"
-HOMEPAGE="http://www.gtkmm.org"
-
-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"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.27.93:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		--disable-maintainer-mode
-		$(use_enable doc documentation)"
-}
-
-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 tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-}