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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     2f77ba1341451cd0d00bc29921133472ecd14b38
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 13:07:59 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 13:07:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2f77ba13

dev-cpp/glibmm: 2.27.95 → 2.27.96

* Re-add USE=doc since glibmm no longer install the doc utils anyway
* Use mm-doc.m4 to find the utils

---
 ...glibmm-2.27.95.ebuild => glibmm-2.27.96.ebuild} |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-cpp/glibmm/glibmm-2.27.95.ebuild b/dev-cpp/glibmm/glibmm-2.27.96.ebuild
similarity index 80%
rename from dev-cpp/glibmm/glibmm-2.27.95.ebuild
rename to dev-cpp/glibmm/glibmm-2.27.96.ebuild
index fdb52c7..70a626d 100644
--- a/dev-cpp/glibmm/glibmm-2.27.95.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.27.96.ebuild
@@ -17,17 +17,17 @@ RDEPEND=">=dev-libs/libsigc++-2.2
 	>=dev-libs/glib-2.28.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? (
+		app-doc/doxygen
+		>=dev-cpp/mm-common-0.9.3 )"
+# mm-common needed for mm-common-prepare
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-# We cannot set this just now as it causes breakage, bug #336928
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable doc documentation)"
-#}
-
 src_prepare() {
+	# Documentation utils are now only in mm-common
 	G2CONF="${G2CONF}
+		$(use_enable doc documentation)
 		--disable-schemas-compile
 		--enable-deprecated-api"
 
@@ -43,6 +43,12 @@ 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
 }