From 9541af1e6c4d62fa97df9cfc044311038d8be290 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 24 Feb 2010 19:56:22 +0000 Subject: [PATCH] Rename USE wxwindows to wxwidgets wrt #306275. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- media-gfx/zphoto/ChangeLog | 7 +++++-- media-gfx/zphoto/Manifest | 4 ++-- media-gfx/zphoto/zphoto-1.2-r2.ebuild | 18 +++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog index 350f7df0288f..fc795ba752f5 100644 --- a/media-gfx/zphoto/ChangeLog +++ b/media-gfx/zphoto/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/zphoto -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.23 2009/10/02 22:52:45 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.24 2010/02/24 19:56:22 ssuominen Exp $ + + 24 Feb 2010; Samuli Suominen zphoto-1.2-r2.ebuild: + Rename USE wxwindows to wxwidgets wrt #306275. 02 Oct 2009; Markus Meier zphoto-1.2-r2.ebuild: amd64/x86 stable, bug #286765 diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest index a79784e95d62..9e6a32931870 100644 --- a/media-gfx/zphoto/Manifest +++ b/media-gfx/zphoto/Manifest @@ -1,5 +1,5 @@ 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-r2.ebuild 1125 RMD160 de29d085f969f267c5f6389a617553d29272e116 SHA1 ef1004d9707cce0cb23d85254e8c46d5af27f3df SHA256 e195f2febd3d85b1fe896303f23911d3df6996414a61c9d20de90bd9666db911 -MISC ChangeLog 3659 RMD160 deef3ade82ec4711f3f3fd08c2c49dc359075341 SHA1 ea6e730beb6911c73f8c49e77af72d9156418cd5 SHA256 0ab87ad555183d9101e19c9309fcbcf126f4e7c90971f9f608ed48cdb8604fe9 +EBUILD zphoto-1.2-r2.ebuild 1115 RMD160 9aa913d47f06d2fef39f16a511037b462c3cddbb SHA1 913d54ef334310790da81c950918a2129e9f21f7 SHA256 5b3d0b30fbfa31e81f4473b8584e4c5a69ca573bc32fe7e1477ac2653171fb73 +MISC ChangeLog 3788 RMD160 4fc6ee257f38192f15b9cdc14c459aa22c4c1840 SHA1 cd363f16bcdf8749e2abe264f04674ec389f08fa SHA256 645d6fe1472cf0d3219c6ccdfc47444854e573069caf9864a7f8363cad3c399f MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild index 95c2ce9c732c..d4f3c9cc29c9 100644 --- a/media-gfx/zphoto/zphoto-1.2-r2.ebuild +++ b/media-gfx/zphoto/zphoto-1.2-r2.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.7 2009/10/02 22:52:45 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.8 2010/02/24 19:56:22 ssuominen Exp $ EAPI=2 - inherit wxwidgets eutils -IUSE="wxwindows" - DESCRIPTION="A zooming photo album generator in Flash" SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz" HOMEPAGE="http://namazu.org/~satoru/zphoto/" +LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -LICENSE="LGPL-2.1" +IUSE="wxwidgets" 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*[X] )" + wxwidgets? ( =x11-libs/wxGTK-2.6*[X] )" RDEPEND="${DEPEND}" src_prepare(){ @@ -32,7 +30,7 @@ src_configure() { local myconf="${myconf} --disable-avifile" - if use wxwindows ; then + if use wxwidgets; then WX_GTK_VER="2.6" need-wxwidgets gtk2 myconf="${myconf} --with-wx-config=${WX_CONFIG}" @@ -45,8 +43,6 @@ src_configure() { } src_install() { - einstall || die - - dodoc AUTHORS ChangeLog INSTALL NEWS README + dodoc AUTHORS ChangeLog NEWS README } -- 2.26.2