Removed old versions

(Portage version: 2.0.51.22-r1)

22 files changed, 26 insertions, 540 deletions

diff --git a/www-apps/phpwebsite/ChangeLog b/www-apps/phpwebsite/ChangeLog
index 4d83567111b4..d59b25e8f13a 100644
--- a/www-apps/phpwebsite/ChangeLog
+++ b/www-apps/phpwebsite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/phpwebsite
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.33 2005/07/09 22:37:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.34 2005/07/10 14:36:00 rl03 Exp $
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/phpwebsite-0.10.0-xml-rpc.diff,
+  +files/phpwebsite-0.10.1-xml-rpc.diff, -phpwebsite-0.9.3_p4-r1.ebuild,
+  -phpwebsite-0.9.3_p4-r2.ebuild, -phpwebsite-0.10.0.ebuild,
+  -phpwebsite-0.10.0-r1.ebuild, -phpwebsite-0.10.0-r2.ebuild,
+  -phpwebsite-0.10.0-r3.ebuild, phpwebsite-0.10.1-r1.ebuild:
+  Removed old versions
 
   09 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
   phpwebsite-0.10.1-r1.ebuild:
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index 16071a933d0d..839359e27551 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -1,28 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 23d8bcb6054fe0dcac429b9b607b48e7 ChangeLog 7206
-MD5 d1a2bc5cc4c9b25bfe5c58827fc477c8 phpwebsite-0.10.0-r2.ebuild 1734
-MD5 2605b5e8abb079f71b12202c38a8f86d phpwebsite-0.10.0-r1.ebuild 1616
+MD5 233bd531c637457254844976c6dc0175 phpwebsite-0.10.1-r1.ebuild 1644
+MD5 91cf3f58ed696c5ed4a0d7482f70ad81 ChangeLog 7574
 MD5 24a724cdfd1390bba450f4b7c1a9dfc5 metadata.xml 360
-MD5 41dbaed8aafa97c8930480adc9d77c58 phpwebsite-0.9.3_p4-r1.ebuild 1636
-MD5 c9b0b64992415f435bb5cf0b8f603435 phpwebsite-0.9.3_p4-r2.ebuild 1853
-MD5 4f03dd69be734fbd9aa2969d30ebb2c2 phpwebsite-0.10.0.ebuild 1433
-MD5 52d61c0dc46e17dc96a3f4ccb93e8c89 phpwebsite-0.10.1-r1.ebuild 1644
-MD5 5f35aa74e4a7118aa8b830cff357a04c phpwebsite-0.10.0-r3.ebuild 1905
-MD5 2ca9ac185775bab6e8fbecf0584c5c67 files/digest-phpwebsite-0.10.1-r1 159
-MD5 6ddbbfb4f4e1e5c4d8bf717835d3c2d8 files/digest-phpwebsite-0.9.3_p4-r2 239
-MD5 c50eef019c793463d0818d3fe35b46f4 files/digest-phpwebsite-0.10.0-r2 221
-MD5 835150acc17debf9125505dc224adc41 files/digest-phpwebsite-0.10.0-r3 305
-MD5 0f181e50286192df906dd979448e0fd5 files/phpwebsite-0.10.0-xml-rpc.diff 1188
-MD5 e328ec89d9602d614fbf60f87988f218 files/digest-phpwebsite-0.10.0-r1 147
 MD5 87c3729bfda5e5188af3f0df1fcda7e7 files/postinstall-en.txt 4637
-MD5 dab689c75fd084b695c69c427aa758b8 files/digest-phpwebsite-0.10.0 75
-MD5 823ff723bde0deb5142a1753183467fd files/digest-phpwebsite-0.9.3_p4-r1 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0FHfKf2g/qXtneoRAue/AKCKUVsh88rRerQhsp7eCjpepd85XwCfTde5
-a5IVTVB1o35ZDNVNf78CJcE=
-=jh94
------END PGP SIGNATURE-----
+MD5 0f181e50286192df906dd979448e0fd5 files/phpwebsite-0.10.1-xml-rpc.diff 1188
+MD5 2ca9ac185775bab6e8fbecf0584c5c67 files/digest-phpwebsite-0.10.1-r1 159
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0 b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0
deleted file mode 100644
index 598ec0e85c53..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d433111d1a40b6e94c0a33bd7f01a8f phpwebsite-0.10.0-full.tar.gz 4615559
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r1 b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r1
deleted file mode 100644
index 0e80adbd3834..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6d433111d1a40b6e94c0a33bd7f01a8f phpwebsite-0.10.0-full.tar.gz 4615559
-MD5 e3539ca482a24582bb65b9c23c701cde phpws_image_secure_patch.tgz 14846
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2 b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2
deleted file mode 100644
index cbf337d6b657..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d433111d1a40b6e94c0a33bd7f01a8f phpwebsite-0.10.0-full.tar.gz 4615559
-MD5 e3539ca482a24582bb65b9c23c701cde phpws_image_secure_patch.tgz 14846
-MD5 3a953b36b925288d7b1b4d185003248c phpws_files_security_patch3.tgz 4781
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r3 b/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r3
deleted file mode 100644
index c7d3dad5141a..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.10.0-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6d433111d1a40b6e94c0a33bd7f01a8f phpwebsite-0.10.0-full.tar.gz 4615559
-MD5 e3539ca482a24582bb65b9c23c701cde phpws_image_secure_patch.tgz 14846
-MD5 3a953b36b925288d7b1b4d185003248c phpws_files_security_patch3.tgz 4781
-MD5 14272205b7ef11e8587fb726c0a0acca phpwebsite_security_patch_20050707.1.tgz 17337
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r1 b/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r1
deleted file mode 100644
index e16acdb692f6..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c62490073f780aa8f0ed050ac06cb831 phpwebsite-0.9.3-4-full.tar.gz 3556756
-MD5 b0549294486b2efd0163230fc30d26f6 phpwebsite-core-security-patch.tar.gz 18664
diff --git a/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r2 b/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r2
deleted file mode 100644
index 45db6e867f4b..000000000000
--- a/www-apps/phpwebsite/files/digest-phpwebsite-0.9.3_p4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c62490073f780aa8f0ed050ac06cb831 phpwebsite-0.9.3-4-full.tar.gz 3556756
-MD5 b0549294486b2efd0163230fc30d26f6 phpwebsite-core-security-patch.tar.gz 18664
-MD5 1b3153eed4c026289f8744f65e8b922a phpwebsite-core-security-patch2.tar.gz 18118
diff --git a/www-apps/phpwebsite/files/phpwebsite-0.10.0-xml-rpc.diff b/www-apps/phpwebsite/files/phpwebsite-0.10.1-xml-rpc.diff
index 2b0c83a485c4..2b0c83a485c4 100644
--- a/www-apps/phpwebsite/files/phpwebsite-0.10.0-xml-rpc.diff
+++ b/www-apps/phpwebsite/files/phpwebsite-0.10.1-xml-rpc.diff
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.0-r1.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.0-r1.ebuild
deleted file mode 100644
index c66ad7768851..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.0-r1.ebuild,v 1.2 2005/02/27 11:28:00 kloeri Exp $
-
-inherit webapp
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz
-		http://phpwebsite.appstate.edu/downloads/security/phpws_image_secure_patch.tgz"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}-${MY_PV}-full"
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-full.tar.gz
-	cd ${S}
-	unpack phpws_image_secure_patch.tgz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild
deleted file mode 100644
index 49bdfbadde0f..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.0-r2.ebuild,v 1.5 2005/03/01 18:12:34 kloeri Exp $
-
-inherit webapp
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz
-http://phpwebsite.appstate.edu/downloads/security/phpws_image_secure_patch.tgz
-http://phpwebsite.appstate.edu/downloads/security/phpws_files_security_patch3.tgz"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}-${MY_PV}-full"
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-full.tar.gz
-	cd ${S}
-	unpack phpws_files_security_patch3.tgz
-	unpack phpws_image_secure_patch.tgz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.0-r3.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.0-r3.ebuild
deleted file mode 100644
index a22a4e8b00d8..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.10.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.0-r3.ebuild,v 1.2 2005/07/08 12:33:47 rl03 Exp $
-
-inherit webapp eutils
-
-MY_P="${PN}-${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-full.tar.gz
-http://phpwebsite.appstate.edu/downloads/security/phpws_image_secure_patch.tgz
-http://phpwebsite.appstate.edu/downloads/security/phpws_files_security_patch3.tgz
-http://phpwebsite.appstate.edu/downloads/security/phpwebsite_security_patch_20050707.1.tgz"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${MY_P}-full"
-
-src_unpack() {
-	unpack ${MY_P}-full.tar.gz
-	cd ${S}
-	unpack phpws_files_security_patch3.tgz
-	unpack phpws_image_secure_patch.tgz
-	unpack phpwebsite_security_patch_20050707.1.tgz
-	epatch ${FILESDIR}/${P}-xml-rpc.diff
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.0.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.0.ebuild
deleted file mode 100644
index 4f72b38e80cb..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.0.ebuild,v 1.2 2005/01/20 17:47:54 rizzo Exp $
-
-inherit webapp
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}-${MY_PV}-full"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.1-r1.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.1-r1.ebuild
index fd82a9f3fc42..f44c8ee929c5 100644
--- a/www-apps/phpwebsite/phpwebsite-0.10.1-r1.ebuild
+++ b/www-apps/phpwebsite/phpwebsite-0.10.1-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/phpwebsite/phpwebsite-0.10.1-r1.ebuild,v 1.4 2005/07/09 22:37:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.1-r1.ebuild,v 1.5 2005/07/10 14:36:00 rl03 Exp $
 
 inherit eutils webapp
 
@@ -22,7 +22,7 @@ src_unpack() {
 	unpack ${P}-full.tar.gz
 	cd ${S}
 	unpack phpwebsite_security_patch_20050707.1.tgz
-	epatch ${FILESDIR}/phpwebsite-0.10.0-xml-rpc.diff
+	epatch ${FILESDIR}/phpwebsite-0.10.1-xml-rpc.diff
 }
 
 src_install() {
diff --git a/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r1.ebuild b/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r1.ebuild
deleted file mode 100644
index 512961ec9510..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r1.ebuild,v 1.6 2005/01/20 17:47:54 rizzo Exp $
-
-inherit webapp
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz
-	http://phpwebsite.appstate.edu/downloads/security/phpwebsite-core-security-patch.tar.gz"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc ~sparc alpha"
-IUSE=""
-RDEPEND="<virtual/httpd-php-5
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}-${MY_PV}-full"
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-full.tar.gz
-	cd ${S}
-	unpack phpwebsite-core-security-patch.tar.gz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r2.ebuild b/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r2.ebuild
deleted file mode 100644
index 8041b7baefad..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.9.3_p4-r2.ebuild,v 1.6 2005/01/20 17:47:54 rizzo Exp $
-
-inherit webapp
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-full.tar.gz
-	http://phpwebsite.appstate.edu/downloads/security/phpwebsite-core-security-patch.tar.gz
-	http://phpwebsite.appstate.edu/downloads/security/phpwebsite-core-security-patch2.tar.gz"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc ~sparc alpha"
-IUSE=""
-RDEPEND="<virtual/httpd-php-5
-	>=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}-${MY_PV}-full"
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-full.tar.gz
-	cd ${S}
-	unpack phpwebsite-core-security-patch.tar.gz
-	unpack phpwebsite-core-security-patch2.tar.gz
-
-	# Oops from patch tar creator
-	rm ${S}/phpwebsite-core-security-patch2.tar.gz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="docs/CREDITS.txt docs/REQUIREMENTS.txt docs/UNINSTALL.txt docs/THEMES.txt docs/LICENSE.txt docs/README.txt docs/PEARERRORS.txt docs/sample.config.php docs/INSTALL.txt docs/CONVERSION.txt docs/UPGRADE.txt docs/KNOWNISSUES.txt"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index a7e66851d067..c514b10a4d89 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.11 2005/07/07 21:47:19 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.12 2005/07/10 14:39:21 rl03 Exp $
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org> -tikiwiki-1.8.4.1.ebuild,
+  -tikiwiki-1.8.5.ebuild:
+  Removed old versions
 
 *tikiwiki-1.9.0 (07 Jul 2005)
 
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index baedfe34e0b0..b90edbea9a0d 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4d54aa6a1b2aa5956ae8a6e97c2ec081 ChangeLog 3738
-MD5 6f2a8966e380c4abbebb0883290d7a21 files/digest-tikiwiki-1.8.4.1 70
-MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5 68
-MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68
-MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68
-MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
-MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
-MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 2ed8ae162e0d1b50d5356d2d9d15b5fd tikiwiki-1.8.4.1.ebuild 2237
 MD5 9428e2c5313b6733e9476a441c3eb576 tikiwiki-1.8.5-r1.ebuild 2339
-MD5 8582dd52c50f2395981af4b10393db5c tikiwiki-1.8.5.ebuild 2242
 MD5 3df178d3364ec7a6fd53340327e0cd3b tikiwiki-1.9.0.ebuild 2590
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0B5HI1lqEGTUzyQRAnQiAKDGBz3ccxKyk6F8XuKrsiUxIDTiSwCfft05
-nqB9rCq007v0O8qkUvth/go=
-=A9IJ
------END PGP SIGNATURE-----
+MD5 a0c5520a4a81f238ab234817b53cbd07 ChangeLog 3860
+MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
+MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68
+MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
+MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1
deleted file mode 100644
index 0d11080870c0..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00d6bdbcd0f4afb5ce64bdcb9f8fab97 tikiwiki-1.8.4.1.tar.bz2 5513495
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5
deleted file mode 100644
index fd9e2fe7ff1d..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e64dc5ffcee6699993e90ea1ed8ce1af tikiwiki-1.8.5.tar.bz2 5706055
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild
deleted file mode 100644
index 90d40f97fd07..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.4.1.ebuild,v 1.3 2005/07/09 18:57:48 swegener Exp $
-
-inherit webapp
-
-DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
-HOMEPAGE="http://tikiwiki.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-IUSE=""
-KEYWORDS="~x86 ppc ~sparc"
-
-RDEPEND="virtual/php
-	media-gfx/graphviz"
-
-
-src_install() {
-	webapp_src_preinst
-
-	local DIR
-	local DIRENTRY
-	local DIRS="backups db dump img/wiki
-		img/wiki_up modules/cache temp temp/cache
-		templates_c templates styles lib/Galaxia/processes"
-
-
-	# Ensure that directories exist, some don't.
-	# (part of setup.sh)
-	#
-	for DIR in ${DIRS}; do
-		mkdir -p ${DIR}
-	done
-
-	# Remove the execute permission from the setup.sh script
-	# and rename it.  Its actions have been incorporated here.
-	#
-	chmod a-x setup.sh
-	mv setup.sh setup.sh.done
-
-	# Install the minimal doc (points to web page)
-	#
-	dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
-
-	# The bulk goes into htdocs
-	# but don't copy INSTALL and README
-	cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR}
-
-	# Recursively set server ownership to allow server to write
-	# This is the rough equivalent of the setup.sh script
-	# provided in the distribution.
-	# Note: Cannot use xargs or find -exec here because 
-	# 		these don't	work with shell functions.
-	#
-	webapp_serverowned ${MY_HTDOCSDIR}
-	for DIR in ${DIRS}; do
-		find ${DIR} | while read DIRENTRY; do
-			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
-		done
-	done
-
-	# Flag files for scripting engine
-	#
-	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
-	done
-
-	# Setup some post-install notes for webapp-config
-	#
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_config() {
-	einfo "Type in your MySQL root password to create an empty tiki database:"
-	mysqladmin -u root -p create tikiwiki
-	einfo
-	einfo
-	einfo "Now, point your browser to the location of tiki-install.php"
-	einfo "    ==> e.g. http://localhost/tikiwiki/tiki-install.php"
-	einfo
-}
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.5.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.5.ebuild
deleted file mode 100644
index fab3b8199b60..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.8.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.5.ebuild,v 1.4 2005/07/09 18:57:48 swegener Exp $
-
-inherit webapp
-
-DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
-HOMEPAGE="http://tikiwiki.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-IUSE=""
-KEYWORDS="~x86 ppc ~sparc ~amd64"
-
-RDEPEND="virtual/php
-	media-gfx/graphviz"
-
-
-src_install() {
-	webapp_src_preinst
-
-	local DIR
-	local DIRENTRY
-	local DIRS="backups db dump img/wiki
-		img/wiki_up modules/cache temp temp/cache
-		templates_c templates styles lib/Galaxia/processes"
-
-
-	# Ensure that directories exist, some don't.
-	# (part of setup.sh)
-	#
-	for DIR in ${DIRS}; do
-		mkdir -p ${DIR}
-	done
-
-	# Remove the execute permission from the setup.sh script
-	# and rename it.  Its actions have been incorporated here.
-	#
-	chmod a-x setup.sh
-	mv setup.sh setup.sh.done
-
-	# Install the minimal doc (points to web page)
-	#
-	dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
-
-	# The bulk goes into htdocs
-	# but don't copy INSTALL and README
-	cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR}
-
-	# Recursively set server ownership to allow server to write
-	# This is the rough equivalent of the setup.sh script
-	# provided in the distribution.
-	# Note: Cannot use xargs or find -exec here because 
-	# 		these don't	work with shell functions.
-	#
-	webapp_serverowned ${MY_HTDOCSDIR}
-	for DIR in ${DIRS}; do
-		find ${DIR} | while read DIRENTRY; do
-			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
-		done
-	done
-
-	# Flag files for scripting engine
-	#
-	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
-	done
-
-	# Setup some post-install notes for webapp-config
-	#
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_config() {
-	einfo "Type in your MySQL root password to create an empty tiki database:"
-	mysqladmin -u root -p create tikiwiki
-	einfo
-	einfo
-	einfo "Now, point your browser to the location of tiki-install.php"
-	einfo "    ==> e.g. http://localhost/tikiwiki/tiki-install.php"
-	einfo
-}