merge from webapps overlay wrt #208584

(Portage version: 2.1.4)

3 files changed, 23 insertions, 16 deletions

diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog
index b07589e22dda..ad6ee72e3e6e 100644
--- a/www-apps/metadot/ChangeLog
+++ b/www-apps/metadot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/metadot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.29 2007/07/29 17:30:49 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.30 2008/02/03 17:48:23 hollow Exp $
+
+  03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadot-6.1.6.ebuild,
+  metadot-6.4.5.4.ebuild:
+  merge from webapps overlay wrt #208584
+
+  02 Feb 2008; Jakub Moc <jakub@gentoo.org>
+  metadot-6.1.6.ebuild, metadot-6.4.5.4.ebuild:
+  Remove useless apache dependency already implied by mod_perl wrt Bug 208584;
+  quoting
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> metadot-6.1.6.ebuild,
   metadot-6.4.5.4.ebuild:
diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6.ebuild
index 50b38c856fa3..66ce654460b9 100644
--- a/www-apps/metadot/metadot-6.1.6.ebuild
+++ b/www-apps/metadot/metadot-6.1.6.ebuild
@@ -1,6 +1,6 @@
-# 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/metadot/metadot-6.1.6.ebuild,v 1.15 2007/07/29 17:30:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.1.6.ebuild,v 1.16 2008/02/03 17:48:23 hollow Exp $
 
 inherit webapp
 MY_P=${P/-/}
@@ -15,7 +15,6 @@ SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
 KEYWORDS="~x86 ppc"
 
 RDEPEND="
-	>=www-servers/apache-2.0
 	>=dev-lang/perl-5.005
 	>=www-apache/mod_perl-2.0
 	dev-perl/DBI
@@ -51,8 +50,8 @@ src_install() {
 	dodir ${MY_HOSTROOTDIR}/${PN}
 
 	dodoc CHANGELOG README
-	cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR}
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PVR}.txt
-	webapp_hook_script ${FILESDIR}/reconfig-${PVR}
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PVR}.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-${PVR}
 	webapp_src_install
 }
diff --git a/www-apps/metadot/metadot-6.4.5.4.ebuild b/www-apps/metadot/metadot-6.4.5.4.ebuild
index 87ba59047783..d13ef4be2cab 100644
--- a/www-apps/metadot/metadot-6.4.5.4.ebuild
+++ b/www-apps/metadot/metadot-6.4.5.4.ebuild
@@ -1,6 +1,6 @@
-# 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/metadot/metadot-6.4.5.4.ebuild,v 1.7 2007/07/29 17:30:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.4.5.4.ebuild,v 1.8 2008/02/03 17:48:23 hollow Exp $
 
 inherit webapp
 MY_P="Metadot${PV}"
@@ -17,7 +17,6 @@ KEYWORDS="~x86 ~ppc"
 DEPEND=""
 RDEPEND="
 	>=dev-lang/perl-5.6
-	=www-servers/apache-2*
 	=www-apache/mod_perl-2*
 	dev-perl/DBI
 	>=dev-perl/DBD-mysql-2.1027
@@ -57,16 +56,16 @@ src_install() {
 	webapp_src_preinst
 
 	dodoc CHANGELOG README
-	cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR}
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
 
-	cp ${FILESDIR}/${PN}.conf ${D}/${MY_HOSTROOTDIR}
+	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
 	sed -i "s|Apache::Registry|Modperl::Registry|" \
-		${D}/${MY_HOSTROOTDIR}/${PN}.conf
+		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
 
 	webapp_serverowned ${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-6.4_p3.txt
-	webapp_hook_script ${FILESDIR}/reconfig-6.4_p3
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
 	webapp_src_install
 }