[patch] zphoto-1.2-r2.ebuild.diff

zphoto-1.2-r2.ebuild.diff (text/plain), 1.55 KB, created by Ryan Hill (RETIRED) on 2007-01-28 03:44:40 UTC

Index: zphoto-1.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v
retrieving revision 1.3
diff -u -B -r1.3 zphoto-1.2-r2.ebuild
--- zphoto-1.2-r2.ebuild	16 Nov 2006 17:23:58 -0000	1.3
+++ zphoto-1.2-r2.ebuild	28 Jan 2007 03:43:46 -0000
@@ -2,6 +2,10 @@
 # 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.3 2006/11/16 17:23:58 ticho Exp $
 
+WX_GTK_VER="2.6"
+
+inherit wxwidgets
+
 IUSE="wxwindows"
 
 DESCRIPTION="A zooming photo album generator in Flash"
@@ -16,23 +20,19 @@
 	|| ( >=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.4.2-r2 )"
+	wxwindows? ( =x11-libs/wxGTK-2.6* )"
 
 src_compile() {
 
 	local myconf="--disable-avifile"
 
 	if use wxwindows ; then
-		if has_version '>=x11-libs/wxGTK-2.6' ; then
-			wx_config="/usr/bin/wx-config-2.6"
-			sed -i -e 's@\($WXCONFIG --cflags\)@\1 --unicode=no@' \
-				-e 's@\($WXCONFIG --libs\)@\1 --unicode=no@' \
-				configure || die
-			sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die
-		else
-			wx_config="/usr/bin/wxgtk2-2.4-config"
-		fi
-		myconf="--with-wx-config=$wx_config"
+		need-wxwidgets gtk2
+		sed -i -e 's@\($WXCONFIG --cflags\)@\1 --unicode=no@' \
+			-e 's@\($WXCONFIG --libs\)@\1 --unicode=no@' \
+			configure || die
+																								
+		sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die
 	else
 		myconf="--disable-wx"
 	fi