Version bumped. Marked previous version stable. Removed old ebuild.

8 files changed, 35 insertions, 14 deletions

diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index 4a6ea860f858..2c7a8889cff1 100644
--- a/media-gfx/zphoto/ChangeLog
+++ b/media-gfx/zphoto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/zphoto
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.4 2004/03/27 11:38:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.5 2004/05/02 11:45:17 usata Exp $
+
+*zphoto-0.9 (02 May 2004)
+
+  02 May 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.6.ebuild,
+  zphoto-0.7.ebuild, zphoto-0.9.ebuild, files/zphoto-0.7-avifile-gentoo.diff,
+  files/zphoto-0.9-avifile-gentoo.diff, files/zphoto-avifile-gentoo.diff:
+  Version bumped. Marked previous version stable. Removed old ebuild.
 
 *zphoto-0.7 (27 Mar 2004)
 
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index 91a55b9abb24..8789cff37ff8 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,7 +1,8 @@
-MD5 2b5840372ed05fcaf0155cf9eaeb4093 zphoto-0.6.ebuild 757
-MD5 db4231acfa19d70a15e7ba7b2f857c9d ChangeLog 901
+MD5 e3a02ae6e06d235d613935586f3bd28c ChangeLog 1219
 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
-MD5 e42d24e1cb7953ff3780750e43b19378 zphoto-0.7.ebuild 758
-MD5 5d667eff255326f09226873397d63c3b files/digest-zphoto-0.6 62
+MD5 239e3315ab44e376e094b20d241b2e2c zphoto-0.7.ebuild 756
+MD5 abc6e6e0c2f8f735bbcc0bd86cf30e58 zphoto-0.9.ebuild 791
 MD5 b82c59a5c7049ebb126f5a25a4f67be8 files/digest-zphoto-0.7 62
-MD5 33c922e30ef99f1ab12934eee25f48fd files/zphoto-avifile-gentoo.diff 388
+MD5 4e9cc28fe44ab4361893c986dbdac7dc files/digest-zphoto-0.9 62
+MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319
+MD5 33c922e30ef99f1ab12934eee25f48fd files/zphoto-0.7-avifile-gentoo.diff 388
diff --git a/media-gfx/zphoto/files/digest-zphoto-0.6 b/media-gfx/zphoto/files/digest-zphoto-0.6
deleted file mode 100644
index 5053d8e82fb9..000000000000
--- a/media-gfx/zphoto/files/digest-zphoto-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3246c0ed9c072fe39f926d08dae45f5 zphoto-0.6.tar.gz 138399
diff --git a/media-gfx/zphoto/files/digest-zphoto-0.9 b/media-gfx/zphoto/files/digest-zphoto-0.9
new file mode 100644
index 000000000000..cf758d8d59f3
--- /dev/null
+++ b/media-gfx/zphoto/files/digest-zphoto-0.9
@@ -0,0 +1 @@
+MD5 49831fc49878c25397f635458ea45a93 zphoto-0.9.tar.gz 150821
diff --git a/media-gfx/zphoto/files/zphoto-avifile-gentoo.diff b/media-gfx/zphoto/files/zphoto-0.7-avifile-gentoo.diff
index 84fb259cdcdb..84fb259cdcdb 100644
--- a/media-gfx/zphoto/files/zphoto-avifile-gentoo.diff
+++ b/media-gfx/zphoto/files/zphoto-0.7-avifile-gentoo.diff
diff --git a/media-gfx/zphoto/files/zphoto-0.9-avifile-gentoo.diff b/media-gfx/zphoto/files/zphoto-0.9-avifile-gentoo.diff
new file mode 100644
index 000000000000..f9f467b0c8fd
--- /dev/null
+++ b/media-gfx/zphoto/files/zphoto-0.9-avifile-gentoo.diff
@@ -0,0 +1,13 @@
+--- image.cpp.orig	2004-04-10 16:25:49.000000000 +0900
++++ image.cpp	2004-05-02 20:10:26.559425136 +0900
+@@ -47,8 +47,8 @@
+  */
+ #if HAVE_AVIFILE && HAVE_IMLIB2
+ 
+-#include <avifile/avifile.h>
+-#include <avifile/avm_output.h>
++#include <avifile.h>
++#include <avm_output.h>
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>
+ 
diff --git a/media-gfx/zphoto/zphoto-0.7.ebuild b/media-gfx/zphoto/zphoto-0.7.ebuild
index f5a590c452c7..f74732bd0baa 100644
--- a/media-gfx/zphoto/zphoto-0.7.ebuild
+++ b/media-gfx/zphoto/zphoto-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-0.7.ebuild,v 1.1 2004/03/27 11:38:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-0.7.ebuild,v 1.2 2004/05/02 11:45:17 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
@@ -24,7 +24,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-avifile-gentoo.diff
+	epatch ${FILESDIR}/${P}-avifile-gentoo.diff
 }
 
 src_install() {
diff --git a/media-gfx/zphoto/zphoto-0.6.ebuild b/media-gfx/zphoto/zphoto-0.9.ebuild
index 116451d8303c..cbc273dc56a2 100644
--- a/media-gfx/zphoto/zphoto-0.6.ebuild
+++ b/media-gfx/zphoto/zphoto-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-0.6.ebuild,v 1.4 2004/03/27 11:38:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-0.9.ebuild,v 1.1 2004/05/02 11:45:17 usata Exp $
 
 inherit eutils
 
@@ -11,11 +11,11 @@ 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
-	>=media-libs/imlib2-1.0.6-r1
+	|| ( >=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"
@@ -24,7 +24,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-avifile-gentoo.diff
+	epatch ${FILESDIR}/${P}-avifile-gentoo.diff
 }
 
 src_install() {