Version bump; see bug #74649

4 files changed, 86 insertions, 2 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index d604690b2346..03fdbc1b4032 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.7 2004/12/18 21:03:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.8 2004/12/18 23:36:10 stuart Exp $
 
   18 Dec 2004; Jason Wever <weeve@gentoo.org> wordpress-1.2-r1.ebuild:
   Stable on sparc.
 
+*wordpress-1.2.2 (18 Dec 2004)
+
+  18 Dec 2004; Stuart Herbert <stuart@gentoo.org> +wordpress-1.2.2.ebuild:
+  Version bump; fixes bug 74649; thanks to Peter Westwood
+  (peter.westwood@ftwr.co.uk) for his help
+
   12 Oct 2004; <SeJo@gentoo.org> :
   stable on ppc gsla: 65798
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 865fbd9b931d..469f37e12622 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,14 +1,16 @@
-MD5 45fc771892025457c9c29b98cf9b5697 ChangeLog 2823
+MD5 1254aab2f8cdf5301f4f444216309def ChangeLog 3033
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 11ed2b98b5625fc3366ef084526d663e wordpress-1.0.2.ebuild 1959
 MD5 de07e97f74df5ce94f465e7359c76d7f wordpress-1.2-r1.ebuild 1931
 MD5 0aaa512ade97b7734981cc159d205106 wordpress-1.2.ebuild 1932
 MD5 9bbf4af62b26f88c0717357f463f1c7d wordpress-1.2.1.ebuild 1927
+MD5 4bd6cc953e9c853006d3b491ad504dc3 wordpress-1.2.2.ebuild 2095
 MD5 3310de51163cfb2a4b23c784003c123d files/digest-wordpress-1.0.2 74
 MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2 72
 MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2-r1 72
 MD5 8798d44320b59c755a81271d58bd3827 files/wordpress-1.0.2.gentoo.diff 7670
 MD5 ddf9ce79b3f5375fbd1a1d7d7f1ecc0d files/digest-wordpress-1.2.1 67
+MD5 623542b78674abcdc33bb18a783739c8 files/digest-wordpress-1.2.2 64
 MD5 bf77b16b46337e5eb66a5fb42c3b263d files/1.2/login-patch.diff 2062
 MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2/postinstall-en.txt 490
 MD5 6c80f1e7f474c6a87d67fe8095a29e9f files/1.2.1/login-patch.diff 569
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2.2 b/www-apps/wordpress/files/digest-wordpress-1.2.2
new file mode 100644
index 000000000000..cc5df5067310
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.2.2
@@ -0,0 +1 @@
+MD5 b2e360de466a360c4a0683c12847c7d4 latest-1.2.2.tar.gz 250774
diff --git a/www-apps/wordpress/wordpress-1.2.2.ebuild b/www-apps/wordpress/wordpress-1.2.2.ebuild
new file mode 100644
index 000000000000..e749ce40d909
--- /dev/null
+++ b/www-apps/wordpress/wordpress-1.2.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.2.2.ebuild,v 1.1 2004/12/18 23:36:10 stuart Exp $
+# Mostly ripped off from the squirrelmail ebuild!
+# By Peter Westwood <peter.westwood@ftwr.co.uk>
+
+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.2.2.tar.gz
+SRC_URI="http://wordpress.org/latest-1.2.2.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~sparc"
+IUSE=""
+RDEPEND=">=dev-php/mod_php-4.1
+	 >=dev-db/mysql-3.23.23"
+
+DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
+
+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
+
+	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
+
+	for x in `find . -name '*.php' -print ` ; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	done
+
+	# post-install instructions
+	#webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
+
+	# now strut stuff
+	webapp_src_install
+}