8 files changed, 26 insertions, 52 deletions
diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index ec7a86e00c3c..085513338210 100644
--- a/media-gfx/zphoto/ChangeLog
+++ b/media-gfx/zphoto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/zphoto
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.8 2004/07/07 01:32:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.9 2004/10/09 21:47:53 usata Exp $
+
+*zphoto-1.2 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -zphoto-0.9.ebuild,
+  -zphoto-1.0.ebuild, zphoto-1.1.ebuild, +zphoto-1.2.ebuild:
+  Version bumped.
 
 *zphoto-1.1 (07 Jul 2004)
 
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index dfabf5645e35..ced51f6a5999 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,9 +1,11 @@
-MD5 0043c35c0941fa958ef2e97eaaded2eb zphoto-1.0.ebuild 848
 MD5 86ec7689cc8260119fa8750ee8ad9e6a ChangeLog 1582
 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
-MD5 516eceb91f11ccf71f006fcf02aaf286 zphoto-1.1.ebuild 948
 MD5 3aed8812524cbcb835b9149b8ce5ba6d zphoto-0.9.ebuild 784
+MD5 0043c35c0941fa958ef2e97eaaded2eb zphoto-1.0.ebuild 848
+MD5 516eceb91f11ccf71f006fcf02aaf286 zphoto-1.1.ebuild 948
+MD5 516eceb91f11ccf71f006fcf02aaf286 zphoto-1.2.ebuild 948
+MD5 4e9cc28fe44ab4361893c986dbdac7dc files/digest-zphoto-0.9 62
 MD5 bc655b2b47246df83f4f1d44cad90ad6 files/digest-zphoto-1.0 62
 MD5 c892a3036c833b82808fb04443eb1203 files/digest-zphoto-1.1 62
-MD5 4e9cc28fe44ab4361893c986dbdac7dc files/digest-zphoto-0.9 62
+MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2 62
 MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319
diff --git a/media-gfx/zphoto/files/digest-zphoto-0.9 b/media-gfx/zphoto/files/digest-zphoto-0.9
deleted file mode 100644
index cf758d8d59f3..000000000000
--- a/media-gfx/zphoto/files/digest-zphoto-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49831fc49878c25397f635458ea45a93 zphoto-0.9.tar.gz 150821
diff --git a/media-gfx/zphoto/files/digest-zphoto-1.0 b/media-gfx/zphoto/files/digest-zphoto-1.0
deleted file mode 100644
index a9d036650ff5..000000000000
--- a/media-gfx/zphoto/files/digest-zphoto-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7cba659b913468124b664bcde52efece zphoto-1.0.tar.gz 419086
diff --git a/media-gfx/zphoto/files/digest-zphoto-1.2 b/media-gfx/zphoto/files/digest-zphoto-1.2
new file mode 100644
index 000000000000..749cc9c43b54
--- /dev/null
+++ b/media-gfx/zphoto/files/digest-zphoto-1.2
@@ -0,0 +1 @@
+MD5 636a9cffec9131043e29c1f5812a6c3c zphoto-1.2.tar.gz 414079
diff --git a/media-gfx/zphoto/zphoto-0.9.ebuild b/media-gfx/zphoto/zphoto-0.9.ebuild
deleted file mode 100644
index 5a1d94647a8d..000000000000
--- a/media-gfx/zphoto/zphoto-0.9.ebuild
+++ /dev/null
@@ -1,35 +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-0.9.ebuild,v 1.3 2004/06/24 22:54:32 agriffis 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}/${P}-avifile-gentoo.diff
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-gfx/zphoto/zphoto-1.1.ebuild b/media-gfx/zphoto/zphoto-1.1.ebuild
index ac7c6a2062c6..b3f5f8d37fe0 100644
--- a/media-gfx/zphoto/zphoto-1.1.ebuild
+++ b/media-gfx/zphoto/zphoto-1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2004/07/07 01:32:20 usata Exp $
+# $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
 
@@ -11,7 +11,7 @@ SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz"
 HOMEPAGE="http://namazu.org/~satoru/zphoto/"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="LGPL-2.1"
 
 DEPEND=">=media-libs/ming-0.2a
diff --git a/media-gfx/zphoto/zphoto-1.0.ebuild b/media-gfx/zphoto/zphoto-1.2.ebuild
index 4fc8fe01d0aa..c4eb096c5a92 100644
--- a/media-gfx/zphoto/zphoto-1.0.ebuild
+++ b/media-gfx/zphoto/zphoto-1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.3 2004/07/07 01:32:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2.ebuild,v 1.1 2004/10/09 21:47:53 usata Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz"
 HOMEPAGE="http://namazu.org/~satoru/zphoto/"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 LICENSE="LGPL-2.1"
 
 DEPEND=">=media-libs/ming-0.2a
@@ -20,15 +20,17 @@ DEPEND=">=media-libs/ming-0.2a
 	app-arch/zip
 	>=dev-libs/popt-1.6.3"
 
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/zphoto-0.9-avifile-gentoo.diff
-}
+#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
 }
@@ -37,5 +39,5 @@ src_install() {
 
 	einstall || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 }