ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 6bde73c9cb7476fd8227df435d9e87095aee1070..a79473cceb19686872ae9d4cf0ecf915cf5eb84a 100644 (file)
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.89 2008/02/15 09:35:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.90 2008/02/19 14:26:38 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> wordpress-2.3.3.ebuild:
+  ebuild cleanup wrt #208584
 
 *wordpress-2.3.3 (15 Feb 2008)
 

diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index ef44174537136ef292c5f9d0703921d5415aaea6..5f6fd03e6cfdc33bfee0c798af04734b0cb21545 100644 (file)
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX postinstall-en.txt 1554 RMD160 0ae328c94560e30f9a8d5c46eb449ed1d2861970 SHA1 45c11b94046bfdff98a60571a36e56680d43a2ab SHA256 85ecf09ffd839186f5aeba6847798827191d56c6fb7798783100b9fecdcf64df
 AUX postupgrade-en.txt 1302 RMD160 55353569fb739d38ddaf1f4fb743d5d7bc909323 SHA1 0cd868cc86c1dbef25cf94cd08b5b3e8421545cb SHA256 81ddf9a3970dbaa9f69d514b7eaa5893c8402ca6f973830414e866d5140f3d3e
 DIST wordpress-2.3.3.tar.gz 884898 RMD160 8127ffd2c36a9cb3d437b8ac12d86b1d2ce36d09 SHA1 767747b9fb44714dd71122f5a58dba4c662b3155 SHA256 41d11defc05c97c0f46eff8625ecc7414b0903498c595ff450606317ac200b25
-EBUILD wordpress-2.3.3.ebuild 1517 RMD160 aa4202cc1f5516a922ef685f37610e606db3cb9b SHA1 d7169ca9c2a4fe0b0d217d8be66c354aa9f0ca87 SHA256 790cc8c8d42d753d5b5ff7a25c677e8cd6c6692ab5acc563f77efefb3f4fe2d0
-MISC ChangeLog 14958 RMD160 e3b38fd9d65efedf65c197c8f5cf47c4c8fed307 SHA1 8b90bdb4afdb736539b13baf02ee9edfeeb5aa05 SHA256 e66d526643a6e2df465698a5bffe2a5a7271f08acb62fad66be9aebc6f880702
+EBUILD wordpress-2.3.3.ebuild 1127 RMD160 a33ecbfff74058fd2299fc35505319afdd0321e3 SHA1 313b8950ef0d80cc67423c6e17ab77cbd468d908 SHA256 a9f2eb8bcfd2ad71933c510f96a22b28c3bb604f36c48be376ebd7afb2717371
+MISC ChangeLog 15062 RMD160 799eb80189ab80f3e43b0eba8c6366468d81fab2 SHA1 ca37e0d69debb228b2a7b92eef4a87ed461ddce1 SHA256 923d37f2d22f8b988b5112c1d9f4cd9ca47024152b3af8a1d87209b77e8ff18f
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHtVz9EEcxCpcDQ74RAucrAJ9BTwzT/xblPl3tOkcjpNqIsxjO3gCcDGnR
-dUpar8hdcgo9fSuM72ypCLI=
-=ELCn
+iEYEARECAAYFAke65ycACgkQmPFBzbX68WEZfACfZStyDLAHM25bIUY4yagnUCTv
+7AkAn1MB1stoPsfbIaqIA1eYq9qY4uRG
+=/CS0
 -----END PGP SIGNATURE-----

diff --git a/www-apps/wordpress/wordpress-2.3.3.ebuild b/www-apps/wordpress/wordpress-2.3.3.ebuild
index 02e33cd5f4b2993bf2d1fe217b4955f2fae99886..dfeca978e917b4690ef2c8257ea91527cc9aa9aa 100644 (file)
--- a/www-apps/wordpress/wordpress-2.3.3.ebuild
+++ b/www-apps/wordpress/wordpress-2.3.3.ebuild
@@ -1,56 +1,45 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.3.3.ebuild,v 1.1 2008/02/15 09:35:52 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.3.3.ebuild,v 1.2 2008/02/19 14:26:38 hollow Exp $
 
-inherit webapp eutils depend.php
+inherit webapp depend.php
 
 DESCRIPTION="Wordpress php and mysql based CMS system."
 HOMEPAGE="http://wordpress.org/"
 SRC_URI="http://www.wordpress.org/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="virtual/httpd-cgi"
+RDEPEND=""
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"/${PN}
 
-need_php
+need_php_httpd
 
 pkg_setup() {
        webapp_pkg_setup
-
        require_php_with_any_use mysql mysqli
        require_php_with_use pcre
 }
 
 src_install() {
-       local docs="license.txt readme.html"
-
        webapp_src_preinst
 
-       cp wp-config-sample.php wp-config.php
-       cp -r * "${D}${MY_HTDOCSDIR}"
+       dohtml readme.html
+       rm -f readme.html license.txt
 
-       # handle documentation files
-       #
-       # NOTE that doc files go into /usr/share/doc as normal; they do NOT
-       # get installed per vhost!
+       cp wp-config-sample.php wp-config.php
 
-       dodoc ${docs}
-       for doc in ${docs} INSTALL; do
-               rm -f "${D}${MY_HTDOCSDIR}/${doc}"
-       done
+       insinto "${MY_HTDOCSDIR}"
+       doins -r .
 
-       # Identify files/directory that should be writeable to
-       # the web server
        webapp_serverowned "${MY_HTDOCSDIR}"/index.php
        webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
        webapp_serverowned "${MY_HTDOCSDIR}"
 
-       # Identify the configuration files that this app uses
-       # User may want to make changes to these!
        webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
 
        webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt