From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PzTzo-0000F4-16 for garchives@archives.gentoo.org; Tue, 15 Mar 2011 13:09:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C814AE03E4; Tue, 15 Mar 2011 13:08:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 935C3E03E4 for ; Tue, 15 Mar 2011 13:08:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 091481B42D8 for ; Tue, 15 Mar 2011 13:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2788A80075 for ; Tue, 15 Mar 2011 13:08:49 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <2f77ba1341451cd0d00bc29921133472ecd14b38.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-cpp/glibmm/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-cpp/glibmm/glibmm-2.27.95.ebuild dev-cpp/glibmm/glibmm-2.27.96.ebuild X-VCS-Directories: dev-cpp/glibmm/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 2f77ba1341451cd0d00bc29921133472ecd14b38 Date: Tue, 15 Mar 2011 13:08:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 93dcf4dcec7b319be49846a555a21889 commit: 2f77ba1341451cd0d00bc29921133472ecd14b38 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 15 13:07:59 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Mar 15 13:07:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D2f77ba13 dev-cpp/glibmm: 2.27.95 =E2=86=92 2.27.96 * Re-add USE=3Ddoc since glibmm no longer install the doc utils anyway * Use mm-doc.m4 to find the utils --- ...glibmm-2.27.95.ebuild =3D> 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=3D">=3Ddev-libs/libsigc++-2.2 >=3Ddev-libs/glib-2.28.0" DEPEND=3D"${RDEPEND} dev-util/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( + app-doc/doxygen + >=3Ddev-cpp/mm-common-0.9.3 )" +# mm-common needed for mm-common-prepare =20 DOCS=3D"AUTHORS ChangeLog NEWS README" =20 -# We cannot set this just now as it causes breakage, bug #336928 -#pkg_setup() { -# G2CONF=3D"${G2CONF} $(use_enable doc documentation)" -#} - src_prepare() { + # Documentation utils are now only in mm-common G2CONF=3D"${G2CONF} + $(use_enable doc documentation) --disable-schemas-compile --enable-deprecated-api" =20 @@ -43,6 +43,12 @@ src_prepare() { -i Makefile.am Makefile.in || die "sed 2 failed" fi =20 + if use doc; then + # Needed due to commit 9635fffd + # REPORT A BUG: This shouldn't be needed, should be run during make di= st + mm-common-prepare --copy --force || die + fi + gnome2_src_prepare } =20