| 1 |
maekke 09/12/28 16:09:03 |
| 2 |
|
| 3 |
Modified: ChangeLog ufraw-0.16.ebuild |
| 4 |
Log: |
| 5 |
autoenable gtk when gimp is enabled, bug #298187 |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.73 media-gfx/ufraw/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ChangeLog?rev=1.73&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ChangeLog?rev=1.73&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ChangeLog?r1=1.72&r2=1.73 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v |
| 18 |
retrieving revision 1.72 |
| 19 |
retrieving revision 1.73 |
| 20 |
diff -u -r1.72 -r1.73 |
| 21 |
--- ChangeLog 27 Dec 2009 11:49:56 -0000 1.72 |
| 22 |
+++ ChangeLog 28 Dec 2009 16:09:03 -0000 1.73 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for media-gfx/ufraw |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.72 2009/12/27 11:49:56 maekke Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.73 2009/12/28 16:09:03 maekke Exp $ |
| 28 |
+ |
| 29 |
+ 28 Dec 2009; Markus Meier <maekke@g.o> ufraw-0.16.ebuild: |
| 30 |
+ autoenable gtk when gimp is enabled, bug #298187 |
| 31 |
|
| 32 |
27 Dec 2009; Markus Meier <maekke@g.o> ufraw-0.16.ebuild: |
| 33 |
improve gimp/gtk die message, bug #298314 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.9 media-gfx/ufraw/ufraw-0.16.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild?rev=1.9&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild?rev=1.9&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild?r1=1.8&r2=1.9 |
| 42 |
|
| 43 |
Index: ufraw-0.16.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild,v |
| 46 |
retrieving revision 1.8 |
| 47 |
retrieving revision 1.9 |
| 48 |
diff -u -r1.8 -r1.9 |
| 49 |
--- ufraw-0.16.ebuild 27 Dec 2009 11:49:56 -0000 1.8 |
| 50 |
+++ ufraw-0.16.ebuild 28 Dec 2009 16:09:03 -0000 1.9 |
| 51 |
@@ -1,7 +1,8 @@ |
| 52 |
# Copyright 1999-2009 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild,v 1.8 2009/12/27 11:49:56 maekke Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild,v 1.9 2009/12/28 16:09:03 maekke Exp $ |
| 56 |
|
| 57 |
+EAPI=2 |
| 58 |
inherit fdo-mime gnome2-utils |
| 59 |
|
| 60 |
DESCRIPTION="RAW Image format viewer and GIMP plugin" |
| 61 |
@@ -13,27 +14,24 @@ |
| 62 |
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86" |
| 63 |
IUSE="contrast exif lensfun gimp gnome gtk hotpixels openmp timezone" |
| 64 |
|
| 65 |
-RDEPEND=" |
| 66 |
- media-libs/jpeg |
| 67 |
+RDEPEND="media-libs/jpeg |
| 68 |
>=media-libs/lcms-1.13 |
| 69 |
media-libs/tiff |
| 70 |
exif? ( >=media-gfx/exiv2-0.11 ) |
| 71 |
gnome? ( gnome-base/gconf ) |
| 72 |
- gtk? ( >=x11-libs/gtk+-2.6.0 |
| 73 |
+ gtk? ( >=x11-libs/gtk+-2.6:2 |
| 74 |
+ >=media-gfx/gtkimageview-1.5.0 ) |
| 75 |
+ gimp? ( >=x11-libs/gtk+-2.6:2 |
| 76 |
>=media-gfx/gtkimageview-1.5.0 |
| 77 |
- gimp? ( >=media-gfx/gimp-2.0 ) ) |
| 78 |
+ >=media-gfx/gimp-2.0 ) |
| 79 |
lensfun? ( >=media-libs/lensfun-0.2.3 )" |
| 80 |
DEPEND="${RDEPEND} |
| 81 |
dev-util/pkgconfig" |
| 82 |
|
| 83 |
-pkg_setup() { |
| 84 |
- if use gimp && ! use gtk; then |
| 85 |
- eerror "to enable gimp support, you must also enable gtk support for ${PN}" |
| 86 |
- die "emerge ${PN} with gtk support" |
| 87 |
- fi |
| 88 |
-} |
| 89 |
+src_configure() { |
| 90 |
+ local myconf |
| 91 |
+ use gimp && myconf="--with-gtk" |
| 92 |
|
| 93 |
-src_compile() { |
| 94 |
econf \ |
| 95 |
--without-cinepaint \ |
| 96 |
$(use_enable contrast) \ |
| 97 |
@@ -44,19 +42,26 @@ |
| 98 |
$(use_enable hotpixels) \ |
| 99 |
$(use_with lensfun) \ |
| 100 |
$(use_enable openmp) \ |
| 101 |
- $(use_enable timezone dst-correction) |
| 102 |
- emake || die "emake failed" |
| 103 |
+ $(use_enable timezone dst-correction) \ |
| 104 |
+ ${myconf} |
| 105 |
} |
| 106 |
|
| 107 |
src_install() { |
| 108 |
- emake DESTDIR="${D}" install || die "make install failed" |
| 109 |
- dodoc README TODO || die "doc installation failed" |
| 110 |
+ emake DESTDIR="${D}" install || die |
| 111 |
+ dodoc README TODO || die |
| 112 |
} |
| 113 |
|
| 114 |
pkg_postinst() { |
| 115 |
- if use gnome ; then |
| 116 |
+ if use gnome; then |
| 117 |
fdo-mime_mime_database_update |
| 118 |
+ fdo-mime_desktop_database_update |
| 119 |
gnome2_gconf_install |
| 120 |
+ fi |
| 121 |
+} |
| 122 |
+ |
| 123 |
+pkg_postrm() { |
| 124 |
+ if use gnome; then |
| 125 |
fdo-mime_desktop_database_update |
| 126 |
+ fdo-mime_mime_database_update |
| 127 |
fi |
| 128 |
} |
Archives