ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

4 files changed, 46 insertions, 47 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/Manifest b/www-apps/dragonflycms/Manifest
index 86a87f1fb23a..0d3f92551202 100644
--- a/www-apps/dragonflycms/Manifest
+++ b/www-apps/dragonflycms/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 826 RMD160 c3eb5b5b0c28e8efd1901f37bee026ae1eb00804 SHA1 410ae02e2b882424011122a0dcb104d50a19811c SHA256 7482db56b00602f3b55fc7a214e3988ade65c4055b4db9bd926c7f6c287ce439
 DIST Dragonfly9.1.2.1.tar.bz2 1433301 RMD160 81d84bc9175d954c75576344ef45468d487ce5c6 SHA1 f5512fb806c3261bc6aff775e1534c38aa179985 SHA256 0544ad79ec8d035ed4c436eeca265195e0af152ec0c9f3fde1d7af9efaf087f5
-EBUILD dragonflycms-9.1.2.1.ebuild 1603 RMD160 3c68991297ef29c2b7442de141cc8a7daefe59ab SHA1 816ad9d7c54f134c34d969f13ae972de3ab3fea6 SHA256 809a782e9f0ea0abef43846d2cc15062ce46c2c7b33367acf87337aa13876a46
-MISC ChangeLog 2499 RMD160 356c2aa94a2eb64743e0dda6f11aba2e75408514 SHA1 53cc2e43dd8e83f02e554d93f36d85083d88982f SHA256 22621e07dcac4acdc601fda507975a7b0a212d65646817d6ddfa9ed789d0eed7
-MISC metadata.xml 492 RMD160 30864a73fce217b9917954c13f1d85e60b2c6019 SHA1 a03db376fd30cf0b5d1d9503432afcf6701bb24a SHA256 447652e25112797522484edebafb542c84c8438d96a5961b95030d38d00f5465
+EBUILD dragonflycms-9.1.2.1.ebuild 1235 RMD160 0fa68317d61255b22c2f83d8ae779ee1be234aaa SHA1 2fffb8c165283b55fa597aa63d70a930a058b9f8 SHA256 1c5edc637c836d744eb18914c4229f864f0ac6226dc7cf5aeb68830675312346
+MISC ChangeLog 2624 RMD160 5470b1db85242876be050ab15b54b86f81528420 SHA1 e2174536af57a2d702377094278bf405126d0dd5 SHA256 56e13b7f866d6d0581c9abfb622fa9acc191e579677ab585a8b2e08f2908ccd8
+MISC metadata.xml 500 RMD160 fc35a4871a65227eb6cb50a3d86ff46883ca460f SHA1 3959911b92d1736a6a0ca48a93606f3f135cc318 SHA256 4be57cf2c31d5212f3fae4d87a0f2d693462aebcce0b6cc97e29ea67430fe664
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke61kkACgkQmPFBzbX68WEUWwCeIQOun0BJtdgVZ4kgEn2WPe1J
+L8UAnjgn6/qn3fgdIbEDB+49m9ZjWpv8
+=XG3t
+-----END PGP SIGNATURE-----
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>
-