Adding patch to build with glibc-2.10, closes bug #273831 ; Adding built with use dependency =x11-libs/wxGTK-2.6*[X]

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 42 insertions, 10 deletions

diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index c07db2da877c..8d2b5f7a469a 100644
--- a/media-gfx/zphoto/ChangeLog
+++ b/media-gfx/zphoto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/zphoto
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.19 2007/12/25 17:11:56 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.20 2009/07/20 18:21:39 vostorga Exp $
+
+  20 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> zphoto-1.2-r2.ebuild,
+  +files/zphoto-1.2-glibc210.patch:
+  Adding patch to build with glibc-2.10, closes bug #273831
+  Adding built with use dependency : =x11-libs/wxGTK-2.6*[X]
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index 7a2afde95014..c9c397c40665 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,6 +1,7 @@
 AUX zphoto-0.9-avifile-gentoo.diff 319 RMD160 731206a5c0434e30e4e0c614fbbe45829cb9dd87 SHA1 c87488fe7805a55ae5e3c0c2d791d031e2d40523 SHA256 e94b40358725990e309133df9a2950e70690257b8029f42eae07617c36d4344d
+AUX zphoto-1.2-glibc210.patch 558 RMD160 73d660c4ec47f963b18171ed39cd9d67b609631e SHA1 4aa9588e02a67c8d7ef9fc1b792280fcef7a4727 SHA256 334bbaa15d5c4971d97ee05d313dce47f39972cee746f54b1ea31d1ba9569239
 DIST zphoto-1.2.tar.gz 414079 RMD160 54a93da3c8303ebbf9c505891e9fa8fb32bd6a64 SHA1 2d45c5df2f2a00db0d8170f18ea5ed399fb9d611 SHA256 918f19c4a0077b0c5fd2c80fd846acf21b4c7f62750988e6a4a1d0bb6628c15d
 EBUILD zphoto-1.2-r1.ebuild 997 RMD160 c1ea031b8ca3e0580f6bc9655f901719ce69391d SHA1 9a6cf81ef1003c3003e4f8136f2a57e206cc5cd2 SHA256 559fcc88e5d8e6c46d44de88f7e98a269cd2fdecbf60c7f39d0eb7a7dc419c9c
-EBUILD zphoto-1.2-r2.ebuild 1005 RMD160 9eb3ad2c354aa409a4072c42a4278cc03afe67dc SHA1 2ed99dbef93b09b3020b9a1b8b1b2833db6af31b SHA256 9b775404281e91344de45f9d0dde27425e91c41bb09336c25d3c0c489b909fe0
-MISC ChangeLog 3090 RMD160 ee594ac40ba3b087e5055c253b6ea1c77e320480 SHA1 281337b1daee460f0de967e4572cdeb7d8883fbf SHA256 69c1ea72bed02502371dc982d8fa4a2572ba6531898adc526afc265cce349e6c
+EBUILD zphoto-1.2-r2.ebuild 1111 RMD160 7b0b8bb2238ff79eb6353a928123ce55605bd07f SHA1 51ea7f0dc7cc21b146563da4bfe6fad50d9daa73 SHA256 dbca722e1db0fb9729351492dcd1157bf4684e60748bc8324f34646756351bc1
+MISC ChangeLog 3325 RMD160 7e194ad6a130bed6f3a885adcb01b3056559f152 SHA1 d3f554c5b56f207a851ff81f1922327fd20878fc SHA256 54d560a60860851cfd859126eb209ce2b23a113af1feacdf7f6a4a9d1431a6fb
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/media-gfx/zphoto/files/zphoto-1.2-glibc210.patch b/media-gfx/zphoto/files/zphoto-1.2-glibc210.patch
new file mode 100644
index 000000000000..20f72c595675
--- /dev/null
+++ b/media-gfx/zphoto/files/zphoto-1.2-glibc210.patch
@@ -0,0 +1,18 @@
+diff -NrU5 zphoto-1.2.original/image.cpp zphoto-1.2/image.cpp
+--- zphoto-1.2.original/image.cpp	2009-07-20 17:13:30.000000000 +0000
++++ zphoto-1.2/image.cpp	2009-07-20 17:18:38.000000000 +0000
+@@ -552,12 +552,12 @@
+ }
+ 
+ static int
+ convert_needed_p (const char *src, const char *dest)
+ {
+-    char *suffix1 = strrchr(src,  '.');
+-    char *suffix2 = strrchr(dest, '.');
++    char *suffix1 = const_cast<char*>(strrchr(src,  '.'));
++    char *suffix2 = const_cast<char*>(strrchr(dest, '.'));
+ 
+     return strcmp(suffix1, suffix2) != 0;
+ }
+ 
+ extern "C" void
diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild
index 0f1dfdfaecb8..15a6a499985a 100644
--- a/media-gfx/zphoto/zphoto-1.2-r2.ebuild
+++ b/media-gfx/zphoto/zphoto-1.2-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.4 2007/04/23 02:03:49 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.5 2009/07/20 18:21:39 vostorga Exp $
 
-inherit wxwidgets
+EAPI=2
+
+inherit wxwidgets eutils
 
 IUSE="wxwindows"
 
@@ -18,11 +20,17 @@ DEPEND=">=media-libs/ming-0.2a
 	|| ( >=media-libs/imlib2-1.1.0 >=media-gfx/imagemagick-5.5.7 )
 	app-arch/zip
 	>=dev-libs/popt-1.6.3
-	wxwindows? ( =x11-libs/wxGTK-2.6* )"
+	wxwindows? ( =x11-libs/wxGTK-2.6*[X] )"
+RDEPEND=""
+
+src_prepare(){
+	#bug 273831
+	epatch "${FILESDIR}"/"${P}"-glibc210.patch
+}
 
 src_compile() {
 
-	local myconf="--disable-avifile"
+	local myconf="${myconf} --disable-avifile"
 
 	if use wxwindows ; then
 		WX_GTK_VER="2.6"
@@ -33,7 +41,7 @@ src_compile() {
 		myconf="--disable-wx"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 }