[gentoo-commits] dev/maekke:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/

["Markus Meier" <maekke@gentoo.org>]

commit:     35dbab0ae36809dda6a7ead78519a6feefdf1c47
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 09:53:34 2011 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 09:53:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=35dbab0a

sync with main tree

(Portage version: 2.1.10.31/git/Linux x86_64, signed Manifest commit with key 072AD062)

---
 media-gfx/ufraw/Manifest                           |    9 +++---
 .../ufraw/files/ufraw-0.17-cfitsio-automagic.patch |   28 ++++++++++++++++++++
 media-gfx/ufraw/ufraw-9999.ebuild                  |   25 +++++++++++------
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index b9d2021..1abe2a6 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD ufraw-9999.ebuild 1599 RMD160 e73007e2a462d48449ad2006186c5545712c9047 SHA1 161b14fa28c4ab5aa576c08ad1ae67d4fa6bc0be SHA256 f90d101b52e090d82ad05a32b7c8b2f9b64ddd32211c2b3804f79c80940427f9
+AUX ufraw-0.17-cfitsio-automagic.patch 933 RMD160 ba06bdbed5c9bc5028ea2a8de10f68adc80b4751 SHA1 ad23bf8e091540199a1b61f0e47fb9cbfe87c833 SHA256 d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18
+EBUILD ufraw-9999.ebuild 1752 RMD160 517152efd994587ede6ca3cd5ac25ab1f3ac041e SHA1 8111f21bf365790a8eaf8ce844cce07b09925431 SHA256 ec868aed3ce0088f1b5398ecde94a941e75a0202988131242912867d3c7d5aee
 MISC ChangeLog 10748 RMD160 cdcd16efb7f643070c3c509b2db0a44d58a85147 SHA1 1f1e96a85f3eca14d497c5c0732ac00e67576257 SHA256 85eeb8faf237678885556506ae213edc99ed8354116ea18aaed0dabb80d2790e
 MISC metadata.xml 437 RMD160 41af290fb581cd048ec5a8c1c45b38696fedfcd5 SHA1 28c404d79130498bbd8d01bca5d906f19262a232 SHA256 101562af2e68f9ce05d05494d48c03aaae046560eab55d6c5d472ae85fe3e4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4FnEYACgkQkKaRLQcq0GK6vwCbBV9pmaXjijgDO0e5odQEknMH
-+dMAnifaF/fEVAoxzAuGGlmLbn9y3kVS
-=SyZ0
+iEYEARECAAYFAk61B54ACgkQkKaRLQcq0GLktQCfY/TmilJC64zWRk0zQO+nXpUD
+oHIAn2+f9kwALCJ9u9WHNSKQD/dHzmFB
+=xEKU
 -----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 0000000..aff7c5a
--- /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/ufraw-9999.ebuild b/media-gfx/ufraw/ufraw-9999.ebuild
index db9944a..da535cc 100644
--- a/media-gfx/ufraw/ufraw-9999.ebuild
+++ b/media-gfx/ufraw/ufraw-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit fdo-mime gnome2-utils eutils autotools cvs
+EAPI=4
+inherit autotools eutils fdo-mime cvs gnome2-utils
 
 DESCRIPTION="RAW Image format viewer and GIMP plugin"
 HOMEPAGE="http://ufraw.sourceforge.net/"
@@ -14,19 +14,19 @@ SLOT="0"
 KEYWORDS=""
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
-RDEPEND="
+RDEPEND="dev-libs/glib:2
 	>=media-gfx/exiv2-0.11
 	virtual/jpeg
 	=media-libs/lcms-1*
 	>=media-libs/lensfun-0.2.5
 	media-libs/tiff
 	fits? ( sci-libs/cfitsio )
-	gnome? ( gnome-base/gconf )
+	gnome? ( >=gnome-base/gconf-2 )
 	gtk? ( >=x11-libs/gtk+-2.6:2
-		>=media-gfx/gtkimageview-1.5.0 )
+		>=media-gfx/gtkimageview-1.5 )
 	gimp? ( >=x11-libs/gtk+-2.6:2
-		>=media-gfx/gtkimageview-1.5.0
-		>=media-gfx/gimp-2.0 )"
+		>=media-gfx/gtkimageview-1.5
+		>=media-gfx/gimp-2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -43,6 +43,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
 	eautoreconf
 }
 
@@ -63,8 +64,14 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO || die
+	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+	dodoc README TODO
+}
+
+pkg_preinst() {
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
 }
 
 pkg_postinst() {