--- /usr/portage/net-www/apache/apache-2.2.4.ebuild 2007-01-28 21:06:17.000000000 +0100 +++ apache-2.2.4.ebuild 2007-02-14 09:56:10.000000000 +0100 @@ -13,14 +13,15 @@ DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org/" SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 - http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" + http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2 + http://home.samfundet.no/~sesse/mpm-itk/apache2.2-mpm-itk-20061030-01.patch" # some helper scripts are apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads" +IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker mpm-itk no-suexec selinux ssl static-modules threads" DEPEND="app-misc/mime-types dev-lang/perl @@ -31,7 +32,8 @@ sys-libs/zlib ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) - ssl? ( dev-libs/openssl )" + ssl? ( dev-libs/openssl ) + mpm-itk? ( sys-libs/libcap )" RDEPEND="${DEPEND}" S="${WORKDIR}/httpd-${PV}" @@ -45,7 +47,7 @@ fi # select our MPM - MPM_LIST="event peruser prefork worker" + MPM_LIST="event peruser prefork worker itk" for x in ${MPM_LIST} ; do if use mpm-${x} ; then if [[ "x${mpm}" == "x" ]] ; then @@ -104,6 +106,8 @@ epatch "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_* fi + use mpm-itk && epatch ${DISTDIR}/apache2.2-mpm-itk-20061030-01.patch + # avoid utf-8 charset problems export LC_CTYPE=C