Adding options patch for bug #103365

Package-Manager: portage-2.1_pre3-r1

5 files changed, 363 insertions, 9 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 7913f38e212d..4f105b98c935 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gthumb
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.52 2005/12/19 10:59:35 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.53 2006/01/10 23:05:36 compnerd Exp $
+
+*gthumb-2.6.8-r2 (10 Jan 2006)
+
+  10 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gthumb-2.6.8-options.patch, +gthumb-2.6.8-r2.ebuild:
+  Adding options patch resolg bug #103365
 
   19 Dec 2005; Markus Rothe <corsair@gentoo.org> gthumb-2.6.8-r1.ebuild:
   Added ~ppc64; bug #112129
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 1ac6fb4878c3..201a43602066 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,13 +1,16 @@
-MD5 eab10657949e119943085ff35207389e ChangeLog 7063
-MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238
-MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421
-MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425
-MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420
-MD5 f41704454939e52af874702071f4ac5e gthumb-2.6.8-r1.ebuild 1376
+MD5 8f942fefeeec98279ae144b03b40fbc6 ChangeLog 7257
 MD5 c1d4c50442ad19c29af3bb85dd427716 files/digest-gthumb-2.6.3 66
 MD5 1724520898546aadcf150ec88c8a2e7a files/digest-gthumb-2.6.5 66
 MD5 af2acaad904b53afb8e81cc75c772af0 files/digest-gthumb-2.6.7 66
 MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8 66
 MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8-r1 66
+MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8-r2 66
 MD5 ee3d9e84ae0099f382f5ebf3e922c5b4 files/gthumb-2.6.8-Makefile.patch 1326
+MD5 d7db541c678b9e3856f0c63292c416a1 files/gthumb-2.6.8-options.patch 8379
+MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238
+MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421
+MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425
+MD5 f41704454939e52af874702071f4ac5e gthumb-2.6.8-r1.ebuild 1376
+MD5 a30ddfff0b8d2a3d7b75ffc2006928f6 gthumb-2.6.8-r2.ebuild 1585
+MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2 b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2
new file mode 100644
index 000000000000..012b049935ae
--- /dev/null
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.8-r2
@@ -0,0 +1 @@
+MD5 9dcc9600feb5e1cab9d876f1a047a621 gthumb-2.6.8.tar.bz2 2343475
diff --git a/media-gfx/gthumb/files/gthumb-2.6.8-options.patch b/media-gfx/gthumb/files/gthumb-2.6.8-options.patch
new file mode 100644
index 000000000000..9884989c897a
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.6.8-options.patch
@@ -0,0 +1,284 @@
+--- configure.in	2005-09-21 02:56:09.000000000 -0500
++++ configure.in	2006-01-09 22:57:14.000000000 -0600
+@@ -98,133 +98,164 @@
+ # 
+ # Checks for libpng
+ # 
+-AC_MSG_CHECKING(for libpng)
+-  if test -z "$PNG_LIBS"; then
+-    AC_CHECK_LIB(png, png_read_info,
+-      [AC_CHECK_HEADER(png.h,
+-        png_ok=yes,
+-        png_ok=no)],
+-      AC_MSG_ERROR(*** PNG library (libpng) not found ***), -lz -lm)
+-    if test "$png_ok" = yes; then
+-      AC_MSG_CHECKING([for png_structp in png.h])
+-      AC_TRY_COMPILE([#include <png.h>],
+-        [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
+-        png_ok=yes,
+-        png_ok=no)
+-      AC_MSG_RESULT($png_ok)
+-      if test "$png_ok" = yes; then
+-        PNG_LIBS='-lpng -lz'
+-      else
+-        AC_MSG_ERROR(*** PNG library (libpng) is too old ***)
+-      fi
+-    else
+-     AC_MSG_ERROR(*** PNG header file not found ***)
+-    fi
+-  fi
+ 
+-AC_SUBST(PNG_LIBS)
++AC_ARG_ENABLE([png],
++              [AC_HELP_STRING([--disable-png],[disable support for png])],,
++              [enable_png=yes])
++
++if test x$enable_png = xyes ; then
++   AC_MSG_CHECKING(PNG Support)
++   AC_MSG_RESULT()
++
++   AC_CHECK_LIB(png, png_read_info,
++                [AC_CHECK_HEADER(png.h,,[AC_MSG_ERROR([*** PNG headers not found ***])])],
++                [AC_MSG_ERROR([*** PNG library not found ***])])
++
++   AC_MSG_CHECKING([for png_structp in png.h])
++   AC_TRY_COMPILE([#include <png.h>],
++                  [png_struct pp; png_infop info; png_colorp cmap;png_create_read_struct;],,
++                  [AC_MSG_ERROR([*** PNG library (libpng) is too old ***])])
++
++   PNG_LIBS='-lpng -lm -lz'
++   AC_SUBST(PNG_LIBS)
++
++   HAVE_PNG=yes
++else
++   HAVE_PNG=no
++fi
+ 
+ 
+ # 
+ # Checks for libjpeg
+ # 
+-jpeg_ok=no
+-AC_MSG_CHECKING(for libjpeg)
+-  if test -z "$JPEG_LIBS"; then
+-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+-      [AC_CHECK_HEADER(jpeglib.h,
+-        jpeg_ok=yes,
+-        jpeg_ok=no)],
+-      AC_MSG_WARN([*** Internal jpegtran will not be built (JPEG library not found) ***]), -lm)
+-    if test "$jpeg_ok" = yes; then
+-      JPEG_LIBS='-ljpeg'
+-      AC_DEFINE(HAVE_LIBJPEG, 1, [Have libjpeg])
+-      AC_CHECK_LIB(jpeg, jpeg_simple_progression,     
+-        AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
+-                  [Define to 1 if jpeglib supports progressive JPEG.]),
+-        AC_MSG_WARN(JPEG library does not support progressive saving.))
+-    else
+-      AC_MSG_WARN([*** Internal jpegtran will not be built (JPEG library not found) ***])
+-    fi
+-  fi
+ 
+-AC_SUBST(JPEG_LIBS)
++AC_ARG_ENABLE([jpeg],
++              [AC_HELP_STRING([--disable-jpeg],[disable support for jpeg])],,
++              [enable_jpeg=yes])
++
++if test x$enable_jpeg = xyes ; then
++   AC_MSG_CHECKING(JPEG Support)
++   AC_MSG_RESULT()
++
++   AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
++                [AC_CHECK_HEADER(jpeglib.h,,[AC_MSG_ERROR([*** JPEG headers not found ***])])],
++                [AC_MSG_ERROR([*** JPEG library not found ***])])
++
++   AC_CHECK_LIB(jpeg, jpeg_simple_progression,
++                [AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, [Define to 1 if libjpeg supports progressive JPEG.])],
++                [AC_MSG_WARN(JPEG library does not support progressive saving.)])
++
++   JPEG_LIBS='-ljpeg -lm -lz'
++   AC_SUBST(JPEG_LIBS)
++
++   HAVE_JPEG=yes
++else
++   HAVE_JPEG=no
++fi
+ 
+ 
+ # 
+ # Checks for libtiff
+ # 
+-tiff_ok=no
+-AC_MSG_CHECKING(for libtiff)
+-  if test -z "$TIFF_LIBS"; then
+-    AC_CHECK_LIB(tiff, TIFFWriteScanline,
+-      [AC_CHECK_HEADER(tiffio.h,
+-        tiff_ok=yes,
+-        tiff_ok=no)],
+-      AC_MSG_WARN([*** (TIFF library not found) ***]), -lm -lz)
+-    if test "$tiff_ok" = yes; then
+-      TIFF_LIBS='-ltiff -ljpeg -lz'
+-      AC_DEFINE(HAVE_LIBTIFF, 1, [Have libtiff])
+-    else
+-      AC_MSG_WARN([*** (TIFF library not found) ***])
+-    fi
+-  fi
+ 
+-AC_SUBST(TIFF_LIBS)
++AC_ARG_ENABLE([tiff],
++              [AC_HELP_STRING([--disable-tiff],[disable support for tiff])],,
++              [enable_tiff=yes])
++
++if test x$enable_tiff = xyes ; then
++   AC_MSG_CHECKING(TIFF Support)
++   AC_MSG_RESULT()
+ 
++   AC_CHECK_LIB(tiff, TIFFWriteScanline,
++                [AC_CHECK_HEADER(tiffio.h,,[AC_MSG_ERROR([*** TIFF headers not found ***])])],
++                [AC_MSG_ERROR([*** TIFF library not found ***])])
++
++   AC_DEFINE(HAVE_LIBTIFF, 1, [Define to 1 if libtiff support is included])
++
++   TIFF_LIBS='-ltiff -lm -lz'
++   AC_SUBST(TIFF_LIBS)
++
++   HAVE_TIFF=yes
++else
++   HAVE_TIFF=no
++fi
+ 
+ #
+ # Checks for Xft/XRender
+ #
+-have_render=false
+-RENDER_LIBS=""
+-AC_CHECK_LIB(Xrender, XRenderFindFormat, 
+-    have_render=true,:,-lXext $GTHUMB_LIBS)
+-if $have_render ; then
+-   RENDER_LIBS="-lXrender -lXext"
+-   AC_DEFINE(HAVE_RENDER, 1, [Have Xft/XRender])
++
++AC_ARG_ENABLE([render],
++              [AC_HELP_STRING([--disable-render],[disable support for Xrender])],,
++              [enable_render=yes])
++
++if test x$enable_render = xyes ; then
++   AC_MSG_CHECKING(Xrender Support)
++   AC_MSG_RESULT()
++
++   AC_CHECK_LIB(Xrender, XRenderFindFormat,,,[-lXext $GTHUMB_LIBS])
++
++   AC_DEFINE(HAVE_RENDER, 1, [Define to 1 if Xft/XRender support is included])
++
++   RENDER_LIBS='-lXrender -lXext'
++   AC_SUBST(RENDER_LIBS)
++
++   HAVE_RENDER=yes
++else
++   HAVE_RENDER=no
+ fi
+-AC_SUBST(RENDER_LIBS)
+ 
+ #
+ # Checks for libexif
+ #
+-AC_MSG_CHECKING(for libexif)
+-have_libexif=no
+-EXIF_LIBS=""
+-EXIF_CFLAGS=""
+-if pkg-config --atleast-version=$LIBEXIF_REQUIRED libexif; then
+-   have_libexif="yes (0.6.x)"
+-   EXIF_LIBS=`pkg-config --libs libexif`
+-   EXIF_CFLAGS=`pkg-config --cflags libexif`
+-   AC_DEFINE(HAVE_LIBEXIF, 1, [Have libexif])
+-elif pkg-config --atleast-version=$LIBEXIF_0_5_REQUIRED libexif; then
+-   have_libexif="yes (0.5.x)"
+-   EXIF_LIBS=`pkg-config --libs libexif`
+-   EXIF_CFLAGS=`pkg-config --cflags libexif`
+-   AC_DEFINE(HAVE_LIBEXIF, 1, [Have libexif])
+-   AC_DEFINE(HAVE_LIBEXIF_0_5, 1, [Have libexif 0.5.x])
+-fi
+-AC_MSG_RESULT($have_libexif)
+-AC_SUBST(EXIF_LIBS)
+-AC_SUBST(EXIF_CFLAGS)
++
++AC_ARG_ENABLE([exif],
++              [AC_HELP_STRING([--disable-exif],[disable support for libexif])],,
++              [enable_exif=yes])
++
++if test x$enable_exif = xyes ; then
++   AC_MSG_CHECKING(EXIF Support)
++   AC_MSG_RESULT()
++
++   PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_REQUIRED,,
++                     [PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_0_5_REQUIRED,
++                                        [AC_DEFINE(HAVE_LIBEXIF_0_5, 1, [Using libexif 0.5])],
++                                        [AC_MSG_ERROR([*** libexif not found ***])]
++                                       )
++                     ])
++
++   AC_DEFINE(HAVE_LIBEXIF, 1, [Define to 1 if we have libexif support])
++
++   AC_SUBST(EXIF_LIBS)
++   AC_SUBST(EXIF_CFLAGS)
++
++   HAVE_EXIF=yes
++else
++   HAVE_EXIF=no
++fi
+ 
+ #
+ # Checks for libgphoto2
+ #
+-AC_MSG_CHECKING(for libgphoto2)
+-have_libgphoto=no
+-LIBGPHOTO_LIBS=""
+-LIBGPHOTO_CFLAGS=""
+-if pkg-config --atleast-version=$LIBGPHOTO_REQUIRED libgphoto2; then
+-   have_libgphoto=yes
+-   LIBGPHOTO_LIBS=`pkg-config --libs libgphoto2`
+-   LIBGPHOTO_CFLAGS=`pkg-config --cflags libgphoto2`
+-   AC_DEFINE(HAVE_LIBGPHOTO, 1, [Have libgphoto])
+-fi
+-AC_MSG_RESULT($have_libgphoto)
+-AC_SUBST(LIBGPHOTO_LIBS)
+-AC_SUBST(LIBGPHOTO_CFLAGS)
++
++AC_ARG_ENABLE([gphoto2],
++              [AC_HELP_STRING([--disable-gphoto2],[disable support for libgphoto2])],,
++              [enable_gphoto2=yes])
++
++if test x$enable_gphoto2 = xyes ; then
++   AC_MSG_CHECKING(GPHOTO2 Support)
++   AC_MSG_RESULT()
++
++   PKG_CHECK_MODULES(GPHOTO, libgphoto2 >= $LIBGPHOTO_REQUIRED)
++
++   AC_DEFINE(HAVE_LIBGPHOTO, 1, [Define to 1 to enable libgphoto2 support])
++
++   AC_SUBST(GPHOTO_LIBS)
++   AC_SUBST(GPHOTO_CFLAGS)
++
++   HAVE_GPHOTO2=yes
++else
++   HAVE_GPHOTO2=no
++fi
+ 
+ dnl ###############################################
+ 
+@@ -308,10 +339,11 @@
+ 
+         Source code location:   ${srcdir}
+         Compiler:               ${CC}
+-    	Have Render:            ${have_render}
+-    	Have libexif:           ${have_libexif}
+-	Have libjpeg:           ${jpeg_ok}
+-	Have libtiff:           ${tiff_ok}
+-	Have libgphoto:         ${have_libgphoto}
++    	Have Render:            ${HAVE_RENDER}
++    	Have libexif:           ${HAVE_EXIF}
++	Have libpng:            ${HAVE_PNG}
++	Have libjpeg:           ${HAVE_JPEG}
++	Have libtiff:           ${HAVE_TIFF}
++	Have libgphoto:         ${HAVE_GPHOTO2}
+ 
+ "
diff --git a/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild b/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..38a411710dab
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.8-r2.ebuild,v 1.1 2006/01/10 23:05:36 compnerd Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="http://gthumb.sourceforge.net/"
+LICENSE="GPL-2"
+
+IUSE="jpeg tiff png gphoto2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=x11-libs/gtk+-2.4
+	>=dev-libs/libxml2-2.4
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomecanvas-2.6
+	>=gnome-base/gnome-vfs-2.6
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.6
+	>=gnome-base/libbonobo-2.6
+	>=gnome-base/libbonoboui-2.6
+	>=gnome-base/gconf-2.6
+	exif? ( >=media-libs/libexif-0.5.12 )
+	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable exif) $(use_enable gphoto2) \
+			$(use_enable jpeg) $(use_enable png) $(use_enable tiff)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix for bug #112129, backported from CVS upstream
+	epatch ${FILESDIR}/gthumb-2.6.8-Makefile.patch
+
+	# Add configure options (Bug #103365), patch merged upstream
+	epatch ${FILESDIR}/gthumb-2.6.8-options.patch
+
+	gnome2_omf_fix doc/*/Makefile.in
+
+	eautoreconf
+}