summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-03-21 02:01:12 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-03-21 02:01:12 +0000
commit7edef99a834e42b7215813ef4ac702405643f013 (patch)
tree9737ecbdd74cd71c6af90a1bf8c840b76103ca22 /dev-cpp
parentMove to EAPI4. Fixes bug 331033. (diff)
downloadhistorical-7edef99a834e42b7215813ef4ac702405643f013.tar.gz
historical-7edef99a834e42b7215813ef4ac702405643f013.tar.bz2
historical-7edef99a834e42b7215813ef4ac702405643f013.zip
Fix documentation install breakage with glibmm-2.27.97
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/atkmm/ChangeLog8
-rw-r--r--dev-cpp/atkmm/Manifest5
-rw-r--r--dev-cpp/atkmm/atkmm-2.22.2-r1.ebuild (renamed from dev-cpp/atkmm/atkmm-2.22.1.ebuild)16
3 files changed, 21 insertions, 8 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/Manifest b/dev-cpp/atkmm/Manifest
index b31389607f0f..cbe8c697fdab 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,6 +1,5 @@
-DIST atkmm-2.22.1.tar.bz2 706657 RMD160 ecab26a3b0d88899b7171a49162dd4ef456421f5 SHA1 5d4910bb74100ff6c6a6242d33f000b07ada4220 SHA256 29d6da44d96cdd72f2fff659cfff28ad05ddc21f44d82d42b0ad641341dded42
DIST atkmm-2.22.2.tar.bz2 701506 RMD160 e8160198099dc0ee802d316764b467055eed9afd SHA1 e9d9e5e158f5a709fbad3436c61c4a48d5b1c8a3 SHA256 b94666ae0acebea53241fa0b2444468ff66e8a7790dfc7491489a9ad2eeefa34
-EBUILD atkmm-2.22.1.ebuild 791 RMD160 ccbfc42df110aaedd78a0cb5f61459c9d1eb2e68 SHA1 1f67848d6584d5f2e2bac16f0c32dd5b84883200 SHA256 0a452dc899128a3d26da5163b54fca1c95b360d03e07e1df220d2c2fd1508e32
+EBUILD atkmm-2.22.2-r1.ebuild 1103 RMD160 9b3c373eb57346e1d104c6cfa73bef66005ef4eb SHA1 9be85a6e07dd7439510a1af46c7e9aafff19a6f0 SHA256 5b3fbaacefc1f964f773832574ac45526681ac27b270c447bc9a4cbb9e8d2dcf
EBUILD atkmm-2.22.2.ebuild 785 RMD160 95c205380ee5680cde41945a6aa16da7c1014f0b SHA1 bd0c35f992f9d24b7a88e4c1377866d82a9e9408 SHA256 ce5a948fce712407a14dc7c676690484311302c3bb921eae3d02a006490faf32
-MISC ChangeLog 1271 RMD160 5feb2173dc6ee2ec7405126bc7a78a9d482f42f5 SHA1 4495b1bde3096b9bd3a9b22ae48dd7f9bc3693e2 SHA256 055e5bad961f42eccaab0deb0ee96bc5da72f043e629bddccd10241841b89183
+MISC ChangeLog 1466 RMD160 f39622046e927df65fc048bf09a12acb90ecee69 SHA1 bc12893a8bfa5ed308b0613c4267d9524d2027a9 SHA256 64f99f90ae8189c6efcdee462a4619dcb9ee8f72dd9f8328ea9d44e94b56145a
MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
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
}