| 1 |
eva 09/06/28 18:00:11 |
| 2 |
|
| 3 |
Modified: gtkimageview-1.6.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix build with USE=doc, bug #273958. Move gnome-common to DEPEND, add die messages, strip G_DISABLE* to prevent build failures. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: gtkimageview-1.6.4.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- gtkimageview-1.6.4.ebuild 12 Jun 2009 19:31:54 -0000 1.5 |
| 22 |
+++ gtkimageview-1.6.4.ebuild 28 Jun 2009 18:00:11 -0000 1.6 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.5 2009/06/12 19:31:54 maekke Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.6 2009/06/28 18:00:11 eva Exp $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
|
| 31 |
@@ -14,30 +14,42 @@ |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="~alpha ~amd64 ~x86" |
| 34 |
IUSE="doc examples" |
| 35 |
+ |
| 36 |
# tests do not work with userpriv |
| 37 |
RESTRICT="userpriv" |
| 38 |
|
| 39 |
-RDEPEND="gnome-base/gnome-common |
| 40 |
- >=x11-libs/gtk+-2.6" |
| 41 |
+RDEPEND=">=x11-libs/gtk+-2.6" |
| 42 |
DEPEND="${DEPEND} |
| 43 |
+ gnome-base/gnome-common |
| 44 |
+ dev-util/gtk-doc-am |
| 45 |
doc? ( >=dev-util/gtk-doc-1.8 )" |
| 46 |
|
| 47 |
-pkg_setup() { |
| 48 |
- DOCS="README" |
| 49 |
- # apparently docs are always built... |
| 50 |
- use doc || export GTKDOC_REBASE=/bin/true |
| 51 |
-} |
| 52 |
+DOCS="README" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
- sed -i -e '/CFLAGS/s/-Werror //g' configure.in || die |
| 56 |
gnome2_src_prepare |
| 57 |
+ |
| 58 |
+ # Prevent excessive build failures due to gcc changes |
| 59 |
+ sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die "sed 1 failed" |
| 60 |
+ |
| 61 |
+ # Prevent excessive build failures due to glib/gtk changes |
| 62 |
+ sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed" |
| 63 |
+ |
| 64 |
+ if use doc; then |
| 65 |
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ |
| 66 |
+ -i gtk-doc.make || die "sed 3 failed" |
| 67 |
+ else |
| 68 |
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" \ |
| 69 |
+ -i gtk-doc.make || die "sed 4 failed" |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
eautoreconf |
| 73 |
} |
| 74 |
|
| 75 |
src_test() { |
| 76 |
# the tests are only built, but not run by default |
| 77 |
local failed="0" |
| 78 |
- emake check || die |
| 79 |
+ emake check || die "emake check failed" |
| 80 |
cd "${S}"/tests |
| 81 |
for test in test-* ; do |
| 82 |
if [[ -x ${test} ]] ; then |
| 83 |
@@ -51,6 +63,6 @@ |
| 84 |
gnome2_src_install |
| 85 |
if use examples ; then |
| 86 |
docinto examples |
| 87 |
- dodoc tests/ex-*.c || die |
| 88 |
+ dodoc tests/ex-*.c || die "dodoc failed" |
| 89 |
fi |
| 90 |
} |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.5 media-gfx/gtkimageview/ChangeLog |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/ChangeLog?rev=1.5&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/ChangeLog?rev=1.5&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gtkimageview/ChangeLog?r1=1.4&r2=1.5 |
| 99 |
|
| 100 |
Index: ChangeLog |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v |
| 103 |
retrieving revision 1.4 |
| 104 |
retrieving revision 1.5 |
| 105 |
diff -u -r1.4 -r1.5 |
| 106 |
--- ChangeLog 12 Jun 2009 19:31:54 -0000 1.4 |
| 107 |
+++ ChangeLog 28 Jun 2009 18:00:11 -0000 1.5 |
| 108 |
@@ -1,6 +1,11 @@ |
| 109 |
# ChangeLog for media-gfx/gtkimageview |
| 110 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.4 2009/06/12 19:31:54 maekke Exp $ |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.5 2009/06/28 18:00:11 eva Exp $ |
| 113 |
+ |
| 114 |
+ 28 Jun 2009; Gilles Dartiguelongue <eva@g.o> |
| 115 |
+ gtkimageview-1.6.4.ebuild: |
| 116 |
+ Fix build with USE=doc, bug #273958. Move gnome-common to DEPEND, add die |
| 117 |
+ messages, strip G_DISABLE* to prevent build failures. |
| 118 |
|
| 119 |
12 Jun 2009; Markus Meier <maekke@g.o> gtkimageview-1.6.4.ebuild: |
| 120 |
do not use -Werror during build wrt bug #272301 |
Archives