www-apps/zoph: Version bump, remove old. Fix dependencies. Provide better instructions for DB creating. Quoting, ebuild cleanup.

svn path=/experimental/; revision=448

9 files changed, 94 insertions, 124 deletions

diff --git a/www-apps/zoph/ChangeLog b/www-apps/zoph/ChangeLog
index 96ddfcd..fceb0bb 100644
--- a/www-apps/zoph/ChangeLog
+++ b/www-apps/zoph/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for www-apps/zoph
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2007; Jakub Moc <jakub@gentoo.org> files/postinstall-en.txt,
+  -zoph-0.4.ebuild, -zoph-0.6.ebuild, +zoph-0.7.0.2.ebuild:
+  Version bump, remove old. Fix dependencies. Provide better instructions for
+  DB creating. Quoting, ebuild cleanup.
+
   05 Dec 2006; Emanuele Gentili <bathym@0x656d67.org> +zoph-0.6.ebuild:
   Version bump
 
diff --git a/www-apps/zoph/Manifest b/www-apps/zoph/Manifest
index d2c467b..8a71d89 100644
--- a/www-apps/zoph/Manifest
+++ b/www-apps/zoph/Manifest
@@ -1,24 +1,16 @@
-AUX postinstall-en.txt 491 RMD160 a8c055ee5e6889ef0dc651fe30400b45a42d9f08 SHA1 3b15fb6724d0b5dfa68ff15e2d696a9bd997f706 SHA256 10d7784819b5026dd1da078b9212d172b3655cfc1f7112d21ea56341e8e794c7
-MD5 e52544d8e3d72455e6c134504ae434ac files/postinstall-en.txt 491
-RMD160 a8c055ee5e6889ef0dc651fe30400b45a42d9f08 files/postinstall-en.txt 491
-SHA256 10d7784819b5026dd1da078b9212d172b3655cfc1f7112d21ea56341e8e794c7 files/postinstall-en.txt 491
-DIST zoph-0.4.tar.gz 244410 RMD160 9321bd5e031523bb363247f20fa357d58e5f2ef8 SHA1 2527bf2172e4ece45a3f4cd1439a032e056a8026 SHA256 99758d38837bb68408bdfb043f0abbed3d4da312544992611bcc08acda1122f7
-DIST zoph-0.6.tar.gz 382577 RMD160 ea794df91fbfa77143ae236496d721b5f9d18c8c SHA1 d8defb353c63845b5a4c835736e4d5cceac568ae SHA256 68d932702e782dbb3f948d07d2a6b1f724e7c2746ca7f5771cda953440fb48cd
-EBUILD zoph-0.4.ebuild 972 RMD160 00a59b5b39a3216527790e5607c917d281d03fc8 SHA1 e56740a1442b4e69f4067d6b0e7b8aecccefa421 SHA256 f45258031f36f09615606a1f83e4997ee3c965b8c86d7aec51113b2164810f75
-MD5 50c6fb4d0d86c0f23932666f9aaf9879 zoph-0.4.ebuild 972
-RMD160 00a59b5b39a3216527790e5607c917d281d03fc8 zoph-0.4.ebuild 972
-SHA256 f45258031f36f09615606a1f83e4997ee3c965b8c86d7aec51113b2164810f75 zoph-0.4.ebuild 972
-EBUILD zoph-0.6.ebuild 972 RMD160 2beef2448538dd1275e029c75049919a817ea9cf SHA1 3dd6eee8df22408f526eaef41ba9ab915d65a167 SHA256 0a5fc81795323f29d8c8a4d99977413af605b3d0a07895f81d92ed6131ce8614
-MD5 d90623ea4929b715a6cf4c8483a16b88 zoph-0.6.ebuild 972
-RMD160 2beef2448538dd1275e029c75049919a817ea9cf zoph-0.6.ebuild 972
-SHA256 0a5fc81795323f29d8c8a4d99977413af605b3d0a07895f81d92ed6131ce8614 zoph-0.6.ebuild 972
-MISC ChangeLog 366 RMD160 590d2d36a83527cd6aef6884254bd31609392d7e SHA1 1b1a256107c7ac91291b4e5b826c9536b65da0c8 SHA256 e98f431c2b187fde749d3f0002d82866ca154c23fcb6c06673d4410deae0f708
-MD5 ae538b7dc5a56343d6255c01ca6640f1 ChangeLog 366
-RMD160 590d2d36a83527cd6aef6884254bd31609392d7e ChangeLog 366
-SHA256 e98f431c2b187fde749d3f0002d82866ca154c23fcb6c06673d4410deae0f708 ChangeLog 366
-MD5 3c168b01243a5310917935d5f4fc90bf files/digest-zoph-0.4 226
-RMD160 7523829cd4e8cf50c705569e081255c9c8d65bbc files/digest-zoph-0.4 226
-SHA256 24cb58d01139cee614d4f92cec6ad4a393878b8ae959f1bbe888a08495c893b1 files/digest-zoph-0.4 226
-MD5 9b2c228fd1fb4bebe77796afa1e0ad79 files/digest-zoph-0.6 226
-RMD160 5e5e83b5b33d6e62bbb5eb43220c2b1019a9d9c9 files/digest-zoph-0.6 226
-SHA256 5fde46d0d35b210df12194d6cb86a5fda0ccc7b2bb177dbf6dcf6e98b4d55025 files/digest-zoph-0.6 226
+AUX postinstall-en.txt 597 RMD160 6faafdd61029def8df24610cdc9c7e6a5e27f48e SHA1 7d7e340db9cd3ed8e91dd5225ee09f41d7689032 SHA256 e349cf7f02ab7ea64e232b39dcae5eb034eb9de07ab7c50796cc67f6698fc8cf
+MD5 4ca0bfd2466e05f4241a493981060a63 files/postinstall-en.txt 597
+RMD160 6faafdd61029def8df24610cdc9c7e6a5e27f48e files/postinstall-en.txt 597
+SHA256 e349cf7f02ab7ea64e232b39dcae5eb034eb9de07ab7c50796cc67f6698fc8cf files/postinstall-en.txt 597
+DIST zoph-0.7.0.2.tar.gz 406379 RMD160 0f53f9c7fa20ead062f28dd202621b915f0fb30e SHA1 abf4af85f6e3d4d222c63addf10c01aba99ae533 SHA256 da72ea0902209d2d5a7f31c83646d1bda6ab385160d58e544a176dae65f6d695
+EBUILD zoph-0.7.0.2.ebuild 1501 RMD160 71f6f96df45743ccadce23688a2e8e35df8a8c7e SHA1 3b7c6d3fa0efe76af73564abcf20ce4f7f69904d SHA256 8bd49d74a3f90e1167f19f3c61a4a425dca57a13705d4d8b42ea0c5f4eb94ee6
+MD5 33b5d5381cc910b605bf1d63399ebdef zoph-0.7.0.2.ebuild 1501
+RMD160 71f6f96df45743ccadce23688a2e8e35df8a8c7e zoph-0.7.0.2.ebuild 1501
+SHA256 8bd49d74a3f90e1167f19f3c61a4a425dca57a13705d4d8b42ea0c5f4eb94ee6 zoph-0.7.0.2.ebuild 1501
+MISC ChangeLog 615 RMD160 2adc8311310960ff13d5e52014ed68df7a296854 SHA1 20439fb183a302067df0fec23b6e7a9c831c146f SHA256 418f5a174ef4cdb1396a24b4caedc04e30f92c7195f67f0aca6d2974a464ea86
+MD5 3b5dd6095090afcef2ea920b638485f2 ChangeLog 615
+RMD160 2adc8311310960ff13d5e52014ed68df7a296854 ChangeLog 615
+SHA256 418f5a174ef4cdb1396a24b4caedc04e30f92c7195f67f0aca6d2974a464ea86 ChangeLog 615
+MD5 8b971c30360ade0992aa4c4a3c6add0c files/digest-zoph-0.7.0.2 238
+RMD160 47e1cedded1ef1b962b13b17e9541ee8a7c587e9 files/digest-zoph-0.7.0.2 238
+SHA256 bf7975bb8efb81570dd9c08e2e9d925caf31c003af7da649500744127b8acb1c files/digest-zoph-0.7.0.2 238
diff --git a/www-apps/zoph/files/digest-zoph-0.4 b/www-apps/zoph/files/digest-zoph-0.4
deleted file mode 100644
index 805e2dc..0000000
--- a/www-apps/zoph/files/digest-zoph-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15930079d4619bead04e71ca4c857f90 zoph-0.4.tar.gz 244410
-RMD160 9321bd5e031523bb363247f20fa357d58e5f2ef8 zoph-0.4.tar.gz 244410
-SHA256 99758d38837bb68408bdfb043f0abbed3d4da312544992611bcc08acda1122f7 zoph-0.4.tar.gz 244410
diff --git a/www-apps/zoph/files/digest-zoph-0.6 b/www-apps/zoph/files/digest-zoph-0.6
deleted file mode 100644
index 50b19fd..0000000
--- a/www-apps/zoph/files/digest-zoph-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e139b32bd477cccf43454cb4c07c16d zoph-0.6.tar.gz 382577
-RMD160 ea794df91fbfa77143ae236496d721b5f9d18c8c zoph-0.6.tar.gz 382577
-SHA256 68d932702e782dbb3f948d07d2a6b1f724e7c2746ca7f5771cda953440fb48cd zoph-0.6.tar.gz 382577
diff --git a/www-apps/zoph/files/digest-zoph-0.7.0.2 b/www-apps/zoph/files/digest-zoph-0.7.0.2
new file mode 100644
index 0000000..a82570c
--- /dev/null
+++ b/www-apps/zoph/files/digest-zoph-0.7.0.2
@@ -0,0 +1,3 @@
+MD5 3488aded160643aed792c363fadb452d zoph-0.7.0.2.tar.gz 406379
+RMD160 0f53f9c7fa20ead062f28dd202621b915f0fb30e zoph-0.7.0.2.tar.gz 406379
+SHA256 da72ea0902209d2d5a7f31c83646d1bda6ab385160d58e544a176dae65f6d695 zoph-0.7.0.2.tar.gz 406379
diff --git a/www-apps/zoph/files/postinstall-en.txt b/www-apps/zoph/files/postinstall-en.txt
index 3592e01..5c78d43 100644
--- a/www-apps/zoph/files/postinstall-en.txt
+++ b/www-apps/zoph/files/postinstall-en.txt
@@ -1,9 +1,11 @@
 You are almost done!
 
   0. Create a new MySQL database:
-	mysqladmin create zoph
-	cd /usr/share/doc/${PN}-${PVR}
-	gunzip zoph.sql.gz && mysql zoph < zoph.sql
+  mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PN}.sql
+  
+  NOTE:
+  If you are upgrading from 0.6, you can use this mysql script instead:
+  mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/zoph_update-0.7.sql
 
   1. Read http://en.wikibooks.org/wiki/Zoph/Configuration to setup PHP
 
diff --git a/www-apps/zoph/zoph-0.4.ebuild b/www-apps/zoph/zoph-0.4.ebuild
deleted file mode 100644
index c4401ad..0000000
--- a/www-apps/zoph/zoph-0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=44595
-# Submitted-By: Jeroen Roos
-# Reviewed-By: rl03 2005-12-18
-
-inherit webapp
-
-DESCRIPTION="Zoph is a web based digital image presentation and management system"
-HOMEPAGE="http://zoph.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-IUSE=""
-
-RDEPEND=" ( >=dev-db/mysql-3.23 <dev-db/mysql-4.1 )
-	virtual/php
-	dev-lang/perl
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	dev-perl/ImageSize
-	>=media-gfx/jhead-1.2
-	>=media-gfx/imagemagick-5.3
-	net-www/apache"
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc [[:upper:]]* sql/*
-	dohtml docs/*
-	doman man/*
-	dobin bin/*
-
-	cp -R php/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/zoph/zoph-0.6.ebuild b/www-apps/zoph/zoph-0.6.ebuild
deleted file mode 100644
index 632c32a..0000000
--- a/www-apps/zoph/zoph-0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=44595
-# Submitted-By: Jeroen Roos
-# Reviewed-By: rl03 2005-12-18
-
-inherit webapp
-
-DESCRIPTION="Zoph is a web based digital image presentation and management system"
-HOMEPAGE="http://zoph.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-IUSE=""
-
-RDEPEND=" ( >=dev-db/mysql-3.23 <dev-db/mysql-4.1 )
-	virtual/php
-	dev-lang/perl
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	dev-perl/ImageSize
-	>=media-gfx/jhead-1.2
-	>=media-gfx/imagemagick-5.3
-	net-www/apache"
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc [[:upper:]]* sql/*
-	dohtml docs/*
-	doman man/*
-	dobin bin/*
-
-	cp -R php/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/zoph/zoph-0.7.0.2.ebuild b/www-apps/zoph/zoph-0.7.0.2.ebuild
new file mode 100644
index 0000000..e04b757
--- /dev/null
+++ b/www-apps/zoph/zoph-0.7.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Source: http://bugs.gentoo.org/show_bug.cgi?id=44595
+# Submitted-By: Jeroen Roos
+# Reviewed-By: rl03 2005-12-18
+
+inherit webapp depend.php depend.apache
+
+DESCRIPTION="Web based digital image presentation and management system"
+HOMEPAGE="http://zoph.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/perl-5.8.8
+	>=dev-lang/php-5.2.2
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	dev-perl/File-Copy-Link
+	dev-perl/ImageSize
+	>=media-gfx/jhead-1.2
+	>=media-gfx/imagemagick-5.3"
+
+want_apache
+
+pkg_setup() {
+	local flags="exif mysql pcre session xml"
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external USE flags enabled."
+	fi
+	
+	webapp_pkg_setup
+}
+
+src_install () {
+	webapp_src_preinst
+
+	dodoc [[:upper:]]* sql/* bin/zophrc.sample
+	if use examples ; then
+		docinto examples
+		dodoc contrib/*
+	fi
+	dohtml docs/*
+	doman man/*
+
+	rm -f bin/zophrc.sample
+	dobin bin/*
+
+	cp -R php/* "${D}"/${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
+	webapp_sqlscript mysql sql/zoph.sql
+	webapp_sqlscript mysql sql/zoph_update-0.7.sql 0.6
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}