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 | 2afe8af21066ace73cca830efba177ba77057696 (patch) | |
| tree | 2d90c62463cfd8df1aa2363c54ee8bafb849bb2a /dev-cpp/libgdamm | |
| parent | Bump to 0.8.3 (diff) | |
| download | historical-2afe8af21066ace73cca830efba177ba77057696.tar.gz historical-2afe8af21066ace73cca830efba177ba77057696.tar.bz2 historical-2afe8af21066ace73cca830efba177ba77057696.zip | |
Fix USE=doc build with newer glibmm
Package-Manager: portage-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/Manifest | 20 | ||||
| -rw-r--r-- | dev-cpp/libgdamm/libgdamm-4.1.1.ebuild | 24 |
3 files changed, 32 insertions, 17 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/Manifest b/dev-cpp/libgdamm/Manifest index 1b5a213e786c..97a15ecf353f 100644 --- a/dev-cpp/libgdamm/Manifest +++ b/dev-cpp/libgdamm/Manifest @@ -2,13 +2,23 @@ Hash: SHA1 DIST libgdamm-4.1.1.tar.bz2 1977838 RMD160 ba3c8b0bd8817a266efea0014b581639606169ec SHA1 74f714f824511fefcfd8ae330726e395c6d34e9d SHA256 cd74315761f6a963e6f0ebcf864568e8f40bc9977df7b1176aea08d387cf930e -EBUILD libgdamm-4.1.1.ebuild 937 RMD160 7b060eea1a5a9aff78507261e9c95c53db2dd2db SHA1 0f070a70a45be07522d04033fc7e5d7f5269a13a SHA256 377c492d4da2d162f7381b2d7189545cad11f5e27005144c5fe1617484c38cce -MISC ChangeLog 2017 RMD160 b1297bae3b5da23d911753152f08717988457f46 SHA1 7d54fb7fc04e943c01d87c72ff72dd9f5e7f5c41 SHA256 f16b1da40bef91c15943eb829b871d84b3901a5b0a301dc72498745457ea775b +EBUILD libgdamm-4.1.1.ebuild 1111 RMD160 bd2b7c5a6911608e4f46d71f741bb9620fd20e9b SHA1 1946fe90e7e19d0ea5c560feb60caa99a23f81e7 SHA256 ddbfa6fb947bf994431f5d050b510d61e5a4a763947c22d742826df5d51573c1 +MISC ChangeLog 2136 RMD160 e3d051fd6e90880fce13c734002a74be215619b9 SHA1 bbddfd62a8f957deac0238d41b1b968af26cabfa SHA256 ca5e036f97b53c4fe1700dd0c6adca97d197267cb00c8f842dfbcb6e816008b9 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2F8CAACgkQCaWpQKGI+9R14gCbBNw/aQQTNVBfIvg5UJp3LfzG -ho8An1KTf/L0TyyUCICe7I4YWhnpZXAY -=VnL1 +iQIcBAEBAgAGBQJNlIbpAAoJEO/kOhxWD91kczUP/2kGX3YZ+h7VGWo3vpl4t1/m +0VKV0rFmPgVkQaHM/B9MAaIkGDlXcoAp+lYEoeqREJIdsWh96pT6Akwxv6L5DWT4 +qvA1UuZerut/S0B6386t2p6kFnIB6+j1+/PkvWb+odm/Tr0UUGq6XNx27R7e4d8O +mW9B2BjIf1ZH8hT7JK+UJiZYqg+ONfdxv/WKxyLl5A6A5hVk89o9gmztW0n6Enua +yfVbQibZqvPn1wktom7gEUuj8togteLG8im0DX7s2SfNxE6F9Rv5xvCcxMT0jWcx +wzXXJ/pWyudXVobv6Ncie5IzDoUtunoNwNplGqQdyLdcL6kZW0WlJf8rlmDP3D+m +XYyt1eeyZyQzFfQEjFMHhq71+2e9zExJwaqm7+7VtRYCtSZtpJKKARmUhMIq2rfT +DUs1OaoihkK+joCUKJSmP+b83XOwdDpLVDeNlXv/nOKBqA/uMeHCxblFpWcujDdk +f966dGxwGeuYd03BRXcnkFPPmoBK9oVrk2S9Ayxjni6MqSh9dUFFmxeotYbq+7G/ +xjUxLw3v2B0YvW9Mp1XJUWnWWN6aKeatVHfbvTIVdURqALaC2rjx8z+U095m/t8n +UxgpgUOsjf0V90UD42dOS3LPApCcTWjlU9ewzeH6VNP3kS21/kycn6XDKSnEi5DR +UOr4lNfwodcSJMo3oDQI +=KsXc -----END PGP SIGNATURE----- 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" } |