Add configure patch that fixes our control of whether openexr support is compiled or not. Add optional dep on openexr.

(Portage version: 2.0.51.22-r2)

4 files changed, 45 insertions, 14 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index c4cbc5f381fe..b9f9bd2877ea 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.19 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.20 2005/07/29 18:44:34 danarmak Exp $
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdebase-openexr.patch,
+  kdebase-kioslaves-3.4.2.ebuild:
+  Add configure patch that fixes our control of whether openexr support is
+  compiled or not. Add optional dep on openexr.
 
 *kdebase-kioslaves-3.4.2 (28 Jul 2005)
 
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index c0b88478d232..08cd939c0152 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,11 +1,12 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 3196f5d7edade715c6861def61990244 kdebase-kioslaves-3.4.1.ebuild 895
 MD5 905699f5d72415ca005d2a915cb4731c kdebase-kioslaves-3.4.1-r1.ebuild 962
-MD5 8386209628e5062122ca3155a3c2a5e3 kdebase-kioslaves-3.4.2.ebuild 986
 MD5 64086fdff31b7bbb2cbe0222c3c0089d kdebase-kioslaves-3.4.0.ebuild 895
-MD5 3196f5d7edade715c6861def61990244 kdebase-kioslaves-3.4.1.ebuild 895
+MD5 bcee0e707ec49ea11a885f6cd39dcaa4 kdebase-kioslaves-3.4.2.ebuild 1090
 MD5 2f7f8db9a127db02df4335874feaa719 ChangeLog 3204
-MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1 212
-MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1-r1 212
-MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-kioslaves-3.4.2 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 51057f5a3aacb159e8d4cc4af02b00e6 files/kdebase-3.4.1-configure.patch 1916
 MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-kioslaves-3.4.0 68
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1 212
+MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-kioslaves-3.4.2 68
+MD5 00c42877b616c0d2c5df33a6eaecbfdd files/configure-fix-kdebase-openexr.patch 703
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1-r1 212
diff --git a/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch b/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
new file mode 100644
index 000000000000..064bc9dd3a8e
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
@@ -0,0 +1,24 @@
+Index: kioslave/thumbnail/configure.in.in
+===================================================================
+--- kioslave/thumbnail/configure.in.in	(revision 434549)
++++ kioslave/thumbnail/configure.in.in	(working copy)
+@@ -95,6 +95,18 @@
+   AC_SUBST(EXR_FLAGS)
+ ])
+ 
+-AC_FIND_LIBEXR
++AC_ARG_WITH(openexr,
++  [AS_HELP_STRING(--with-openexr,
++    [enable support for OpenEXR @<:@default=check@:>@])],
++  [], with_openexr=check)
++
++if test "x$with_openexr" != xno; then
++  AC_FIND_LIBEXR
++
++  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
++    AC_MSG_FAILURE([--with-openexr was given, but test for OpenEXR failed])
++  fi
++fi
++
+ AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
+ 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild
index e59c970f8c01..22c7121456ed 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild,v 1.2 2005/07/29 08:46:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild,v 1.3 2005/07/29 18:44:34 danarmak Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -10,19 +10,19 @@ inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
 KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="hal ldap samba"
+IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
 	hal? ( =sys-apps/dbus-0.23*
-	       =sys-apps/hal-0.4* )"
+	       =sys-apps/hal-0.4* )
+	openexr? ( media-libs/openexr )"
 RDEPEND="${DEPEND}
 	$(deprange 3.4.1 $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
 # for --with-samba
 PATCHES="${FILESDIR}/kdebase-3.4.1-configure.patch"
+# for --with-openexr
+PATCHES="$PATCHES $FILESDIR/configure-fix-kdebase-openexr.patch"
 
-src_compile () {
-	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal`"
-	kde-meta_src_compile
-}
+myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"