merge from webapps overlay wrt #208584

Package-Manager: portage-2.1.4

3 files changed, 43 insertions, 14 deletions

diff --git a/www-apps/xoops/ChangeLog b/www-apps/xoops/ChangeLog
index a9a7f1b016d5..aa69a82c593b 100644
--- a/www-apps/xoops/ChangeLog
+++ b/www-apps/xoops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/xoops
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.16 2007/07/29 17:42:53 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.17 2008/02/04 08:38:19 hollow Exp $
+
+  04 Feb 2008; Benedikt Böhm <hollow@gentoo.org> xoops-2.2.4.ebuild:
+  merge from webapps overlay wrt #208584
+
+  02 Feb 2008; Jakub Moc <jakub@gentoo.org> xoops-2.2.4.ebuild:
+  Remove apache dependency wrt Bug 208584, check for required PHP features.
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> xoops-2.2.4.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to
diff --git a/www-apps/xoops/Manifest b/www-apps/xoops/Manifest
index 6eec55e65650..f43b0f8e4c15 100644
--- a/www-apps/xoops/Manifest
+++ b/www-apps/xoops/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 404 RMD160 1f74e17cd04932d0f0704c8e9bb033b0254d3389 SHA1 689f250d47f242c55c24987594138ead37207b56 SHA256 422e88526f90423c8e4595382823360c4e27931496f75b16182142d32ae1bf2e
 DIST xoops-2.2.3a-Final.tar.gz 1208937 RMD160 9b2bc8b3f67f5bae63a5b12e8f5d7efa459de21e SHA1 9e53432c7a65008b3751bf70f889082ff5c03366 SHA256 c0f7f814c22230c5371b52bdcd10cae150b9075da0437fe9a523b0a543b90116
 DIST xoops-2.2.3a-to-2.2.4.tgz 167789 RMD160 7726191dda777c5f8652c172e0b97f1dc980135b SHA1 4694a79b7ad31963d0c70b6a73fb784476bc5289 SHA256 9b2462e87405b03596f9a97bea9c1bef0bf0c9ad785354967a81deefd0f2632f
-EBUILD xoops-2.2.4.ebuild 1332 RMD160 aefda404e94028b7155254f28bdc0a5f8780744a SHA1 f0a8126cf77329dd17d65be5f1c59293d7b813ea SHA256 436c3eeaf5b79e0c5c6411e8d4a826fb17ecce69bf2689e61a8418411b1c362e
-MISC ChangeLog 2675 RMD160 61737306e218302927849f9687d8e663fe852034 SHA1 8b6a20fb215153b00fde7fa26b6fbf667811c933 SHA256 6dded0e9b67ee67708e14559c7b867c8650b61bed41caa70dd5dcab6a46b0dad
+EBUILD xoops-2.2.4.ebuild 1596 RMD160 60f26e23619e6a38a6ae97ae3debc4dc4a5d89ea SHA1 36f0211a89c143589bb96a286423688e8a96825e SHA256 874debfb5079ea1b5fbb3b22f29ceb2006add5416251fad88e2e8a55f1b631fa
+MISC ChangeLog 2928 RMD160 df152b3ada75f7cea2d9141c70044d633d26f682 SHA1 89c4fee79fc6f8720af1a1ae44d15d437819c93f SHA256 ba86453f0e96126f6a2b2d8e4e20290e408a367eff567f9f55f52ee3cfd9046f
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkemzwAACgkQmPFBzbX68WEYyACfQ1HMgnzBG6DLiEIg7pdza4UL
+so4AnR2TbGnEqx2xGceYJrFGveO8M+Do
+=32zF
+-----END PGP SIGNATURE-----
diff --git a/www-apps/xoops/xoops-2.2.4.ebuild b/www-apps/xoops/xoops-2.2.4.ebuild
index dac064365115..83beab37be22 100644
--- a/www-apps/xoops/xoops-2.2.4.ebuild
+++ b/www-apps/xoops/xoops-2.2.4.ebuild
@@ -1,10 +1,11 @@
-# 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/xoops/xoops-2.2.4.ebuild,v 1.5 2007/07/29 17:42:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.2.4.ebuild,v 1.6 2008/02/04 08:38:19 hollow Exp $
 
-inherit webapp
+inherit webapp depend.php
 
-DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source Content Management System, including various portal features and supplemental modules."
+DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source
+Content Management System, including various portal features and supplemental modules."
 HOMEPAGE="http://www.xoops.org/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-2.2.3a-Final.tar.gz
 mirror://sourceforge/${PN}/xoops-2.2.3a-to-2.2.4.tgz"
@@ -15,28 +16,40 @@ S=${WORKDIR}
 
 IUSE=""
 
-RDEPEND="virtual/php
-	www-servers/apache"
+RDEPEND="virtual/httpd-cgi"
+need_php
+
+pkg_setup() {
+	if ! PHPCHECKNODIE="yes" require_php_with_use mysql || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use apache2 cgi ; then
+			die "Re-install ${PHP_PKG} with mysql and at least one of apache2 or cgi flags."
+	fi
+	webapp_pkg_setup
+}
 
 src_unpack() {
-	unpack ${A} && cd ${S}
+	unpack ${A}
+	cd "${S}"
 	cp -f xoops-2.2.3a-to-2.2.4/docs/* docs/ || die
 	cp -Rf xoops-2.2.3a-to-2.2.4/html/* html/ || die
 }
 
 src_install() {
 	webapp_src_preinst
+
 	dodir ${MY_HOSTROOTDIR}/${PF}
 	dodoc docs/changelog.txt
 	dohtml docs/INSTALL.html docs/UPDATE.html
-	cp -R docs/images ${D}/usr/share/doc/${PF}/html
 
+	cp -R docs/images "${D}"/usr/share/doc/${PF}/html
 	cp -pPR html/* "${D}/${MY_HTDOCSDIR}"
-	cp -pPR extras/* ${D}/${MY_HOSTROOTDIR}/${PF}
+	cp -pPR extras/* "${D}"/${MY_HOSTROOTDIR}/${PF}
+
 	webapp_serverowned ${MY_HTDOCSDIR}/uploads
 	webapp_serverowned ${MY_HTDOCSDIR}/cache
 	webapp_serverowned ${MY_HTDOCSDIR}/templates_c
 	webapp_configfile ${MY_HTDOCSDIR}/mainfile.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
 	webapp_src_install
 }