Added db configuration instructions to the ebuild. Bug #113190. Cleaned up old versions.

(Portage version: 2.0.51.22-r3)

5 files changed, 23 insertions, 81 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index c7877fe1a5fe..cc368f0b3d6a 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.30 2005/11/20 16:45:19 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.31 2005/11/23 06:50:40 superlag Exp $
+
+  23 Nov 2005; Aaron Kulbe <superlag@gentoo.org> -wordpress-1.5.1.3.ebuild,
+  wordpress-1.5.2.ebuild:
+  Added db configuration documentation. Bug #113190. Cleaned up old ebuilds.
+  -1.5.1.3
 
   20 Nov 2005; Stuart Herbert <stuart@gentoo.org> wordpress-1.5.1.3.ebuild,
   wordpress-1.5.2.ebuild:
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index dcafe4060dc0..d29551bb8efa 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,5 @@
+MD5 cfd0816cc3a4c5be4ffb11a2ba1692a6 wordpress-1.5.2.ebuild 2926
 MD5 07a308c8d2c623243df9ba0660bdceee ChangeLog 6322
 MD5 bed9c007e8ee867414a21e2da8e92b3f metadata.xml 252
-MD5 923e5b3d31768189647560af4cbfa126 wordpress-1.5.2.ebuild 2287
-MD5 2043087278b4f778513ccfd4bc65b8f3 wordpress-1.5.1.3.ebuild 2019
-MD5 77f6e444886a1c9d39719c96d87ed625 files/digest-wordpress-1.5.2 67
-MD5 01d53342f3a1885d4067674e6d8feb5b files/digest-wordpress-1.5.1.3 69
 MD5 f816ff62dcd7cadf0fae9384ab9618e5 files/dummy-templates.php 269
+MD5 77f6e444886a1c9d39719c96d87ed625 files/digest-wordpress-1.5.2 67
diff --git a/www-apps/wordpress/files/digest-wordpress-1.5.1.3 b/www-apps/wordpress/files/digest-wordpress-1.5.1.3
deleted file mode 100644
index 73924d09fb87..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-1.5.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e37d766373a24fcf768667fd35537a7a wordpress-1.5.1.3.tar.gz 297839
diff --git a/www-apps/wordpress/wordpress-1.5.1.3.ebuild b/www-apps/wordpress/wordpress-1.5.1.3.ebuild
deleted file mode 100644
index 3d5c8e6e860e..000000000000
--- a/www-apps/wordpress/wordpress-1.5.1.3.ebuild
+++ /dev/null
@@ -1,74 +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/wordpress/wordpress-1.5.1.3.ebuild,v 1.7 2005/11/20 16:45:19 stuart Exp $
-
-inherit webapp eutils
-
-#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
-#wordpress 1.2.1 has no extension
-#MY_EXT="mingus"
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-#Latest version is only available in the format!
-#Download is renamed by HTTP Header as wordpress-1.5.1.2.tar.gz
-SRC_URI=mirror://gentoo/${P}.tar.gz
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-RDEPEND=">=dev-php/mod_php-4.1
-	 >=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-# no patch needed anymore
-#	epatch ${FILESDIR}/${PV}/login-patch.diff
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	# remove wp-admin/templates.php (XSS exploit).  See bug #88926.
-	rm -f wp-admin/templates.php
-	cp ${FILESDIR}/dummy-templates.php wp-admin/templates.php
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-	einfo "Done"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}/index.php
-	#webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.php
-	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for wordpress, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	# post-install instructions
-	#webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
-
-	# now strut stuff
-	webapp_src_install
-
-}
diff --git a/www-apps/wordpress/wordpress-1.5.2.ebuild b/www-apps/wordpress/wordpress-1.5.2.ebuild
index a8cac75a95b5..0aec221e3934 100644
--- a/www-apps/wordpress/wordpress-1.5.2.ebuild
+++ b/www-apps/wordpress/wordpress-1.5.2.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/wordpress/wordpress-1.5.2.ebuild,v 1.6 2005/11/20 16:45:19 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.5.2.ebuild,v 1.7 2005/11/23 06:50:40 superlag Exp $
 
 inherit webapp eutils
 
@@ -47,6 +47,20 @@ src_install() {
 	ewarn * php_flag register_globals off
 	ewarn *
 
+	ewarn *
+	ewarn * You will need to create a table for your WordPress database.  This
+	ewarn * assumes you have some knowledge of MySQL, and already have it
+	ewarn * installed and configured.  If not, please refer to
+	ewarn * the Gentoo MySQL guide at the following URL:
+	ewarn * http://www.gentoo.org/doc/en/mysql-howto.xml
+	ewarn * Log in to MySQL, and create a new database called
+	ewarn * "wordpress". From this point, you will need to edit
+	ewarn * your wp-config.php file in $DocumentRoot/wordpress/
+	ewarn * and point to your database. Once this is done, you can log in to
+	ewarn * WordPress at http://localhost/wordpress
+	ewarn *
+
+
 	# handle documentation files
 	#
 	# NOTE that doc files go into /usr/share/doc as normal; they do NOT