| 1 |
pacho 13/12/28 16:14:31 |
| 2 |
|
| 3 |
Modified: gtkam-0.2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix underlinking (#496136 by kalle) |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 media-gfx/gtkam/gtkam-0.2.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: gtkam-0.2.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- gtkam-0.2.0.ebuild 8 Dec 2013 19:07:59 -0000 1.3 |
| 23 |
+++ gtkam-0.2.0.ebuild 28 Dec 2013 16:14:31 -0000 1.4 |
| 24 |
@@ -1,11 +1,11 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v 1.3 2013/12/08 19:07:59 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v 1.4 2013/12/28 16:14:31 pacho Exp $ |
| 29 |
|
| 30 |
-EAPI="4" |
| 31 |
+EAPI=5 |
| 32 |
GCONF_DEBUG="yes" |
| 33 |
|
| 34 |
-inherit eutils gnome2 |
| 35 |
+inherit autotools eutils gnome2 |
| 36 |
|
| 37 |
DESCRIPTION="A frontend for gPhoto 2" |
| 38 |
HOMEPAGE="http://gphoto.org/proj/gtkam" |
| 39 |
@@ -16,38 +16,43 @@ |
| 40 |
KEYWORDS="~alpha amd64 ~ppc ~sparc x86" |
| 41 |
IUSE="gimp gnome nls" |
| 42 |
|
| 43 |
-# FIXME: why is exif not optional ? |
| 44 |
-RDEPEND="x11-libs/gtk+:2 |
| 45 |
+RDEPEND=" |
| 46 |
+ x11-libs/gtk+:2 |
| 47 |
>=media-libs/libgphoto2-2.5.0 |
| 48 |
>=media-libs/libexif-0.3.2 |
| 49 |
media-libs/libexif-gtk |
| 50 |
gimp? ( >=media-gfx/gimp-2 ) |
| 51 |
gnome? ( |
| 52 |
>=gnome-base/libbonobo-2 |
| 53 |
- >=gnome-base/libgnomeui-2 )" |
| 54 |
+ >=gnome-base/libgnomeui-2 ) |
| 55 |
+" |
| 56 |
DEPEND="${RDEPEND} |
| 57 |
>=dev-util/intltool-0.40 |
| 58 |
virtual/pkgconfig |
| 59 |
app-text/scrollkeeper |
| 60 |
- nls? ( >=sys-devel/gettext-0.14.1 )" |
| 61 |
- |
| 62 |
-pkg_setup() { |
| 63 |
- DOCS="AUTHORS CHANGES NEWS README TODO" |
| 64 |
- G2CONF="${G2CONF} |
| 65 |
- $(use_with gimp) |
| 66 |
- $(use_with gnome) |
| 67 |
- $(use_with gnome bonobo) |
| 68 |
- $(use_enable nls) |
| 69 |
- --disable-scrollkeeper |
| 70 |
- --with-rpmbuild=/bin/false" |
| 71 |
-} |
| 72 |
+ nls? ( >=sys-devel/gettext-0.14.1 ) |
| 73 |
+" |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- gnome2_src_prepare |
| 77 |
- |
| 78 |
# Fix .desktop validity, bug #271569 |
| 79 |
epatch "${FILESDIR}/${PN}-0.1.18-desktop-validation.patch" |
| 80 |
+ |
| 81 |
+ # Fix underlinking, bug #496136 |
| 82 |
+ epatch "${FILESDIR}/${PN}-0.2.0-underlinking.patch" |
| 83 |
+ |
| 84 |
+ eautoreconf |
| 85 |
+ gnome2_src_prepare |
| 86 |
} |
| 87 |
+ |
| 88 |
+src_configure() { |
| 89 |
+ gnome2_src_configure \ |
| 90 |
+ $(use_with gimp) \ |
| 91 |
+ $(use_with gnome) \ |
| 92 |
+ $(use_with gnome bonobo) \ |
| 93 |
+ $(use_enable nls) \ |
| 94 |
+ --with-rpmbuild=/bin/false |
| 95 |
+} |
| 96 |
+ |
| 97 |
src_install() { |
| 98 |
gnome2_src_install |
| 99 |
rm -rf "${ED}"/usr/share/doc/gtkam || die "rm failed" |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.87 media-gfx/gtkam/ChangeLog |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/ChangeLog?rev=1.87&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/ChangeLog?rev=1.87&content-type=text/plain |
| 107 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/ChangeLog?r1=1.86&r2=1.87 |
| 108 |
|
| 109 |
Index: ChangeLog |
| 110 |
=================================================================== |
| 111 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v |
| 112 |
retrieving revision 1.86 |
| 113 |
retrieving revision 1.87 |
| 114 |
diff -u -r1.86 -r1.87 |
| 115 |
--- ChangeLog 8 Dec 2013 19:07:59 -0000 1.86 |
| 116 |
+++ ChangeLog 28 Dec 2013 16:14:31 -0000 1.87 |
| 117 |
@@ -1,6 +1,10 @@ |
| 118 |
# ChangeLog for media-gfx/gtkam |
| 119 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 120 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.86 2013/12/08 19:07:59 pacho Exp $ |
| 121 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.87 2013/12/28 16:14:31 pacho Exp $ |
| 122 |
+ |
| 123 |
+ 28 Dec 2013; Pacho Ramos <pacho@g.o> |
| 124 |
+ +files/gtkam-0.2.0-underlinking.patch, gtkam-0.2.0.ebuild: |
| 125 |
+ Fix underlinking (#496136 by kalle) |
| 126 |
|
| 127 |
08 Dec 2013; Pacho Ramos <pacho@g.o> gtkam-0.2.0.ebuild: |
| 128 |
x86 stable, bug #478252 |
Archives