| 1 |
nirbheek 11/03/31 13:51:29 |
| 2 |
|
| 3 |
Modified: libgdamm-4.1.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix USE=doc build with newer glibmm |
| 6 |
|
| 7 |
(Portage version: 2.1.9.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-cpp/libgdamm/libgdamm-4.1.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: libgdamm-4.1.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- libgdamm-4.1.1.ebuild 17 Feb 2011 10:15:01 -0000 1.2 |
| 23 |
+++ libgdamm-4.1.1.ebuild 31 Mar 2011 13:51:29 -0000 1.3 |
| 24 |
@@ -1,11 +1,11 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v 1.2 2011/02/17 10:15:01 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.1.1.ebuild,v 1.3 2011/03/31 13:51:29 nirbheek Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
GCONF_DEBUG="no" |
| 32 |
|
| 33 |
-inherit gnome2 |
| 34 |
+inherit autotools gnome2 |
| 35 |
|
| 36 |
DESCRIPTION="C++ bindings for libgda" |
| 37 |
HOMEPAGE="http://www.gtkmm.org" |
| 38 |
@@ -15,28 +15,30 @@ |
| 39 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 40 |
IUSE="doc" |
| 41 |
|
| 42 |
-RDEPEND=">=dev-cpp/glibmm-2.12.8:2[doc?] |
| 43 |
+RDEPEND=">=dev-cpp/glibmm-2.12.8:2 |
| 44 |
>=gnome-extra/libgda-4.1.7:4" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
dev-util/pkgconfig |
| 47 |
- doc? ( app-doc/doxygen )" |
| 48 |
+ doc? ( |
| 49 |
+ app-doc/doxygen |
| 50 |
+ >=dev-cpp/mm-common-0.9.4 )" |
| 51 |
|
| 52 |
pkg_setup() { |
| 53 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 54 |
G2CONF="${G2CONF} $(use_enable doc documentation)" |
| 55 |
} |
| 56 |
|
| 57 |
-src_compile() { |
| 58 |
- gnome2_src_compile |
| 59 |
- |
| 60 |
- if use doc ; then |
| 61 |
- cd docs/reference |
| 62 |
- emake || die "failed to build API docs" |
| 63 |
+src_prepare() { |
| 64 |
+ # doc-install.pl was removed from glibmm, and is provided by mm-common now |
| 65 |
+ # This should not be needed if the tarball is generated with mm-common-0.9.3 |
| 66 |
+ if use doc && has_version '>=dev-cpp/glibmm-2.27.97'; then |
| 67 |
+ mm-common-prepare --copy --force |
| 68 |
+ eautoreconf |
| 69 |
fi |
| 70 |
+ gnome2_src_prepare |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
| 74 |
gnome2_src_install |
| 75 |
- use doc && dohtml -r docs/reference/html/* |
| 76 |
find "${ED}" -name "*.la" -delete || die "remove of la files failed" |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.17 dev-cpp/libgdamm/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/ChangeLog?rev=1.17&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/ChangeLog?rev=1.17&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/libgdamm/ChangeLog?r1=1.16&r2=1.17 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/ChangeLog,v |
| 90 |
retrieving revision 1.16 |
| 91 |
retrieving revision 1.17 |
| 92 |
diff -u -r1.16 -r1.17 |
| 93 |
--- ChangeLog 20 Mar 2011 12:16:26 -0000 1.16 |
| 94 |
+++ ChangeLog 31 Mar 2011 13:51:29 -0000 1.17 |
| 95 |
@@ -1,6 +1,9 @@ |
| 96 |
# ChangeLog for dev-cpp/libgdamm |
| 97 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/ChangeLog,v 1.16 2011/03/20 12:16:26 pacho Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/ChangeLog,v 1.17 2011/03/31 13:51:29 nirbheek Exp $ |
| 100 |
+ |
| 101 |
+ 31 Mar 2011; Nirbheek Chauhan <nirbheek@g.o> libgdamm-4.1.1.ebuild: |
| 102 |
+ Fix USE=doc build with newer glibmm |
| 103 |
|
| 104 |
20 Mar 2011; Pacho Ramos <pacho@g.o> -libgdamm-1.3.7.ebuild: |
| 105 |
Drop dev-cpp/libgdamm:0, bug #355307. |
Archives