version bump, drop some keywords as some deps changed. fix automagic dep on cfitsio based on a patch of Xarthisius in bug #311339

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 119 insertions, 6 deletions

diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index cdf1d2d074b4..455f390fb913 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/ufraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.79 2010/01/31 21:57:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.80 2010/04/02 14:34:28 maekke Exp $
+
+*ufraw-0.17 (02 Apr 2010)
+
+  02 Apr 2010; Markus Meier <maekke@gentoo.org> +ufraw-0.17.ebuild,
+  +files/ufraw-0.17-cfitsio-automagic.patch, metadata.xml:
+  version bump, drop some keywords as some deps changed. fix automagic dep
+  on cfitsio based on a patch of Xarthisius in bug #311339
 
   31 Jan 2010; Markus Meier <maekke@gentoo.org> -ufraw-0.15-r2.ebuild:
   old
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 7b99b2bc4701..10f98d04ccf5 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 AUX ufraw-0.15-configure.patch 5639 RMD160 a9defb4d42f0ed477d28d6957e6037bc870a892a SHA1 d8559bc7014a259af026e85f1179a9ecdcf03a48 SHA256 0add4c3ec73ab10f89f53a90dccbc191d288c3542ecb64a20a9e426ae8a34c61
 AUX ufraw-0.15-glibc-2.10.patch 521 RMD160 26d0ae42996d5c556926e16404719bb1281ef224 SHA1 764ccc57a7995be5d55c0229ead66bf8b48792d3 SHA256 0aba174ca46435d442429b6ab5f97ff9189724ab49370ad6b514785b2bd88bcf
+AUX ufraw-0.17-cfitsio-automagic.patch 933 RMD160 ba06bdbed5c9bc5028ea2a8de10f68adc80b4751 SHA1 ad23bf8e091540199a1b61f0e47fb9cbfe87c833 SHA256 d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18
 DIST ufraw-0.15.tar.gz 976297 RMD160 d24e9076114c909e3b2bbf87a128c70f62885299 SHA1 e8c7fa95bfb84e18ee538495861e52516ca8b3b8 SHA256 136916d39c7bb76e8e1620066baa258186c13639d64ad87f48d44fa9a766c331
 DIST ufraw-0.16.tar.gz 1075577 RMD160 fac67a4d88c006f701b0cce7cc2287d5db90bd72 SHA1 ff91ec619d143bbb4698b1003d53c507aca010e5 SHA256 36f1fe6adb012b34fe0351221e1a0a2c2e08ef05e8eb05ebeab16ccf4ff3df19
+DIST ufraw-0.17.tar.gz 1158114 RMD160 785d46e6936f176220dbf77f86dd373ef0250a79 SHA1 0762b238cdcd708948b5aeac552f7f2b1edb1846 SHA256 f65a32d9bc1edbf5399e6d3e18617df4380f13d8d02d32fa2aaee4a404beb6a2
 EBUILD ufraw-0.15-r1.ebuild 1516 RMD160 4ecfffda846bf8a9439d732738957fbcf097d838 SHA1 cecc0c208f9a44ba5c1ab8007bd1ebbc66bca684 SHA256 f63ad5b9d8e7822be7fe805ed42806b47a1c39a6ae3c1f0cc868080abc9e8047
 EBUILD ufraw-0.16.ebuild 1667 RMD160 7492ff6cbd414a44764afc9b4f66c7a4ff424581 SHA1 e8605e09b5c240e8922a8f17c7f16ef3413e2765 SHA256 1a8109def75a2f7e67e7745cf39e10dec969fbe6b99bda07eb4de4378d2b5cc0
-MISC ChangeLog 10511 RMD160 7e45d4deb0461e9df64155493240e3c9323e4eac SHA1 14fe59cfe149770ccbe29984ac90bd7489c9ca1c SHA256 aa1cd7492004381f266534687b81f4ea30d3c24000a127bddcf5491263068361
-MISC metadata.xml 474 RMD160 14f5c83e8f19638afca3bbe619f85b45220ecf34 SHA1 839993e94456077f3ed4e38fcca33ef11892feed SHA256 0b1cad543f88fe992c851820ad67e036bc7350d60b70a96f7435036242a61989
+EBUILD ufraw-0.17.ebuild 1697 RMD160 e6eff142986e4fcc1079ba08cb4716d2525dc0d1 SHA1 90869a633b26593d9dfc083b2a4e523dbe0bd138 SHA256 a3f14f0166f73f0045d2e66f51a1599161b8c94c1739574419bf4d5e9908da0a
+MISC ChangeLog 10800 RMD160 57176f610f4a37e209712963225abe8e557f085d SHA1 27edeec2b6dc80a16a43b1dd6d4c99f4b1281cd0 SHA256 4904970a7fdf32af9bd0b0fe5361c011cba3673a8a490122837a0eaf74e923af
+MISC metadata.xml 585 RMD160 60e7b9d7522fe5fb746986f8ac5c40acfb281eba SHA1 558183b73a8c78e37560063b945110195e9640bc SHA256 a1626014c8e6f43d3c19ec1b41a78e740b5565d5cb1da80c2b6ba5e69e5635dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktl/SQACgkQkKaRLQcq0GKWHwCgoJE4lhJaDkfIZCl8Rcl0D3fX
-XvwAniljZrniIDsvOuYBG8K+QJFy57+1
-=8Ww8
+iEYEARECAAYFAku2AMEACgkQkKaRLQcq0GLgRgCeMA554O4bED4fg9XdgFrThU3G
+Lp8AnR1kf3OW5VVKQ+oquLQixnjhEwUF
+=rraF
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
new file mode 100644
index 000000000000..aff7c5a25930
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
@@ -0,0 +1,28 @@
+diff -ru ufraw-0.17.orig/configure.ac ufraw-0.17/configure.ac
+--- ufraw-0.17.orig/configure.ac	2010-04-02 16:16:08.000000000 +0200
++++ ufraw-0.17/configure.ac	2010-04-02 16:19:33.000000000 +0200
+@@ -246,11 +246,19 @@
+   [ have_png=no
+     AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] )
+ 
+-PKG_CHECK_MODULES(CFITSIO, cfitsio,
+-  [ have_cfitsio=yes
+-    AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
+-  [ have_cfitsio=no
+-    AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] )
++AC_ARG_WITH([cfitsio],
++  [AS_HELP_STRING([--with-cfitsio],
++  [build fits support @<:@default=check@:>@])],
++  [],
++  [with_cfitsio=check])
++
++have_cfitsio=no
++AS_IF([test "x$with_cfitsio" != xno],
++  [PKG_CHECK_MODULES(CFITSIO, cfitsio,
++    [ have_cfitsio=yes
++      AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
++    [ have_cfitsio=no
++      AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] )
+ 
+ PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16,
+   [ have_exiv2=yes
diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index cded40dd8831..998ca7299423 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/metadata.xml
@@ -6,6 +6,9 @@
 		<flag name='contrast'>
 			enable contrast setting option
 		</flag>
+		<flag name='fits'>
+			Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg>
+		</flag>
 		<flag name='hotpixels'>
 			enable hot pixel elimination
 		</flag>
diff --git a/media-gfx/ufraw/ufraw-0.17.ebuild b/media-gfx/ufraw/ufraw-0.17.ebuild
new file mode 100644
index 000000000000..41debfa25e8f
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.17.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.17.ebuild,v 1.1 2010/04/02 14:34:28 maekke Exp $
+
+EAPI=2
+inherit fdo-mime gnome2-utils eutils autotools
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.11
+	media-libs/jpeg
+	>=media-libs/lcms-1.13
+	>=media-libs/lensfun-0.2.5
+	media-libs/tiff
+	fits? ( sci-libs/cfitsio )
+	gnome? ( gnome-base/gconf )
+	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
+		>=media-gfx/gimp-2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cfitsio-automagic.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use gimp && myconf="--with-gtk"
+
+	econf \
+		--without-cinepaint \
+		$(use_enable contrast) \
+		$(use_with fits cfitsio) \
+		$(use_with gimp) \
+		$(use_enable gnome mime) \
+		$(use_with gtk) \
+		$(use_enable openmp) \
+		$(use_enable timezone dst-correction) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README TODO || die
+}
+
+pkg_postinst() {
+	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
+}