Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 114232 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-www/apache/apache-2.2.4.ebuild (-4 / +8 lines)
Lines 13-26 Link Here
13
DESCRIPTION="The Apache Web Server."
13
DESCRIPTION="The Apache Web Server."
14
HOMEPAGE="http://httpd.apache.org/"
14
HOMEPAGE="http://httpd.apache.org/"
15
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
15
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
16
		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
16
		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
17
		http://home.samfundet.no/~sesse/mpm-itk/apache2.2-mpm-itk-20061030-01.patch"
17
18
18
# some helper scripts are apache-1.1, thus both are here
19
# some helper scripts are apache-1.1, thus both are here
19
LICENSE="Apache-2.0 Apache-1.1"
20
LICENSE="Apache-2.0 Apache-1.1"
20
21
21
SLOT="2"
22
SLOT="2"
22
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
23
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
23
IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"
24
IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker mpm-itk no-suexec selinux ssl static-modules threads"
24
25
25
DEPEND="app-misc/mime-types
26
DEPEND="app-misc/mime-types
26
		dev-lang/perl
27
		dev-lang/perl
Lines 31-37 Link Here
31
		sys-libs/zlib
32
		sys-libs/zlib
32
		ldap? ( =net-nds/openldap-2* )
33
		ldap? ( =net-nds/openldap-2* )
33
		selinux? ( sec-policy/selinux-apache )
34
		selinux? ( sec-policy/selinux-apache )
34
		ssl? ( dev-libs/openssl )"
35
		ssl? ( dev-libs/openssl )
36
		mpm-itk? ( sys-libs/libcap )"
35
RDEPEND="${DEPEND}"
37
RDEPEND="${DEPEND}"
36
38
37
S="${WORKDIR}/httpd-${PV}"
39
S="${WORKDIR}/httpd-${PV}"
Lines 45-51 Link Here
45
	fi
47
	fi
46
48
47
	# select our MPM
49
	# select our MPM
48
	MPM_LIST="event peruser prefork worker"
50
	MPM_LIST="event peruser prefork worker itk"
49
	for x in ${MPM_LIST} ; do
51
	for x in ${MPM_LIST} ; do
50
		if use mpm-${x} ; then
52
		if use mpm-${x} ; then
51
			if [[ "x${mpm}" == "x" ]] ; then
53
			if [[ "x${mpm}" == "x" ]] ; then
Lines 104-109 Link Here
104
		epatch "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_*
106
		epatch "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_*
105
	fi
107
	fi
106
108
109
	use mpm-itk && epatch ${DISTDIR}/apache2.2-mpm-itk-20061030-01.patch
110
107
	# avoid utf-8 charset problems
111
	# avoid utf-8 charset problems
108
	export LC_CTYPE=C
112
	export LC_CTYPE=C
109
113

Return to bug 114232