diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-21 02:01:12 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-21 02:01:12 +0000 |
| commit | 0e765c4901bf3b0a22cd2f51565a01d3e606775f (patch) | |
| tree | d401df6f4879f029d8528d59ccec400b6a1196d5 | |
| parent | Move to EAPI4. Fixes bug 331033. (diff) | |
| download | gentoo-2-0e765c4901bf3b0a22cd2f51565a01d3e606775f.tar.gz gentoo-2-0e765c4901bf3b0a22cd2f51565a01d3e606775f.tar.bz2 gentoo-2-0e765c4901bf3b0a22cd2f51565a01d3e606775f.zip | |
Fix documentation install breakage with glibmm-2.27.97
(Portage version: 2.1.9.42/cvs/Linux x86_64)
| -rw-r--r-- | dev-cpp/atkmm/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-cpp/atkmm/atkmm-2.22.2-r1.ebuild (renamed from dev-cpp/atkmm/atkmm-2.22.1.ebuild) | 16 |
2 files changed, 19 insertions, 5 deletions
diff --git a/dev-cpp/atkmm/ChangeLog b/dev-cpp/atkmm/ChangeLog index 21be80a33e75..cfdd270b7166 100644 --- a/dev-cpp/atkmm/ChangeLog +++ b/dev-cpp/atkmm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-cpp/atkmm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/ChangeLog,v 1.9 2011/03/12 21:35:34 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/ChangeLog,v 1.10 2011/03/21 02:01:12 nirbheek Exp $ + +*atkmm-2.22.2-r1 (21 Mar 2011) + + 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -atkmm-2.22.1.ebuild, + +atkmm-2.22.2-r1.ebuild: + Fix documentation install breakage with glibmm-2.27.97 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> atkmm-2.22.2.ebuild: alpha/arm/ia64/sh/sparc stable wrt #353436 diff --git a/dev-cpp/atkmm/atkmm-2.22.1.ebuild b/dev-cpp/atkmm/atkmm-2.22.2-r1.ebuild index 81bb4561c9e9..b580db29b370 100644 --- a/dev-cpp/atkmm/atkmm-2.22.1.ebuild +++ b/dev-cpp/atkmm/atkmm-2.22.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.1.ebuild,v 1.1 2010/11/29 18:35:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.2-r1.ebuild,v 1.1 2011/03/21 02:01:12 nirbheek Exp $ EAPI="3" GCONF_DEBUG="no" @@ -20,11 +20,19 @@ RDEPEND=">=dev-cpp/glibmm-2.24[doc?] dev-libs/libsigc++:2 !<dev-cpp/gtkmm-2.22.0" DEPEND="${RDEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig + doc? ( >=dev-cpp/mm-common-0.9.3 )" -pkg_setup() { +src_prepare() { DOCS="AUTHORS ChangeLog NEWS README" G2CONF="${G2CONF} --disable-maintainer-mode $(use_enable doc documentation)" + + # 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 } |