ebuild cleanup wrt #208584; fix metadata

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/phpmp/ChangeLog b/www-apps/phpmp/ChangeLog
index c690f9c888d660c9f1e332491415b1c09b0bc75e..735d58b2f16e34920f03a2c8856625ac927f4207 100644 (file)
--- a/www-apps/phpmp/ChangeLog
+++ b/www-apps/phpmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/phpmp
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/ChangeLog,v 1.8 2006/10/20 02:09:57 rl03 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/ChangeLog,v 1.9 2008/02/23 21:48:05 hollow Exp $
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  phpmp-0.11.0.ebuild:
+  ebuild cleanup wrt #208584; fix metadata
 
   20 Oct 2006; Renat Lumpau <rl03@gentoo.org> phpmp-0.11.0.ebuild:
   PHP needs PCRE. Bug #152008.

diff --git a/www-apps/phpmp/Manifest b/www-apps/phpmp/Manifest
index ebbde984d107cd7fd75fd26f794461000d86733a..118380a417f0bd6198e265a01946b4163d907784 100644 (file)
--- a/www-apps/phpmp/Manifest
+++ b/www-apps/phpmp/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 33 RMD160 efe4c0fe002dce8f29cb94269d0d0c6b01fa6d89 SHA1 5cd6e61f35ea434e36720c9dd6922585dff9cc67 SHA256 c5c688eb7c8da48d82cc9fd5e062e7f02880b58f7d293b4af97c23d5884974da
 DIST phpMp-0.11.0.tar.gz 20886 RMD160 8653637e3ee62d610bd567f03a693bc2a2132572 SHA1 3e33c5adada49fe98e99816b7a98f0bd674cc18d SHA256 7f2a168632839f2c476275a1cff41ea3295b9ebbe85e4e3cc691609258ab0103
-EBUILD phpmp-0.11.0.ebuild 925 RMD160 e00a37a6be7f7e3f8b314d57cd2d6499f3888f8b SHA1 91a7fbfc68559341198bedce69d2d16dee4d8a01 SHA256 6c12e68291dc482f073233c6fec924f92e6cd206c6c9c469d6712a31af4589e8
-MISC ChangeLog 3603 RMD160 f38a050b09a38f9c613c03c976b8245677a9fdfa SHA1 59c7c60b5a76b5b670d353f9c99abb8a32a7f995 SHA256 9f6fb83e55ab0c52b4f28db3f5cc3a5947d4865f29816db84c0b19e0e198906b
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+EBUILD phpmp-0.11.0.ebuild 911 RMD160 a5aeb2edf78c4c2ce321ea9372b9c4f116a4b1fa SHA1 232feef37d8bad3c881a7d49a9cedf8efe99f262 SHA256 f44560b4bd925586517a419f83ff69038427d20cb6ff13f78c09b69074e338f3
+MISC ChangeLog 3736 RMD160 bc51a2bf1ec710135530e21c866d1c84d9b2df18 SHA1 cc70230ac58d1a59632f334062449a3e394b4ad4 SHA256 2de8576707a02cf3a674af50f7bd3ceedaeb274a336b4f92746598500230013f
+MISC metadata.xml 182 RMD160 f121060fc0777f54374cc64e0d01770d05321160 SHA1 cdaef086f42613a5045fb4fefe26014cba751743 SHA256 9ce6753b72b54984257022c46dab69ae15abb20f62d2a0e57a15ce47a5a0492d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAlJ0ACgkQmPFBzbX68WFxKgCgkN6NKLUMbuGup1IvWbfkhIGF
+Kx8AnRj6v3KcatYMM5Otuk1lLQuRu1Nh
+=Hk70
+-----END PGP SIGNATURE-----

diff --git a/www-apps/phpmp/metadata.xml b/www-apps/phpmp/metadata.xml
index e1774e3d9ad71fcd59b25ed8c584d61740a2d118..03c577947dd7769f0d90ae5dbb04c0f24a0802cf 100644 (file)
--- a/www-apps/phpmp/metadata.xml
+++ b/www-apps/phpmp/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+       <herd>sound</herd>
+       <herd>web-apps</herd>
 </pkgmetadata>

diff --git a/www-apps/phpmp/phpmp-0.11.0.ebuild b/www-apps/phpmp/phpmp-0.11.0.ebuild
index a32f9334a51653391788916646674ccd03eb3033..65b1eefbc2152f16b4b86119065b11c279d7f2db 100644 (file)
--- a/www-apps/phpmp/phpmp-0.11.0.ebuild
+++ b/www-apps/phpmp/phpmp-0.11.0.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/phpmp-0.11.0.ebuild,v 1.7 2007/07/13 06:13:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/phpmp-0.11.0.ebuild,v 1.8 2008/02/23 21:48:05 hollow Exp $
 
 inherit webapp depend.php
 
 MY_PN="phpMp"
 MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="phpMp is a client program for Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org/"
 SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ~ppc sparc x86 ~x86-fbsd"
-
 IUSE=""
 
-need_php
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
        webapp_pkg_setup
@@ -26,18 +28,14 @@ pkg_setup() {
 src_install() {
        webapp_src_preinst
 
-       local docs="COPYING ChangeLog INSTALL README TODO"
-
-       dodoc ${docs}
-       for doc in ${docs} INSTALL; do
-                       rm -f ${doc}
-       done
-
-       cp -r . ${D}${MY_HTDOCSDIR}
+       dodoc ChangeLog README TODO
+       rm -f ChangeLog COPYING INSTALL README TODO
 
-       webapp_configfile ${MY_HTDOCSDIR}/config.php
+       insinto "${MY_HTDOCSDIR}"
+       doins -r .
 
-       webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+       webapp_configfile "${MY_HTDOCSDIR}"/config.php
 
+       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
        webapp_src_install
 }