Version bumped. Marked 0.9 stable and removed 0.7 from CVS. Closing bug #51449

7 files changed, 23 insertions, 22 deletions

diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index 2c7a8889cff1..78d06c5da68f 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.5 2004/05/02 11:45:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.6 2004/05/30 09:41:35 usata Exp $
+
+*zphoto-1.0 (30 May 2004)
+
+  30 May 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.7.ebuild,
+  zphoto-0.9.ebuild, zphoto-1.0.ebuild, files/zphoto-0.7-avifile-gentoo.diff:
+  Version bumped. Marked 0.9 stable and removed 0.7 from CVS.
+  Closing bug #51449
 
 *zphoto-0.9 (02 May 2004)
 
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index 8789cff37ff8..c6344eca4de9 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,7 +1,9 @@
+MD5 abc6e6e0c2f8f735bbcc0bd86cf30e58 zphoto-1.0.ebuild 791
 MD5 e3a02ae6e06d235d613935586f3bd28c ChangeLog 1219
 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
 MD5 239e3315ab44e376e094b20d241b2e2c zphoto-0.7.ebuild 756
 MD5 abc6e6e0c2f8f735bbcc0bd86cf30e58 zphoto-0.9.ebuild 791
+MD5 bc655b2b47246df83f4f1d44cad90ad6 files/digest-zphoto-1.0 62
 MD5 b82c59a5c7049ebb126f5a25a4f67be8 files/digest-zphoto-0.7 62
 MD5 4e9cc28fe44ab4361893c986dbdac7dc files/digest-zphoto-0.9 62
 MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319
diff --git a/media-gfx/zphoto/files/digest-zphoto-0.7 b/media-gfx/zphoto/files/digest-zphoto-0.7
deleted file mode 100644
index 54bac7b3aa9f..000000000000
--- a/media-gfx/zphoto/files/digest-zphoto-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e158889b25fbfa985e431897f6309e96 zphoto-0.7.tar.gz 143468
diff --git a/media-gfx/zphoto/files/digest-zphoto-1.0 b/media-gfx/zphoto/files/digest-zphoto-1.0
new file mode 100644
index 000000000000..a9d036650ff5
--- /dev/null
+++ b/media-gfx/zphoto/files/digest-zphoto-1.0
@@ -0,0 +1 @@
+MD5 7cba659b913468124b664bcde52efece zphoto-1.0.tar.gz 419086
diff --git a/media-gfx/zphoto/files/zphoto-0.7-avifile-gentoo.diff b/media-gfx/zphoto/files/zphoto-0.7-avifile-gentoo.diff
deleted file mode 100644
index 84fb259cdcdb..000000000000
--- a/media-gfx/zphoto/files/zphoto-0.7-avifile-gentoo.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN zphoto-0.6.ORIG/loader.cpp zphoto-0.6/loader.cpp
---- zphoto-0.6.ORIG/loader.cpp	2003-03-27 19:28:41.000000000 +0900
-+++ zphoto-0.6/loader.cpp	2003-09-03 04:40:20.000000000 +0900
-@@ -31,8 +31,8 @@
- 
- #ifdef HAVE_AVIFILE
- 
--#include <avifile/avifile.h>
--#include <avifile/avm_output.h>
-+#include <avifile.h>
-+#include <avm_output.h>
- 
- typedef struct {
-     avm::IReadFile* file;
diff --git a/media-gfx/zphoto/zphoto-0.9.ebuild b/media-gfx/zphoto/zphoto-0.9.ebuild
index cbc273dc56a2..b5eb37b9a217 100644
--- a/media-gfx/zphoto/zphoto-0.9.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.9.ebuild,v 1.1 2004/05/02 11:45:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-0.9.ebuild,v 1.2 2004/05/30 09:41:35 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-0.7.ebuild b/media-gfx/zphoto/zphoto-1.0.ebuild
index f74732bd0baa..bf9bfe614c81 100644
--- a/media-gfx/zphoto/zphoto-0.7.ebuild
+++ b/media-gfx/zphoto/zphoto-1.0.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.2 2004/05/02 11:45:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.0.ebuild,v 1.1 2004/05/30 09:41:35 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,13 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-avifile-gentoo.diff
+	epatch ${FILESDIR}/zphoto-0.9-avifile-gentoo.diff
+}
+
+src_compile() {
+
+	econf --disable-wx || die
+	emake || die
 }
 
 src_install() {