depricated gtk2 USE flag. Bug #106560.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 63 insertions, 105 deletions

diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index 292e8ab50d82..cb681e102aec 100644
--- a/media-gfx/zphoto/ChangeLog
+++ b/media-gfx/zphoto/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/zphoto
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.13 2005/06/04 10:58:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.14 2005/10/04 22:21:40 matsuu Exp $
+
+*zphoto-1.2-r2 (04 Oct 2005)
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> -zphoto-1.1.ebuild,
+  -zphoto-1.2.ebuild, +zphoto-1.2-r2.ebuild:
+  Removed old versions.
+  depricated gtk2 USE flag. Bug #106560.
+  Added ~amd64.
 
   04 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> zphoto-1.2-r1.ebuild:
   Make wxzphoto compile with wxGTK-2.6; bug #94601.
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index a831204b34be..e7bbd5f99067 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d18170a0e88e7a0ed69bc2559cfdaf7d ChangeLog 2254
-MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
 MD5 5ec71d6c9e72e64850e696640c150609 zphoto-1.2-r1.ebuild 1305
-MD5 8d54a6722f45b38164a275510ced2cdf zphoto-1.1.ebuild 947
-MD5 baf5d2a133584690f28e671a56fbe227 zphoto-1.2.ebuild 953
-MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2-r1 62
-MD5 c892a3036c833b82808fb04443eb1203 files/digest-zphoto-1.1 62
-MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2 62
+MD5 5c72072b135edb3555b3c20c40fa1c5d zphoto-1.2-r2.ebuild 1226
+MD5 42d7d9ee58489cc639edde0303a2abea ChangeLog 2481
+MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
 MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCoYaYVWNWqTUmv+0RAtMwAJsHFDMeKBz1Q+QJT+CGW2YvfJ0xgwCeNps/
-6Sztt/gWWPebIF0+w2lsyMI=
-=ROz8
------END PGP SIGNATURE-----
+MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2-r1 62
+MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2-r2 62
diff --git a/media-gfx/zphoto/files/digest-zphoto-1.1 b/media-gfx/zphoto/files/digest-zphoto-1.1
deleted file mode 100644
index ec525f655dd0..000000000000
--- a/media-gfx/zphoto/files/digest-zphoto-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20df560de202e188e383c22db9a3f637 zphoto-1.1.tar.gz 412429
diff --git a/media-gfx/zphoto/files/digest-zphoto-1.2 b/media-gfx/zphoto/files/digest-zphoto-1.2-r2
index 749cc9c43b54..749cc9c43b54 100644
--- a/media-gfx/zphoto/files/digest-zphoto-1.2
+++ b/media-gfx/zphoto/files/digest-zphoto-1.2-r2
diff --git a/media-gfx/zphoto/zphoto-1.1.ebuild b/media-gfx/zphoto/zphoto-1.1.ebuild
deleted file mode 100644
index b3f5f8d37fe0..000000000000
--- a/media-gfx/zphoto/zphoto-1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.1.ebuild,v 1.2 2004/10/09 21:47:53 usata Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="A zooming photo album generator in Flash"
-SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz"
-HOMEPAGE="http://namazu.org/~satoru/zphoto/"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="LGPL-2.1"
-
-DEPEND=">=media-libs/ming-0.2a
-	|| ( >=media-libs/imlib2-1.1.0 >=media-gfx/imagemagick-5.5.7 )
-	>=media-video/avifile-0.7.34
-	app-arch/zip
-	>=dev-libs/popt-1.6.3"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/zphoto-0.9-avifile-gentoo.diff
-}
-
-src_compile() {
-
-	# GUI version won't build -- please mail me if you find
-	# a way to fix it. <usata@gentoo.org> 7 Jul 2004
-	econf --disable-wx || die
-	emake || die
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild
new file mode 100644
index 000000000000..14db6c695f8c
--- /dev/null
+++ b/media-gfx/zphoto/zphoto-1.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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.1 2005/10/04 22:21:40 matsuu Exp $
+
+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/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+
+DEPEND=">=media-libs/ming-0.2a
+	|| ( >=media-libs/imlib2-1.1.0 >=media-gfx/imagemagick-5.5.7 )
+	>=media-video/avifile-0.7.34
+	app-arch/zip
+	>=dev-libs/popt-1.6.3
+	wxwindows? ( >=x11-libs/wxGTK-2.4.2-r2 )"
+
+src_compile() {
+
+	local myconf
+
+	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"
+	else
+		myconf="--disable-wx"
+	fi
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+
+	einstall || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/media-gfx/zphoto/zphoto-1.2.ebuild b/media-gfx/zphoto/zphoto-1.2.ebuild
deleted file mode 100644
index ca1a0886dd67..000000000000
--- a/media-gfx/zphoto/zphoto-1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2.ebuild,v 1.2 2004/11/04 11:54:28 usata Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="A zooming photo album generator in Flash"
-SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz"
-HOMEPAGE="http://namazu.org/~satoru/zphoto/"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="LGPL-2.1"
-
-DEPEND=">=media-libs/ming-0.2a
-	|| ( >=media-libs/imlib2-1.1.0 >=media-gfx/imagemagick-5.5.7 )
-	>=media-video/avifile-0.7.34
-	app-arch/zip
-	>=dev-libs/popt-1.6.3"
-
-#src_unpack() {
-#
-#	unpack ${A}
-#	cd ${S}
-#	epatch ${FILESDIR}/zphoto-0.9-avifile-gentoo.diff
-#}
-
-src_compile() {
-
-	# GUI version won't build -- please mail me if you find
-	# a way to fix it. <usata@gentoo.org> 7 Jul 2004
-	econf --disable-wx || die
-	emake || die
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}