Housekeeping

(Portage version: 2.0.51.22-r2)

8 files changed, 27 insertions, 32 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index 59bc98a56157..3f53823bcc84 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/phpwiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.8 2005/07/07 16:40:25 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.9 2005/08/22 21:52:43 rl03 Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwiki-1.3.10-r1.ebuild:
+  Housekeeping
 
   07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-1.3-en.txt:
   Mention location of db schemas wrt #70579.
diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index 7390217751a2..6cd5bedadd81 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 16de4dbfa7c8d3a58d0c4f2c49503919 phpwiki-1.3.10-r1.ebuild 1094
+MD5 3d341cf6b698f7718a5b03352284392a phpwiki-1.3.10-r1.ebuild 1086
 MD5 9e54aec0f26142c9be6ccb34c3af281d phpwiki-1.3.10.ebuild 1035
 MD5 f484aa80c38f18c325c29c39d1a376d3 ChangeLog 1293
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
@@ -12,10 +9,3 @@ MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10-r1 67
 MD5 4bd0a80d3c53ac5861e9a63e2540f996 files/postinstall-1.3-en.txt 252
 MD5 3259bf9dc4bef8f25c35478900932b96 files/phpwiki-1.3.10-xmlrpc.patch 959
 MD5 61ddc0899b2191583eb5755c954e5f14 files/digest-phpwiki-1.2.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzVsREzitwsaoONoRAohBAJ9mdDIKqPiJcLnRelz2zLIloUQ1rACgy4pY
-bY8Fed8SXacp9TxXUo4Moyk=
-=k4r8
------END PGP SIGNATURE-----
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
index 12ad294cb9c5..fadfb19a79fa 100644
--- a/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild,v 1.1 2005/07/05 22:25:55 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild,v 1.2 2005/08/22 21:52:43 rl03 Exp $
 
 inherit eutils webapp
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/php-4.0.6
+RDEPEND="virtual/php
 	net-www/apache"
 
 src_unpack() {
diff --git a/www-apps/polarblog/ChangeLog b/www-apps/polarblog/ChangeLog
index 567c36ef9d78..e5143f76b7ad 100644
--- a/www-apps/polarblog/ChangeLog
+++ b/www-apps/polarblog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/polarblog
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/ChangeLog,v 1.8 2005/07/07 20:55:12 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/ChangeLog,v 1.9 2005/08/22 21:55:33 rl03 Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, polarblog-1.52.ebuild:
+  Housekeeping
 
 *polarblog-1.52 (07 Jul 2005)
 
diff --git a/www-apps/polarblog/Manifest b/www-apps/polarblog/Manifest
index b86ccc082764..61f3c93d0241 100644
--- a/www-apps/polarblog/Manifest
+++ b/www-apps/polarblog/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 57bfff0127beb168e32548907e71c127 ChangeLog 1240
-MD5 58ea40a76d4189d6ee5f987bf9e0ce56 polarblog-1.52.ebuild 838
+MD5 512becc4b3fa72bc071665d696523d8a polarblog-1.52.ebuild 834
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 49ea194bc029ebaabc371f02ffd7a198 files/postinstall-en.txt 507
+MD5 65fc388017414f5adf2d0d96e9593b3a files/postinstall-en.txt 506
 MD5 4ff300032ceb78f43483ff77a38160eb files/digest-polarblog-1.52 56
-MD5 dfdbde32f5347cbdc964183d73dca032 files/reconfig 152
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzZbIEzitwsaoONoRApVcAKCF4tfTfD8fdpmkoYdPk94Q6wa4ZwCg071d
-lk/0oqfuRcQ812dbBaHGYds=
-=yMJn
------END PGP SIGNATURE-----
+MD5 15f47a7b879f76e31a344ac66540a22f files/reconfig 229
diff --git a/www-apps/polarblog/files/postinstall-en.txt b/www-apps/polarblog/files/postinstall-en.txt
index 561da8283b84..b34721de4348 100644
--- a/www-apps/polarblog/files/postinstall-en.txt
+++ b/www-apps/polarblog/files/postinstall-en.txt
@@ -6,7 +6,7 @@ cp ${MY_INSTALLDIR}/config/config.php.dist ${MY_INSTALLDIR}/config/config.php
 and edit them. As a minimum, set LIB_PATH, DB_PREFIX, DB_HOST, DB_NAME,
 DB_USER, DB_PASSWORD, CSS.
 
-Then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php to finish the installation.
+Then go to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/install.php to finish the installation.
 Don't forget to delete ${MY_INSTALLDIR}/install.php when you are done.
 
 Read the docs at http://polarblog.polarlava.com/docs/
diff --git a/www-apps/polarblog/files/reconfig b/www-apps/polarblog/files/reconfig
index c2353c2cb58d..89f55b48d928 100644
--- a/www-apps/polarblog/files/reconfig
+++ b/www-apps/polarblog/files/reconfig
@@ -1,4 +1,12 @@
 #!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
 if [ $1 = "install" ]; then
-	sed -e "s|/your/path/to/public_html/polarblog|${MY_INSTALLDIR}|" -i ${MY_INSTALLDIR}/config/config.php.dist
+	sed -e "s|/your/path/to/public_html/polarblog|${MY_INSTALLDIR}|" -i ${MY_INSTALLDIR}/config/config.php.dist || die "sed failed"
 fi
diff --git a/www-apps/polarblog/polarblog-1.52.ebuild b/www-apps/polarblog/polarblog-1.52.ebuild
index 14e75cf42955..73da75c1dd98 100644
--- a/www-apps/polarblog/polarblog-1.52.ebuild
+++ b/www-apps/polarblog/polarblog-1.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/polarblog-1.52.ebuild,v 1.1 2005/07/07 20:55:12 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/polarblog-1.52.ebuild,v 1.2 2005/08/22 21:55:33 rl03 Exp $
 
 inherit webapp
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="
 	>=dev-db/mysql-3.23.23
-	>=virtual/php-4
+	virtual/php
 "
 
 LICENSE="GPL-2"