ebuild cleanup wrt #208584

(Portage version: 2.1.4.4)

3 files changed, 33 insertions, 44 deletions

diff --git a/www-apps/dragonflycms/ChangeLog b/www-apps/dragonflycms/ChangeLog
index aa5c66013b9c..70c64a64d6ea 100644
--- a/www-apps/dragonflycms/ChangeLog
+++ b/www-apps/dragonflycms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dragonflycms
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.16 2007/08/15 06:45:13 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.17 2008/02/19 13:13:56 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  dragonflycms-9.1.2.1.ebuild:
+  ebuild cleanup wrt #208584
 
 *dragonflycms-9.1.2.1 (15 Aug 2007)
 
diff --git a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild b/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
index a2454e314a1f..f667d3bf6148 100644
--- a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2007 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/dragonflycms/dragonflycms-9.1.2.1.ebuild,v 1.1 2007/08/15 06:45:13 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild,v 1.2 2008/02/19 13:13:56 hollow Exp $
 
 inherit webapp depend.php
 
 MY_P=Dragonfly${PV}
-DESCRIPTION="CPG Dragonfly CMS is a feature-rich open source content management
-system based off of PHP-Nuke 6.5"
+
+DESCRIPTION="A feature-rich open source content management system based off of PHP-Nuke 6.5"
 HOMEPAGE="http://dragonflycms.org"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-http://dev.gentoo.org/~sejo/files/${MY_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 RESTRICT="fetch"
 
@@ -17,45 +16,32 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE=""
 
-need_php
+need_php_httpd
+
+S="${WORKDIR}"
 
 pkg_nofetch() {
 	einfo "Please download ${MY_P}.tar.bz2 from:"
-	einfo "http://dragonflycms.org/Downloads/get=28.html"
+	einfo "http://dragonflycms.org/Downloads/get=263.html"
 	einfo "and move it to ${DISTDIR}"
 }
 
 src_install() {
-
 	webapp_src_preinst
 
-	#Do the documentation
-	insinto /usr/share/doc/${PF}
-	doins -r ${WORKDIR}/documentation/*
-
-	#installing files where they need to be.
-	einfo "installing php main files"
-	cp -r ${WORKDIR}/public_html/* ${D}${MY_HTDOCSDIR}
-	einfo "Done"
+	dodoc documentation/{BACKUP,IMPORTANT_NOTES,INSTALL,README,UPGRADE}.txt
 
-	#identiy the configuration file the app uses
+	insinto "${MY_HTDOCSDIR}"
+	doins -r public_html/
 
-	webapp_configfile ${MY_HTDOCSDIR}/install/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/install/config.php
 
-	# add the postinstall instructions
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# manually changing the permissions on the directories
-	# if no-suexec then perms should be 777 else 755
-
-	for WS in cpg_error.log includes cache modules/coppermine/albums \
-	          modules/coppermine/albums/userpics uploads/avatars     \
-	          uploads/forums
-	do
-	  webapp_serverowned ${MY_HTDOCSDIR}/${WS}
+	for x in cpg_error.log includes cache modules/coppermine/albums \
+			modules/coppermine/albums/userpics uploads/avatars \
+			uploads/forums; do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
 	done
 
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
-
 }
diff --git a/www-apps/dragonflycms/metadata.xml b/www-apps/dragonflycms/metadata.xml
index f264ddf1ee72..fea7d5fbc77d 100644
--- a/www-apps/dragonflycms/metadata.xml
+++ b/www-apps/dragonflycms/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<longdescription lang="en">
-	CPG Dragonfly CMS is a feature-rich open source content management system
-	based off of PHP-Nuke 6.5
-</longdescription>
-<longdescription lang="nl">
-	CPG Dragonfly CMS is een open source content management system met enorm
-	veel mogelijkheden. Dragonfly is gebaseerd op PHP-Nuke 6.5
-</longdescription>
+	<herd>web-apps</herd>
+	<longdescription lang="en">
+		CPG Dragonfly CMS is a feature-rich open source content management system
+		based off of PHP-Nuke 6.5
+	</longdescription>
+	<longdescription lang="nl">
+		CPG Dragonfly CMS is een open source content management system met enorm
+		veel mogelijkheden. Dragonfly is gebaseerd op PHP-Nuke 6.5
+	</longdescription>
 </pkgmetadata>
-