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 | ed23617996930ad9576950cb1ebd1384d8751d7a (patch) | |
| tree | 6f30d71f3e4a35226fdb1ef7535c9d9fc0bf82c9 /media-gfx/ufraw | |
| parent | Stop using deprecated kde-functions.eclass. (diff) | |
| download | historical-ed23617996930ad9576950cb1ebd1384d8751d7a.tar.gz historical-ed23617996930ad9576950cb1ebd1384d8751d7a.tar.bz2 historical-ed23617996930ad9576950cb1ebd1384d8751d7a.zip | |
autoenable gtk when gimp is enabled, bug #298187
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'media-gfx/ufraw')
| -rw-r--r-- | media-gfx/ufraw/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/ufraw/Manifest | 10 | ||||
| -rw-r--r-- | media-gfx/ufraw/ufraw-0.16.ebuild | 39 |
3 files changed, 31 insertions, 23 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/Manifest b/media-gfx/ufraw/Manifest index 98ae521be85d..3e561dfb2155 100644 --- a/media-gfx/ufraw/Manifest +++ b/media-gfx/ufraw/Manifest @@ -7,13 +7,13 @@ DIST ufraw-0.15.tar.gz 976297 RMD160 d24e9076114c909e3b2bbf87a128c70f62885299 SH DIST ufraw-0.16.tar.gz 1075577 RMD160 fac67a4d88c006f701b0cce7cc2287d5db90bd72 SHA1 ff91ec619d143bbb4698b1003d53c507aca010e5 SHA256 36f1fe6adb012b34fe0351221e1a0a2c2e08ef05e8eb05ebeab16ccf4ff3df19 EBUILD ufraw-0.15-r1.ebuild 1516 RMD160 4ecfffda846bf8a9439d732738957fbcf097d838 SHA1 cecc0c208f9a44ba5c1ab8007bd1ebbc66bca684 SHA256 f63ad5b9d8e7822be7fe805ed42806b47a1c39a6ae3c1f0cc868080abc9e8047 EBUILD ufraw-0.15-r2.ebuild 1571 RMD160 7615c9acd573000d131e0c8ea4d9172cdcd9dffb SHA1 974233a5a3e55898abab737ca087005ac996cf20 SHA256 ec093fab31fa8e173faa8ce26dc7d9768b2e737ea6094983fcc5d8c97d7a8994 -EBUILD ufraw-0.16.ebuild 1622 RMD160 3ae55392285ddc2309913b9c4c12596aa26fcee5 SHA1 66c702caf24a4e8b7e575c82337a5c07111bb105 SHA256 edcb6298e54134cd6dbb2f86bf229e86c612f6f30fa0657f3f0631267b98b972 -MISC ChangeLog 9807 RMD160 efd924301d3270fc62a5b64f316a74e73ac67ef3 SHA1 80fc3a5f2945ded1049b57254185a9eb607441cd SHA256 b0717c64b935d11d6eaff5545232363502ef33c468aa0b78a2e7e643df156105 +EBUILD ufraw-0.16.ebuild 1609 RMD160 a752a693be76889ce0fe2855847b00020aaaf4bf SHA1 a1d60cd241b8622c4a8ec5a410452182bfc2e5b7 SHA256 aa9b6a05a8361406aae228e50ab16bca0927f6871589db9216e00090457cad90 +MISC ChangeLog 9926 RMD160 5f7ba8e48b63fa0d47dce88f510ad06c4c842d87 SHA1 cc98fae4a7cad03d92008ed58b3f2752c67fea3d SHA256 e756f072fb6c761d3ba1e49b7eb53927b117acabed9fa86e09ada9e6df0861c4 MISC metadata.xml 474 RMD160 14f5c83e8f19638afca3bbe619f85b45220ecf34 SHA1 839993e94456077f3ed4e38fcca33ef11892feed SHA256 0b1cad543f88fe992c851820ad67e036bc7350d60b70a96f7435036242a61989 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAks3SkYACgkQkKaRLQcq0GLclwCgoBVv5xZA7hMepWHUosFGdtId -GXoAn346V3R08BSN4wp+3QJBd7VxALOn -=k0/D +iEYEARECAAYFAks42HEACgkQkKaRLQcq0GLLRACfRmuBxlQzK0A2/13mMWtYjdOw +3w4An34kON5P+UtCzeO758V/d7GSQuLs +=KvBB -----END PGP SIGNATURE----- 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 } |