summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp/gtkmm')
-rw-r--r--dev-cpp/gtkmm/ChangeLog5
-rw-r--r--dev-cpp/gtkmm/Manifest20
-rw-r--r--dev-cpp/gtkmm/gtkmm-2.24.0.ebuild14
3 files changed, 29 insertions, 10 deletions
diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 6c61ad41a66d..908efa0821b4 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-cpp/gtkmm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.195 2011/03/26 19:57:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.196 2011/03/28 14:18:09 nirbheek Exp $
+
+ 28 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtkmm-2.24.0.ebuild:
+ Fix build with USE=doc due to mm-common/glibmm changes
*gtkmm-2.24.0 (26 Mar 2011)
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 248dd6238d40..595677e2a84b 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -10,13 +10,23 @@ DIST gtkmm-2.22.0.tar.bz2 11496369 RMD160 5eacf79b3c2acd09ba36a3e8643da90282cec5
DIST gtkmm-2.24.0.tar.bz2 15227037 RMD160 42180542de0309c488a867d4569867e06b4036a9 SHA1 9b9e68360fb3f5faa7f221acba56f0d75a8198d2 SHA256 8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56
EBUILD gtkmm-1.2.9-r2.ebuild 1402 RMD160 71b3f1a08beab3b4e2cba5582c47fcb54a5f263c SHA1 a337599e92416c3b2f982d2427d44646fad4b24f SHA256 14eed5af2acda6e220bfeef66618a1032e8c87d1d59bf02cc10a5744770acb73
EBUILD gtkmm-2.22.0.ebuild 1297 RMD160 71eba46f8e6997266c19a389acbb73f6ef255152 SHA1 08f9ac39fcc40a54d16b9ed0a3a96893f51ca704 SHA256 337c75726ce22a913c66d12b843424c5eb33249944c13c08cc4d01f3ace1186a
-EBUILD gtkmm-2.24.0.ebuild 1311 RMD160 90dfa7154ca77790c5e9aee1b42d900968688a66 SHA1 47f675bf477f43caf7193399a6b8e9973c649c25 SHA256 0fe37d0b4afd2d61c4476c18b5debf1f222da8586d34fa517352456e61540afb
-MISC ChangeLog 26400 RMD160 940f98d27b08b8cf65d7c64712a9c2f386953b38 SHA1 732b25c26aae5d5b21b6295e7a9da27a73b1c9a4 SHA256 a46e625f5b2b5283c8a72fd798624e5fdd5e6033a0c8c25e1029d9c4d751624a
+EBUILD gtkmm-2.24.0.ebuild 1536 RMD160 f315faed5d2a31382eefc9ca272fc3b33f8e7996 SHA1 635fe0e00e3a09d3073c1f0ded46ce35905b9760 SHA256 8ee289bd39cee41dbc254819373f92d9d28bd1ceaa7e7c26021daa592c8cc6dc
+MISC ChangeLog 26538 RMD160 d2a9adae342dfce58a96c54f6193bd2d99ca7f43 SHA1 a273c95054f23b57046ab4a2ceae8a45f148160f SHA256 821aaffeaa42d7154f0e6a5da9c03752824a249276ec5046ddc8566173c73ebd
MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2ORTkACgkQ1fmVwcYIWAad7ACglGD9dc9f1j3woBuS+Z4ouUc/
-5uUAoKfD9lRlyTxFw1ue3/DuSwtbA7/B
-=YAct
+iQIcBAEBAgAGBQJNkJioAAoJEO/kOhxWD91kN2QP/ArKB5Xge4z+SyHXwyhdUqqS
+bqXOZrm5B0me5lusiz8F6TnjTTL2Q3Y74cb7lEHcxgkvUkOOF+SIJuTqE6kueXj4
+P2D1obrVq7wAlHjBDBdLqEXOjiy52GeeD5D/TVeiuU1ktUWGiPzQ/kpKBx+ZATKu
+vY7nQugxNlz0wTDjR9eFtFzpUKMM+HxCdaFESvITyG/HDwt4R1ec4SNKj2qmYdiM
+KUFbaTRfPQVbhnpET8/KxIcA8XxZ8lGkAvU2HZCWh7Kff4BDSM6d3vqbB/KgZdj0
+iW4TbJlv7rOIlPVG1TnGcGTA3jykrKkMmRYeJXn/nY3UQJU5ojS/v4Vp6UohB/gU
+jvXmfGG3az3DdHDoy9nyZ2MrI/NAuTj40jUtKMroPXj3HGNsHgjA6NYj3ZxbfRLG
+hJtsF10627rgnLgwujQXJ681mfLKg8uqrBpxUvG3zl526YvvF9Q08FIfeie/tChn
++TdDhyCjn42jLfqqDzak4NAL/TRw3dSBpyFtw3Itiki7gsc5kq00wrkLtkqb7eW3
+aFAAAIxHWZBmRNa5YSp/vfRAWWYbQ/+T7MkBXnKqX2pPQM4meQ4KG+jYXyDgG6Tk
+tumURjuRlkXdUxmGhyFjToCfe3bTTtfngdMPDobkyUfwa5B5HsqgJle9IWr63LwE
+jOxbSVBovIqyGIYbz4Ac
+=XkFn
-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild
index 2c1795997439..aac1df3bfced 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild,v 1.1 2011/03/26 19:57:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.0.ebuild,v 1.2 2011/03/28 14:18:09 nirbheek Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -24,19 +24,18 @@ RDEPEND=">=dev-cpp/glibmm-2.24:2
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? (
+ >=dev-cpp/mm-common-0.9.3
media-gfx/graphviz
dev-libs/libxslt
app-doc/doxygen )"
-pkg_setup() {
+src_prepare() {
DOCS="AUTHORS ChangeLog PORTING NEWS README"
G2CONF="${G2CONF}
--enable-api-atkmm
--disable-maintainer-mode
$(use_enable doc documentation)"
-}
-src_prepare() {
gnome2_src_prepare
if ! use test; then
@@ -50,4 +49,11 @@ src_prepare() {
sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
|| die "sed 2 failed"
fi
+
+ if use doc; then
+ # Needed till upstream re-generates the tarball with mm-common-0.9.3
+ # glibmm no longer ships doc-install.pl, and the macro changed
+ mm-common-prepare --copy --force
+ eautoreconf
+ fi
}