Attachment #144212 for bug #208584




# ------------------------------------------------------------------------

SLOT="${PVR}"

need_httpd() {
	DEPEND="|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi )"
}

need_httpd_cgi() {
	DEPEND="|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
}

need_httpd_fastcgi() {
	DEPEND="virtual/httpd-fastcgi"
}

if [[ -z ${WEBAPP_OPTIONAL} ]] ; then
	IUSE="vhosts"
	DEPEND="${DEPEND}
		>=app-admin/webapp-config-1.50.15"
	need_httpd
fi

RDEPEND="${DEPEND}"

EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm

Return to bug 208584

Lines 23-30 Link Here

(-)/usr/portage/eclass/webapp.eclass (-2 / +20 lines)
23	# ------------------------------------------------------------------------	23	# ------------------------------------------------------------------------
24		24
25	SLOT="${PVR}"	25	SLOT="${PVR}"
26	IUSE="vhosts"	26
27	DEPEND=">=app-admin/webapp-config-1.50.15"	27	need_httpd() {
		28	DEPEND="\|\| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi )"
		29	}
		30
		31	need_httpd_cgi() {
		32	DEPEND="\|\| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
		33	}
		34
		35	need_httpd_fastcgi() {
		36	DEPEND="virtual/httpd-fastcgi"
		37	}
		38
		39	if [[ -z ${WEBAPP_OPTIONAL} ]] ; then
		40	IUSE="vhosts"
		41	DEPEND="${DEPEND}
		42	>=app-admin/webapp-config-1.50.15"
		43	need_httpd
		44	fi
		45
28	RDEPEND="${DEPEND}"	46	RDEPEND="${DEPEND}"
29		47
30	EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm	48	EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm