From a268bdcb458e00b36ac54320fe1be841181abdad Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Mon, 23 Apr 2007 02:03:49 +0000 Subject: [PATCH] Fix wxGTK handling for bug #164152. Package-Manager: portage-2.1.2.4 --- media-gfx/zphoto/ChangeLog | 8 +++++-- media-gfx/zphoto/Manifest | 34 ++++++++++----------------- media-gfx/zphoto/zphoto-1.2-r1.ebuild | 22 +++++++---------- media-gfx/zphoto/zphoto-1.2-r2.ebuild | 23 ++++++++---------- 4 files changed, 37 insertions(+), 50 deletions(-) diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog index 7208a8570777..7f870a6030e9 100644 --- a/media-gfx/zphoto/ChangeLog +++ b/media-gfx/zphoto/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/zphoto -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.17 2006/11/16 17:23:58 ticho Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.18 2007/04/23 02:03:49 dirtyepic Exp $ + + 23 Apr 2007; Ryan Hill zphoto-1.2-r1.ebuild, + zphoto-1.2-r2.ebuild: + Fix wxGTK handling for bug #164152. 16 Nov 2006; Andrej Kacian zphoto-1.2-r2.ebuild: Stable on x86, bug #145894. diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest index fe030bbfef27..85856bf8e653 100644 --- a/media-gfx/zphoto/Manifest +++ b/media-gfx/zphoto/Manifest @@ -1,23 +1,20 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX zphoto-0.9-avifile-gentoo.diff 319 RMD160 731206a5c0434e30e4e0c614fbbe45829cb9dd87 SHA1 c87488fe7805a55ae5e3c0c2d791d031e2d40523 SHA256 e94b40358725990e309133df9a2950e70690257b8029f42eae07617c36d4344d MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319 RMD160 731206a5c0434e30e4e0c614fbbe45829cb9dd87 files/zphoto-0.9-avifile-gentoo.diff 319 SHA256 e94b40358725990e309133df9a2950e70690257b8029f42eae07617c36d4344d files/zphoto-0.9-avifile-gentoo.diff 319 DIST zphoto-1.2.tar.gz 414079 RMD160 54a93da3c8303ebbf9c505891e9fa8fb32bd6a64 SHA1 2d45c5df2f2a00db0d8170f18ea5ed399fb9d611 SHA256 918f19c4a0077b0c5fd2c80fd846acf21b4c7f62750988e6a4a1d0bb6628c15d -EBUILD zphoto-1.2-r1.ebuild 1207 RMD160 e549e77142c2be5e860527d3a66d0b7448c35cbc SHA1 013393b55f31640df2a7e06869d80b5bda4b6df1 SHA256 626432f25d801600227ebf87c6e5138cd2f6575463e3916910db8aca15f3607f -MD5 7ba2ef3e0abd868f0c98b7ad17021575 zphoto-1.2-r1.ebuild 1207 -RMD160 e549e77142c2be5e860527d3a66d0b7448c35cbc zphoto-1.2-r1.ebuild 1207 -SHA256 626432f25d801600227ebf87c6e5138cd2f6575463e3916910db8aca15f3607f zphoto-1.2-r1.ebuild 1207 -EBUILD zphoto-1.2-r2.ebuild 1214 RMD160 3e0d72fe9656095c6f6ecd463eb81a06036b828a SHA1 e22f3b4ae4af5bdbc3098e366952fcdafb7e3887 SHA256 803886cb78ce65c2f684b7adc004561909468a33ed26170762c5ec8c9cc22cd2 -MD5 4b08a0ac01f5424e6efc373c7f4709e7 zphoto-1.2-r2.ebuild 1214 -RMD160 3e0d72fe9656095c6f6ecd463eb81a06036b828a zphoto-1.2-r2.ebuild 1214 -SHA256 803886cb78ce65c2f684b7adc004561909468a33ed26170762c5ec8c9cc22cd2 zphoto-1.2-r2.ebuild 1214 -MISC ChangeLog 2809 RMD160 6ef56674db968b3b27d1ef1149f1b6440e3fb9e9 SHA1 2c2c568610fa0fcb5eb0438e28078f7bf412f174 SHA256 4183b91f41d8a167363a65748e8b084380e806b312f0bb9b51b2e40f5a3990dd -MD5 88580db6485165ad92d3b55094059023 ChangeLog 2809 -RMD160 6ef56674db968b3b27d1ef1149f1b6440e3fb9e9 ChangeLog 2809 -SHA256 4183b91f41d8a167363a65748e8b084380e806b312f0bb9b51b2e40f5a3990dd ChangeLog 2809 +EBUILD zphoto-1.2-r1.ebuild 997 RMD160 c1ea031b8ca3e0580f6bc9655f901719ce69391d SHA1 9a6cf81ef1003c3003e4f8136f2a57e206cc5cd2 SHA256 559fcc88e5d8e6c46d44de88f7e98a269cd2fdecbf60c7f39d0eb7a7dc419c9c +MD5 a6974181087f3c267a4a637c6139214b zphoto-1.2-r1.ebuild 997 +RMD160 c1ea031b8ca3e0580f6bc9655f901719ce69391d zphoto-1.2-r1.ebuild 997 +SHA256 559fcc88e5d8e6c46d44de88f7e98a269cd2fdecbf60c7f39d0eb7a7dc419c9c zphoto-1.2-r1.ebuild 997 +EBUILD zphoto-1.2-r2.ebuild 1005 RMD160 9eb3ad2c354aa409a4072c42a4278cc03afe67dc SHA1 2ed99dbef93b09b3020b9a1b8b1b2833db6af31b SHA256 9b775404281e91344de45f9d0dde27425e91c41bb09336c25d3c0c489b909fe0 +MD5 02826097d8831f8d8015101b21c60a04 zphoto-1.2-r2.ebuild 1005 +RMD160 9eb3ad2c354aa409a4072c42a4278cc03afe67dc zphoto-1.2-r2.ebuild 1005 +SHA256 9b775404281e91344de45f9d0dde27425e91c41bb09336c25d3c0c489b909fe0 zphoto-1.2-r2.ebuild 1005 +MISC ChangeLog 2946 RMD160 e9cc478ee9339e6a542cace28f12a0698a860b66 SHA1 8e55a8e046d93da8f90373ba8acf6834a3a3f922 SHA256 37f398494672b007641639631b44cd67256996f9e1317c16d7925d0cb29eb557 +MD5 29e9e804cd3e880768a838ed03d3ea76 ChangeLog 2946 +RMD160 e9cc478ee9339e6a542cace28f12a0698a860b66 ChangeLog 2946 +SHA256 37f398494672b007641639631b44cd67256996f9e1317c16d7925d0cb29eb557 ChangeLog 2946 MISC metadata.xml 251 RMD160 9396edc604421b3ba0aad54d54e37d8cff67fc6e SHA1 cbc737758bf564a58495ab4c86ca79de6c3bdce5 SHA256 b1cc0d5b6e97c2e5e2ea7d858b7ae36eeafc164a33517e78dac62f9976f46c61 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251 RMD160 9396edc604421b3ba0aad54d54e37d8cff67fc6e metadata.xml 251 @@ -28,10 +25,3 @@ SHA256 408b74383fa49541073b746b201e7bb57d881db6c85cc696a36e673d705e2e01 files/di MD5 549b581cc5b5bb91b32cf1e584910866 files/digest-zphoto-1.2-r2 232 RMD160 8989d20f5d9d350662bca9c4ac85474962010d17 files/digest-zphoto-1.2-r2 232 SHA256 408b74383fa49541073b746b201e7bb57d881db6c85cc696a36e673d705e2e01 files/digest-zphoto-1.2-r2 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFXKygQlM6RnzZP+IRAl35AJwMLfNCkmb4z6XWOmXbqCpS2kMjqQCfend5 -D0CswOXOp8B0YjHqlRqHoQg= -=0PUv ------END PGP SIGNATURE----- diff --git a/media-gfx/zphoto/zphoto-1.2-r1.ebuild b/media-gfx/zphoto/zphoto-1.2-r1.ebuild index f067e011420e..57b1e7092b59 100644 --- a/media-gfx/zphoto/zphoto-1.2-r1.ebuild +++ b/media-gfx/zphoto/zphoto-1.2-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r1.ebuild,v 1.5 2006/11/06 18:32:14 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r1.ebuild,v 1.6 2007/04/23 02:03:49 dirtyepic Exp $ + +inherit wxwidgets IUSE="wxwindows" @@ -16,23 +18,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.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" + WX_GTK_VER="2.6" + need-wxwidgets gtk2 + myconf="--with-wx-config=${WX_CONFIG}" + sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die else myconf="--disable-wx" fi diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild index 09b9135f3c2f..0f1dfdfaecb8 100644 --- a/media-gfx/zphoto/zphoto-1.2-r2.ebuild +++ b/media-gfx/zphoto/zphoto-1.2-r2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.3 2006/11/16 17:23:58 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.4 2007/04/23 02:03:49 dirtyepic Exp $ + +inherit wxwidgets IUSE="wxwindows" @@ -16,26 +18,21 @@ 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.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" + WX_GTK_VER="2.6" + need-wxwidgets gtk2 + myconf="--with-wx-config=${WX_CONFIG}" + sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die else myconf="--disable-wx" fi + econf ${myconf} || die emake || die } -- 2.26.2