add patch to disable automagic dependencies, bug #254109

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

4 files changed, 243 insertions, 2 deletions

diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index 30e438c69761..f9ae5c5cb795 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2009/02/14 18:13:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.47 2009/02/14 22:03:42 maekke Exp $
+
+*ufraw-0.15-r1 (14 Feb 2009)
+
+  14 Feb 2009; Markus Meier <maekke@gentoo.org>
+  +files/ufraw-0.15-configure.patch, +ufraw-0.15-r1.ebuild:
+  add patch to disable automagic dependencies, bug #254109
 
   14 Feb 2009; Brent Baude <ranger@gentoo.org> ufraw-0.15.ebuild:
   stable ppc, bug 257675
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index afa596f1d7f3..9a926fa1e589 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ufraw-0.13-cflags.patch 893 RMD160 1723eb81a72e2b73b6966ebbe44582d1b32611a7 SHA1 5db57852086f7ba659626776743c3450af51ea7b SHA256 499862f216d34e01340199a402c4806cab9f59bc5168b493be16c48b19cdf9cd
+AUX ufraw-0.15-configure.patch 5639 RMD160 a9defb4d42f0ed477d28d6957e6037bc870a892a SHA1 d8559bc7014a259af026e85f1179a9ecdcf03a48 SHA256 0add4c3ec73ab10f89f53a90dccbc191d288c3542ecb64a20a9e426ae8a34c61
 DIST ufraw-0.14.1.tar.gz 968091 RMD160 250cf7d93d120fde302b9533e2182b0ae421df87 SHA1 1234717d4da8f35f015fbcc678bd467c98969571 SHA256 7f3ddcc2a0e156986904e7db69e220c96a83b9b12d7e8e2a0ef4a74b0e9bb0d5
 DIST ufraw-0.15.tar.gz 976297 RMD160 d24e9076114c909e3b2bbf87a128c70f62885299 SHA1 e8c7fa95bfb84e18ee538495861e52516ca8b3b8 SHA256 136916d39c7bb76e8e1620066baa258186c13639d64ad87f48d44fa9a766c331
 EBUILD ufraw-0.14.1.ebuild 1367 RMD160 133f393cf711752ba9b0ba2ca11bfee34ccb6d2c SHA1 97e921917dede3a02eaedd499be733f2de507384 SHA256 3e3422ea956a256cc9ee4feca556493fcab0157967ec696712b6f09f35e02a0c
+EBUILD ufraw-0.15-r1.ebuild 1482 RMD160 3cd10221daf9ad59a14b31232b515468fa3217ce SHA1 05b4dc3a4a94f47fd42c12f4d6efc66a9fb26930 SHA256 9bbe48e995d35582b80df4d3a31330da16905151b29b1d4ea5b68c7474f923f7
 EBUILD ufraw-0.15.ebuild 1243 RMD160 74fce8bc4c0c7334e066e25677ae058eae73b26c SHA1 c68a1087e784106a334491ea945b5a72c78a65e3 SHA256 6d1636f3936edb1c023d56503e0e25becc3332391c4328e9c81267625d512c79
-MISC ChangeLog 6740 RMD160 5153e9d352fceaff7b99756844880414bd85a113 SHA1 5121074c280a1905b6b54428fb5ad7051c852a15 SHA256 7aca63579b9adbfdb1ac6fdeef39478933781979948602850c56d8dc008d0f12
+MISC ChangeLog 6938 RMD160 87afd077f8aa22e388046409401f166929780c13 SHA1 48a3942d119bd72a3ba2c0ea366cc22fb8ca5544 SHA256 bdc8651ee54a3f191755e4d16e5ec252656669dba6ee4e5166303a777f5bafc1
 MISC metadata.xml 343 RMD160 354197e4cfd76654d365da993d2f08318831a5e0 SHA1 ef9ecaba65d89a0425581c9dced569aa504403c1 SHA256 3a530bd78a6494591efafbaf5d9ed6cd5b5875d920cf96e19f7da2ee968bc149
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmXQBsACgkQkKaRLQcq0GIDAgCglrvC+k5mXlxW7VipWwQ8dmkM
+0A8AnR+1O4OlDISdzRB6p30A98VHuwco
+=Zd19
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/ufraw/files/ufraw-0.15-configure.patch b/media-gfx/ufraw/files/ufraw-0.15-configure.patch
new file mode 100644
index 000000000000..5c5d6f93e00d
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.15-configure.patch
@@ -0,0 +1,164 @@
+--- configure.ac.orig	2009-02-11 21:33:33.000000000 +0100
++++ configure.ac	2009-02-14 22:52:35.000000000 +0100
+@@ -83,13 +83,27 @@
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+ PKG_CHECK_MODULES(GLIB, glib-2.0)
+ PKG_CHECK_MODULES(LCMS, lcms)
+-PKG_CHECK_MODULES(GTKIMAGEVIEW, gtkimageview >= 1.3,
+-  [ have_gtkimageview=yes
+-    GTK_LIBS=$GTKIMAGEVIEW_LIBS
+-    GTK_CFLAGS=$GTKIMAGEVIEW_CFLAGS
+-    AC_DEFINE(HAVE_GTKIMAGEVIEW, 1, have gtk image view) ],
+-  [ have_gtkimageview=no
+-    AC_MSG_RESULT($GTKIMAGEVIEW_PKG_ERRORS) ] )
++
++AC_ARG_WITH([gtkimageview],
++  [AS_HELP_STRING([--with-gtkimageview],
++  [use gtkimageview for previews @<:@default=check@:>@])],
++  [],
++  [with_gtkimageview=check])
++
++have_gtkimageview=no
++AS_IF([test "x$with_gtkimageview" != xno],
++  [PKG_CHECK_MODULES(GTKIMAGEVIEW, gtkimageview >= 1.3,
++    [ have_gtkimageview=yes
++      GTK_LIBS=$GTKIMAGEVIEW_LIBS
++      GTK_CFLAGS=$GTKIMAGEVIEW_CFLAGS
++      AC_DEFINE(HAVE_GTKIMAGEVIEW, 1, have gtk image view) ],
++    [ have_gtkimageview=no
++      if test "x$with_gtkimageview" != xcheck; then
++        AC_MSG_FAILURE(
++          [--with-gtkimageview was given, but test for gtkimageview failed])
++      fi
++    ] ) ] )
++
+ AC_SUBST(GTK_LIBS)
+ if test "$have_gtkimageview" = "yes"; then
+   PKG_CHECK_MODULES(gtk_image_view_damage_pixels, gtkimageview > 1.5.0,
+@@ -106,12 +120,25 @@
+ test $prefix = NONE || pkg_prefix="$pkg_prefix --define-variable=prefix=$prefix"
+ test $exec_prefix = NONE || pkg_prefix="$pkg_prefix --define-variable=exec_prefix=$exec_prefix"
+ 
+-PKG_CHECK_MODULES(GIMP, gimpui-2.0,
+-  [ have_gimp=yes
+-    GIMP_LIBDIR=`$pkg_prefix --variable=gimplibdir gimp-2.0` ],
+-  [ have_gimp=no
+-    GIMP_LIBDIR=
+-    AC_MSG_RESULT($GIMP_PKG_ERRORS) ] )
++AC_ARG_WITH([gimp],
++  [AS_HELP_STRING([--with-gimp],
++  [build gimp plugin @<:@default=check@:>@])],
++  [],
++  [with_gimp=check])
++
++have_gimp=no
++AS_IF([test "x$with_gimp" != xno],
++  [PKG_CHECK_MODULES(GIMP, gimpui-2.0,
++    [ have_gimp=yes
++      GIMP_LIBDIR=`$pkg_prefix --variable=gimplibdir gimp-2.0` ],
++    [ have_gimp=no
++      GIMP_LIBDIR=
++      if test "x$with_gimp" != xcheck; then
++        AC_MSG_FAILURE(
++          [--with-gimp was given, but test for gimp failed])
++      fi
++    ] ) ] )
++
+ AM_CONDITIONAL(MAKE_GIMP, test $have_gimp = yes)
+ AC_SUBST(GIMP_CFLAGS)
+ AC_SUBST(GIMP_LIBS)
+@@ -122,14 +149,27 @@
+     [ AC_DEFINE_UNQUOTED(HAVE_GIMP_2_6, 0, have Gimp 2.6 or later) ])
+ fi
+ 
+-PKG_CHECK_MODULES(CINEPAINT, cinepaint-gtk >= 0.22,
+-  [ have_cinepaint=yes
+-    CINEPAINT_LIBDIR=`$pkg_prefix --variable=libdir cinepaint-gtk`
+-    CINEPAINT_PROGRAMPLUGINDIR=`$pkg_prefix --variable=programplugindir cinepaint-gtk` ],
+-  [ have_cinepaint=no
+-    CINEPAINT_LIBDIR=
+-    CINEPAINT_PROGRAMPLUGINDIR=
+-    AC_MSG_RESULT($CINEPAINT_PKG_ERRORS) ] )
++AC_ARG_WITH([cinepaint],
++  [AS_HELP_STRING([--with-cinepaint],
++  [build cinepaint plugin @<:@default=check@:>@])],
++  [],
++  [with_cinepaint=check])
++
++have_cinepaint=no
++AS_IF([test "x$with_cinepaint" != xno],
++  [PKG_CHECK_MODULES(CINEPAINT, cinepaint-gtk >= 0.22,
++    [ have_cinepaint=yes
++      CINEPAINT_LIBDIR=`$pkg_prefix --variable=libdir cinepaint-gtk`
++      CINEPAINT_PROGRAMPLUGINDIR=`$pkg_prefix --variable=programplugindir cinepaint-gtk` ],
++    [ have_cinepaint=no
++      CINEPAINT_LIBDIR=
++      CINEPAINT_PROGRAMPLUGINDIR=
++      if test "x$with_cinepaint" != xcheck; then
++        AC_MSG_FAILURE(
++          [--with-cinepaint was given, but test for cinepaint failed])
++      fi
++    ] ) ] )
++
+ AM_CONDITIONAL(MAKE_CINEPAINT, test $have_cinepaint = yes)
+ AC_SUBST(CINEPAINT_CFLAGS)
+ AC_SUBST(CINEPAINT_LIBS)
+@@ -189,23 +229,43 @@
+   AC_CHECK_LIB(cfitsio, ffcmsg))
+ have_fits=${ac_cv_lib_cfitsio_ffcmsg:-no}
+ 
+-PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.11,
+-  [ have_exiv2=yes
+-    AC_DEFINE(HAVE_EXIV2, 1, have exiv2) ],
+-  [ have_exiv2=no
+-    AC_MSG_RESULT($EXIV2_PKG_ERRORS) ] )
++# check for exiv2 library
++AC_ARG_WITH([exiv2],
++  [AS_HELP_STRING([--with-exiv2],
++  [use exiv2 library for exif information extraction @<:@default=check@:>@])],
++  [],
++  [with_exiv2=check])
++
++have_exiv2=no
++AS_IF([test "x$with_exiv2" != xno],
++  [PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.11,
++    [ have_exiv2=yes
++      AC_DEFINE(HAVE_EXIV2, 1, have exiv2) ],
++    [ have_exiv2=no
++      if test "x$with_exiv2" != xcheck; then
++        AC_MSG_FAILURE(
++          [--with-exiv2 was given, but test for exiv2 failed])
++      fi
++    ] ) ] )
+ 
+ # Check for the lensfun library
+-AC_MSG_CHECKING(whether to use lensfun)
+-AC_ARG_WITH(lensfun,
+-  [  --with-lensfun          use the lensfun library - experimental feature,
+-              read http://ufraw.sourceforge.net/lensfun.html before using it. ],
+-  [ AC_MSG_RESULT(yes)
+-    PKG_CHECK_MODULES(LENSFUN, lensfun >= 0.2.3,
+-      [ have_lensfun=yes
+-        AC_DEFINE(HAVE_LENSFUN, 1, have lensfun library) ] ) ],
+-  [ have_lensfun=no
+-    AC_MSG_RESULT($have_lensfun) ] )
++AC_ARG_WITH([lensfun],
++  [AS_HELP_STRING([--with-lensfun],
++  [use the lensfun library - experimental feature, read http://ufraw.sourceforge.net/lensfun.html before using it. @<:@default=check@:>@])],
++  [],
++  [with_lensfun=check])
++
++have_lensfun=no
++AS_IF([test "x$with_lensfun" != xno],
++  [PKG_CHECK_MODULES(LENSFUN, lensfun >= 0.2.3,
++    [ have_lensfun=yes
++      AC_DEFINE(HAVE_LENSFUN, 1, have lensfun library) ],
++    [ have_lensfun=no
++      if test "x$with_lensfun" != xcheck; then
++        AC_MSG_FAILURE(
++          [--with-lensfun was given, but test for lensfun failed])
++      fi
++    ] ) ] )
+ 
+ # UFRAW_CPPFLAGS is added to the preprocessor flags AM_CPPFLAGS,
+ # affecting also the C and C++ compilers.
diff --git a/media-gfx/ufraw/ufraw-0.15-r1.ebuild b/media-gfx/ufraw/ufraw-0.15-r1.ebuild
new file mode 100644
index 000000000000..454c63f55be7
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.15-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.15-r1.ebuild,v 1.1 2009/02/14 22:03:42 maekke Exp $
+
+inherit fdo-mime gnome2-utils 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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="contrast exif gimp gnome openmp timezone"
+
+RDEPEND="media-libs/jpeg
+	>=media-libs/lcms-1.13
+	media-libs/tiff
+	>=x11-libs/gtk+-2.4.0
+	exif? ( >=media-libs/libexif-0.6.13
+	        media-gfx/exiv2 )
+	gimp? ( >=media-gfx/gimp-2.0 )
+	gnome? ( gnome-base/gconf )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--without-cinepaint \
+		--without-gtkimageview \
+		--without-lensfun \
+		$(use_enable contrast) \
+		$(use_with exif exiv2) \
+		$(use_with gimp) \
+		$(use_enable gnome mime) \
+		$(use_enable openmp) \
+		$(use_enable timezone dst-correction)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README TODO || die "doc installation failed"
+}
+
+pkg_postinst() {
+	if use gnome ; then
+		fdo-mime_mime_database_update
+		gnome2_gconf_install
+		fdo-mime_desktop_database_update
+	fi
+}