diff options
| author |   Markus Meier <maekke@gentoo.org> | 2009-12-28 16:09:03 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2009-12-28 16:09:03 +0000 |
| commit | 67399d5275e2b01d1dc72772d192b55b242c5654 (patch) | |
| tree | 850a880efea96ff165e16d579e8558f495af1a75 /media-gfx | |
| parent | Stop using deprecated kde-functions.eclass. (diff) | |
| download | gentoo-2-67399d5275e2b01d1dc72772d192b55b242c5654.tar.gz gentoo-2-67399d5275e2b01d1dc72772d192b55b242c5654.tar.bz2 gentoo-2-67399d5275e2b01d1dc72772d192b55b242c5654.zip | |
autoenable gtk when gimp is enabled, bug #298187
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/ufraw/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/ufraw/ufraw-0.16.ebuild | 39 |
2 files changed, 26 insertions, 18 deletions
diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog index b7b9b32f09cd..c6795500f3b9 100644 --- a/media-gfx/ufraw/ChangeLog +++ b/media-gfx/ufraw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/ufraw # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.72 2009/12/27 11:49:56 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.73 2009/12/28 16:09:03 maekke Exp $ + + 28 Dec 2009; Markus Meier <maekke@gentoo.org> ufraw-0.16.ebuild: + autoenable gtk when gimp is enabled, bug #298187 27 Dec 2009; Markus Meier <maekke@gentoo.org> ufraw-0.16.ebuild: improve gimp/gtk die message, bug #298314 diff --git a/media-gfx/ufraw/ufraw-0.16.ebuild b/media-gfx/ufraw/ufraw-0.16.ebuild index 326e4acd3918..81ed9d0e511e 100644 --- a/media-gfx/ufraw/ufraw-0.16.ebuild +++ b/media-gfx/ufraw/ufraw-0.16.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild,v 1.8 2009/12/27 11:49:56 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.16.ebuild,v 1.9 2009/12/28 16:09:03 maekke Exp $ +EAPI=2 inherit fdo-mime gnome2-utils DESCRIPTION="RAW Image format viewer and GIMP plugin" @@ -13,27 +14,24 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86" IUSE="contrast exif lensfun gimp gnome gtk hotpixels openmp timezone" -RDEPEND=" - media-libs/jpeg +RDEPEND="media-libs/jpeg >=media-libs/lcms-1.13 media-libs/tiff exif? ( >=media-gfx/exiv2-0.11 ) gnome? ( gnome-base/gconf ) - gtk? ( >=x11-libs/gtk+-2.6.0 + gtk? ( >=x11-libs/gtk+-2.6:2 + >=media-gfx/gtkimageview-1.5.0 ) + gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5.0 - gimp? ( >=media-gfx/gimp-2.0 ) ) + >=media-gfx/gimp-2.0 ) lensfun? ( >=media-libs/lensfun-0.2.3 )" DEPEND="${RDEPEND} dev-util/pkgconfig" -pkg_setup() { - if use gimp && ! use gtk; then - eerror "to enable gimp support, you must also enable gtk support for ${PN}" - die "emerge ${PN} with gtk support" - fi -} +src_configure() { + local myconf + use gimp && myconf="--with-gtk" -src_compile() { econf \ --without-cinepaint \ $(use_enable contrast) \ @@ -44,19 +42,26 @@ src_compile() { $(use_enable hotpixels) \ $(use_with lensfun) \ $(use_enable openmp) \ - $(use_enable timezone dst-correction) - emake || die "emake failed" + $(use_enable timezone dst-correction) \ + ${myconf} } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README TODO || die "doc installation failed" + emake DESTDIR="${D}" install || die + dodoc README TODO || die } pkg_postinst() { - if use gnome ; then + if use gnome; then fdo-mime_mime_database_update + fdo-mime_desktop_database_update gnome2_gconf_install + fi +} + +pkg_postrm() { + if use gnome; then fdo-mime_desktop_database_update + fdo-mime_mime_database_update fi } |