Fix cdk detection and make it compatible with cdk[unicode] (bug #371569 reported by Juergen Rose, patch by Tim Harder and instructions to call configure by upstream.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 40 insertions, 9 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 0658976b485d..e139bcc366ac 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.113 2011/06/20 16:44:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.114 2011/07/01 17:07:59 pacho Exp $
+
+  01 Jul 2011; Pacho Ramos <pacho@gentoo.org> gphoto2-2.4.11.ebuild,
+  +files/gphoto2-2.4.11-cdk-libs.patch:
+  Fix cdk detection and make it compatible with cdk[unicode] (bug #371569
+  reported by Juergen Rose, patch by Tim Harder and instructions to call
+  configure by upstream.
 
 *gphoto2-2.4.11 (20 Jun 2011)
 
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index b3de082d48bf..53d825c9689e 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gphoto2-2.4.11-cdk-libs.patch 860 RMD160 28486bb972b6ea010bcb76dce26a94b481f78866 SHA1 c435b3d148f16c53e0be04115137cb4fa9e199e6 SHA256 0f552c4fffd92e15f48fcd6185cb73775e60f2bf594d02a36ea54fff010990a3
 DIST gphoto2-2.4.10.tar.bz2 638521 RMD160 9accfbf9eda8f91176c6d7e2741ee59160a8f2ff SHA1 a01de04ecfc1e4505c30a586af8ee218dbb44d7b SHA256 6444652e099b97f8f476020f5029fa1567761362aa3b3d74b445e6832fbbc759
 DIST gphoto2-2.4.11.tar.bz2 658208 RMD160 923fc0bf85cfa26174eab4a13c76901b5b4a97ba SHA1 008918c1871128cbc2f3a796132d7093529a5566 SHA256 3e203c72c330c3360560ae5203539805b6ce7c63e79bb416fa00629bcf12042a
 EBUILD gphoto2-2.4.10.ebuild 1333 RMD160 72ec0d6dcaa2310e3f18ff3f118cb2f16c7c4160 SHA1 ccff50393d156883f3559ae8b8170b409213a620 SHA256 232b8acdb41e570474f85a55ec54eb5c689ec85aa75cc11db5e343ba5bca15fb
-EBUILD gphoto2-2.4.11.ebuild 1310 RMD160 214990e3e73200567909409e711b940cd7216398 SHA1 fbdc707e1dd0734e002eeba8a8bb52391ecbee59 SHA256 f4c8c72951e89838aa5f5df21e7394a17cfccc2379bd0b391baa97d2af6dc59b
-MISC ChangeLog 14903 RMD160 41f912160b154a1cd658d763fe4283376d886cea SHA1 84320a2dde7f3c83bb02e7717a7acb34a14f6a2a SHA256 5301776901b59aae6b4149bdc282a91473ba58427cc3c1e01acc5e63c0ef3f2b
+EBUILD gphoto2-2.4.11.ebuild 1424 RMD160 df5a383df18cb881aac62df91cc7bd621d1138d4 SHA1 a9eed0072d58ff3220043748f0424ea271c23ad8 SHA256 f8f9767392590a9ad5738acc8c3fefaaba38f7db23358c778494069c936765a0
+MISC ChangeLog 15185 RMD160 2e36b9e4331d201154ccf1aed7190fe9952c62c1 SHA1 2c0f3cec018e2f35fb76ec619c43818567d97ba0 SHA256 260fcd06dda011640a65102ffd2eb8656fb9bf96d68fbdf15a6e9b1b0210c852
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3/eP8ACgkQCaWpQKGI+9T6vgCeIq8ie5/Usne2Moa46e52H8e9
-OC8AniBqs+MC361PULp2KkUP4P/raRBJ
-=rH4U
+iEYEARECAAYFAk4N/vQACgkQCaWpQKGI+9R72gCfenem92DVTo/Y1KVY0V436sre
+ZIcAn2U+kiiLkUztbxaTYf+fERiDxr6Z
+=L7hC
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch b/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch
new file mode 100644
index 000000000000..2e7a89a9f5cd
--- /dev/null
+++ b/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch
@@ -0,0 +1,19 @@
+--- gphoto2-2.4.11/configure.ac.orig
++++ gphoto2-2.4.11/configure.ac
+@@ -146,8 +146,14 @@
+         CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
+         AC_CHECK_HEADER([cdk/cdk.h], [
+                 have_cdk=:
+-                CDK_CFLAGS="-I$cdk_prefix/include"
+-                CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses"
++                AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
++                if test -n "${CDK_CONFIG}"; then
++                        CDK_CFLAGS=`$CDK_CONFIG --cflags`
++                        CDK_LIBS=`$CDK_CONFIG --libs`
++                else
++                        CDK_CFLAGS="-I$cdk_prefix/include"
++                        CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses"
++                fi
+                 AC_DEFINE([HAVE_CDK],1,[whether we have CDK])
+                 LDFLAGS_save="$LDFLAGS"
+                 LDFLAGS="$CDK_LIBS"
diff --git a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild b/media-gfx/gphoto2/gphoto2-2.4.11.ebuild
index f06ea289f76d..a8ce14ec8a63 100644
--- a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.4.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.11.ebuild,v 1.1 2011/06/20 16:44:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.11.ebuild,v 1.2 2011/07/01 17:07:59 pacho Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="free, redistributable digital camera software application"
 HOMEPAGE="http://www.gphoto.org/"
@@ -30,8 +30,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14 )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cdk-libs.patch"
+	eautoreconf
+}
+
 src_configure() {
-	econf \
+	CPPFLAGS="-I/usr/include/cdk" econf \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_with aalib) \
 		$(use_with aalib jpeg) \