diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-31 13:51:29 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-31 13:51:29 +0000 |
| commit | 977616a93e4235bbe74a099f6a78b66c6b7a00e5 (patch) | |
| tree | 412b5ddf2b97ac4f89f52df22fa857d669437edc /dev-cpp/libgdamm | |
| parent | Bump to 0.8.3 (diff) | |
| download | gentoo-2-977616a93e4235bbe74a099f6a78b66c6b7a00e5.tar.gz gentoo-2-977616a93e4235bbe74a099f6a78b66c6b7a00e5.tar.bz2 gentoo-2-977616a93e4235bbe74a099f6a78b66c6b7a00e5.zip | |
Fix USE=doc build with newer glibmm
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp/libgdamm')
| -rw-r--r-- | dev-cpp/libgdamm/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-cpp/libgdamm/libgdamm-4.1.1.ebuild | 24 |
2 files changed, 17 insertions, 12 deletions
diff --git a/dev-cpp/libgdamm/ChangeLog b/dev-cpp/libgdamm/ChangeLog index 3682a8d6a10a..e11f434d01bb 100644 --- a/dev-cpp/libgdamm/ChangeLog +++ b/dev-cpp/libgdamm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-cpp/libgdamm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/ChangeLog,v 1.16 2011/03/20 12:16:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/ChangeLog,v 1.17 2011/03/31 13:51:29 nirbheek Exp $ + + 31 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> libgdamm-4.1.1.ebuild: + Fix USE=doc build with newer glibmm 20 Mar 2011; Pacho Ramos <pacho@gentoo.org> -libgdamm-1.3.7.ebuild: Drop dev-cpp/libgdamm:0, bug #355307. diff --git a/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild b/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild index 8613cdccdb26..a1736a803d8c 100644 --- a/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild +++ b/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v 1.2 2011/02/17 10:15:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v 1.3 2011/03/31 13:51:29 nirbheek Exp $ EAPI="3" GCONF_DEBUG="no" -inherit gnome2 +inherit autotools gnome2 DESCRIPTION="C++ bindings for libgda" HOMEPAGE="http://www.gtkmm.org" @@ -15,28 +15,30 @@ SLOT="4" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="doc" -RDEPEND=">=dev-cpp/glibmm-2.12.8:2[doc?] +RDEPEND=">=dev-cpp/glibmm-2.12.8:2 >=gnome-extra/libgda-4.1.7:4" DEPEND="${RDEPEND} dev-util/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( + app-doc/doxygen + >=dev-cpp/mm-common-0.9.4 )" pkg_setup() { DOCS="AUTHORS ChangeLog NEWS README TODO" G2CONF="${G2CONF} $(use_enable doc documentation)" } -src_compile() { - gnome2_src_compile - - if use doc ; then - cd docs/reference - emake || die "failed to build API docs" +src_prepare() { + # doc-install.pl was removed from glibmm, and is provided by mm-common now + # This should not be needed if the tarball is generated with mm-common-0.9.3 + if use doc && has_version '>=dev-cpp/glibmm-2.27.97'; then + mm-common-prepare --copy --force + eautoreconf fi + gnome2_src_prepare } src_install() { gnome2_src_install - use doc && dohtml -r docs/reference/html/* find "${ED}" -name "*.la" -delete || die "remove of la files failed" } |