| 1 |
jlec 12/04/29 11:53:30 |
| 2 |
|
| 3 |
Modified: gtkimageview-1.6.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Move to EAPI=4, handle static-libs, add fix for gold.ld, call Xemake #294295; do not call elibtoolize twice, #411389 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.22 media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?rev=1.22&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?rev=1.22&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild?r1=1.21&r2=1.22 |
| 15 |
|
| 16 |
Index: gtkimageview-1.6.4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v |
| 19 |
retrieving revision 1.21 |
| 20 |
retrieving revision 1.22 |
| 21 |
diff -u -r1.21 -r1.22 |
| 22 |
--- gtkimageview-1.6.4.ebuild 12 Mar 2011 10:36:48 -0000 1.21 |
| 23 |
+++ gtkimageview-1.6.4.ebuild 29 Apr 2012 11:53:30 -0000 1.22 |
| 24 |
@@ -1,30 +1,33 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.21 2011/03/12 10:36:48 radhermit Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.22 2012/04/29 11:53:30 jlec Exp $ |
| 30 |
|
| 31 |
-EAPI="2" |
| 32 |
+EAPI=4 |
| 33 |
|
| 34 |
inherit autotools gnome2 virtualx |
| 35 |
|
| 36 |
-DESCRIPTION="GtkImageView is a simple image viewer widget for GTK." |
| 37 |
-HOMEPAGE="http://trac.bjourne.webfactional.com/wiki" |
| 38 |
+DESCRIPTION="A simple image viewer widget for GTK" |
| 39 |
+HOMEPAGE="http://trac.bjourne.webfactional.com/wiki/" |
| 40 |
SRC_URI="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${P}.tar.gz?format=raw -> ${P}.tar.gz" |
| 41 |
|
| 42 |
LICENSE="LGPL-2.1" |
| 43 |
SLOT="0" |
| 44 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" |
| 45 |
-IUSE="doc examples" |
| 46 |
+IUSE="doc examples static-libs" |
| 47 |
|
| 48 |
# tests do not work with userpriv |
| 49 |
RESTRICT="userpriv" |
| 50 |
|
| 51 |
-RDEPEND=">=x11-libs/gtk+-2.6:2" |
| 52 |
-DEPEND="${DEPEND} |
| 53 |
+RDEPEND="x11-libs/gtk+:2" |
| 54 |
+DEPEND="${RDEPEND} |
| 55 |
gnome-base/gnome-common |
| 56 |
dev-util/gtk-doc-am |
| 57 |
doc? ( >=dev-util/gtk-doc-1.8 )" |
| 58 |
|
| 59 |
-DOCS="README" |
| 60 |
+pkg_setup() { |
| 61 |
+ DOCS="README" |
| 62 |
+ G2CONF="$(use_enable static-libs static)" |
| 63 |
+} |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
gnome2_src_prepare |
| 67 |
@@ -35,6 +38,9 @@ |
| 68 |
# Prevent excessive build failures due to glib/gtk changes |
| 69 |
sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed" |
| 70 |
|
| 71 |
+ # Gold linker fix |
| 72 |
+ sed -e '/libtest.la/s:$: -lm:g' -i tests/Makefile.am || die |
| 73 |
+ |
| 74 |
if use doc; then |
| 75 |
sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ |
| 76 |
-i gtk-doc.make || die "sed 3 failed" |
| 77 |
@@ -43,13 +49,13 @@ |
| 78 |
-i gtk-doc.make || die "sed 4 failed" |
| 79 |
fi |
| 80 |
|
| 81 |
- eautoreconf |
| 82 |
+ AT_NOELIBTOOLIZE=yes eautoreconf |
| 83 |
} |
| 84 |
|
| 85 |
src_test() { |
| 86 |
# the tests are only built, but not run by default |
| 87 |
local failed="0" |
| 88 |
- emake check || die "emake check failed" |
| 89 |
+ Xemake check |
| 90 |
cd "${S}"/tests |
| 91 |
for test in test-* ; do |
| 92 |
if [[ -x ${test} ]] ; then |
| 93 |
@@ -61,8 +67,9 @@ |
| 94 |
|
| 95 |
src_install() { |
| 96 |
gnome2_src_install |
| 97 |
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la |
| 98 |
if use examples ; then |
| 99 |
docinto examples |
| 100 |
- dodoc tests/ex-*.c || die "dodoc failed" |
| 101 |
+ dodoc tests/ex-*.c |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.21 media-gfx/gtkimageview/ChangeLog |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/ChangeLog?rev=1.21&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/ChangeLog?rev=1.21&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkimageview/ChangeLog?r1=1.20&r2=1.21 |
| 112 |
|
| 113 |
Index: ChangeLog |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v |
| 116 |
retrieving revision 1.20 |
| 117 |
retrieving revision 1.21 |
| 118 |
diff -u -r1.20 -r1.21 |
| 119 |
--- ChangeLog 12 Mar 2011 10:36:48 -0000 1.20 |
| 120 |
+++ ChangeLog 29 Apr 2012 11:53:30 -0000 1.21 |
| 121 |
@@ -1,6 +1,10 @@ |
| 122 |
# ChangeLog for media-gfx/gtkimageview |
| 123 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.20 2011/03/12 10:36:48 radhermit Exp $ |
| 125 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.21 2012/04/29 11:53:30 jlec Exp $ |
| 127 |
+ |
| 128 |
+ 29 Apr 2012; Justin Lecher <jlec@g.o> gtkimageview-1.6.4.ebuild: |
| 129 |
+ Move to EAPI=4, handle static-libs, add fix for gold.ld, call Xemake #294295; |
| 130 |
+ do not call elibtoolize twice, #411389 |
| 131 |
|
| 132 |
12 Mar 2011; Tim Harder <radhermit@g.o> gtkimageview-1.6.4.ebuild: |
| 133 |
Use slot dep for gtk+. |
Archives