[gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog

[Lars Wendler (polynomial-c)]

polynomial-c    14/05/22 13:58:46

  Modified:             apache-2.eclass ChangeLog
  Log:
  Eclass cleanup. Now requires >=EAPI-4 ebuilds. Fixed bugs #509922 and #503640

Revision  Changes    Path
1.36                 eclass/apache-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.35&r2=1.36

Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apache-2.eclass	12 Feb 2014 00:03:21 -0000	1.35
+++ apache-2.eclass	22 May 2014 13:58:46 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.35 2014/02/12 00:03:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.36 2014/05/22 13:58:46 polynomial-c Exp $
 
 # @ECLASS: apache-2.eclass
 # @MAINTAINER:
@@ -10,7 +10,28 @@
 # This eclass handles apache-2.x ebuild functions such as LoadModule generation
 # and inter-module dependency checking.
 
-inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs
+inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs versionator
+
+[[ ${CATEGORY}/${PN} != www-servers/apache ]] \
+	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
+
+case ${EAPI:-0} in
+	0|1|2|3)
+		die "This eclass requires >=EAPI-4"
+	;;
+esac
+
+# settings which are version specific go in here:
+case $(get_version_component_range 1-2) in
+	2.4)
+		DEFAULT_MPM_THREADED="event" #509922
+		RDEPEND=">=dev-libs/apr-1.5.1" #492578
+	;;
+	*)
+		DEFAULT_MPM_THREADED="worker"
+		RDEPEND=">=dev-libs/apr-1.4.5" #368651
+	;;
+esac
 
 # ==============================================================================
 # INTERNAL VARIABLES
@@ -81,11 +102,13 @@
 	=dev-libs/apr-1*
 	=dev-libs/apr-util-1*[ldap?]
 	dev-libs/libpcre
+	apache2_modules_deflate? ( sys-libs/zlib )
+	apache2_modules_mime? ( app-misc/mime-types )
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
-	ssl? ( >=dev-libs/openssl-0.9.8f )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
 	!=www-servers/apache-1*"
-RDEPEND="${DEPEND}"
+RDEPEND+=" ${DEPEND}"
 PDEPEND="~app-admin/apache-tools-${PV}"
 
 S="${WORKDIR}/httpd-${PV}"
@@ -121,7 +144,7 @@
 
 	if [[ -z "${MY_MPM}" ]] ; then
 		if use threads ; then
-			MY_MPM=worker
+			MY_MPM=${DEFAULT_MPM_THREADED}
 			elog
 			elog "Selected default threaded MPM: ${MY_MPM}"
 			elog
@@ -229,17 +252,17 @@
 	MY_CONF="--enable-so=static"
 
 	if use ldap ; then
-		MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
-		MY_MODS="${MY_MODS} ldap authnz_ldap"
+		MY_CONF+=" --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
+		MY_MODS+=" ldap authnz_ldap"
 	else
-		MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
+		MY_CONF+=" --disable-authnz_ldap --disable-ldap"
 	fi
 
 	if use ssl ; then
-		MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
-		MY_MODS="${MY_MODS} ssl"
+		MY_CONF+=" --with-ssl=/usr --enable-ssl=${mod_type}"
+		MY_MODS+=" ssl"
 	else
-		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
+		MY_CONF+=" --without-ssl --disable-ssl"
 	fi
 
 	if use suexec ; then
@@ -256,27 +279,27 @@
 		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"
 		elog
 
-		MY_CONF="${MY_CONF} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
-		MY_CONF="${MY_CONF} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
-		MY_CONF="${MY_CONF} --with-suexec-bin=/usr/sbin/suexec"
-		MY_CONF="${MY_CONF} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
-		MY_CONF="${MY_CONF} --with-suexec-caller=${SUEXEC_CALLER:-apache}"
-		MY_CONF="${MY_CONF} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
-		MY_CONF="${MY_CONF} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
-		MY_CONF="${MY_CONF} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
-		MY_CONF="${MY_CONF} --with-suexec-umask=${SUEXEC_UMASK:-077}"
-		MY_CONF="${MY_CONF} --enable-suexec=${mod_type}"
-		MY_MODS="${MY_MODS} suexec"
+		MY_CONF+=" --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
+		MY_CONF+=" --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
+		MY_CONF+=" --with-suexec-bin=/usr/sbin/suexec"
+		MY_CONF+=" --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
+		MY_CONF+=" --with-suexec-caller=${SUEXEC_CALLER:-apache}"
+		MY_CONF+=" --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
+		MY_CONF+=" --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
+		MY_CONF+=" --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
+		MY_CONF+=" --with-suexec-umask=${SUEXEC_UMASK:-077}"
+		MY_CONF+=" --enable-suexec=${mod_type}"
+		MY_MODS+=" suexec"
 	else
-		MY_CONF="${MY_CONF} --disable-suexec"
+		MY_CONF+=" --disable-suexec"
 	fi
 
 	for x in ${IUSE_MODULES} ; do
 		if use apache2_modules_${x} ; then
-			MY_CONF="${MY_CONF} --enable-${x}=${mod_type}"
-			MY_MODS="${MY_MODS} ${x}"
+			MY_CONF+=" --enable-${x}=${mod_type}"
+			MY_MODS+=" ${x}"
 		else
-			MY_CONF="${MY_CONF} --disable-${x}"
+			MY_CONF+=" --disable-${x}"
 		fi
 	done
 
@@ -368,7 +391,7 @@
 	setup_modules
 
 	if use debug; then
-		MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
+		MY_CONF+=" --enable-maintainer-mode --enable-exception-hook"
 	fi
 
 	elog "Please note that you need SysV IPC support in your kernel."
@@ -522,7 +545,7 @@
 	fi
 
 	# provide legacy symlink for apxs, bug 177697
-	dosym /usr/sbin/apxs /usr/sbin/apxs2
+	dosym apxs /usr/sbin/apxs2
 
 	# install some documentation
 	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
@@ -531,6 +554,7 @@
 	# drop in a convenient link to the manual
 	if use doc ; then
 		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
+		docompress -x /usr/share/doc/${PF}/manual # 503640
 	else
 		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
 		rm -Rf "${D}/usr/share/doc/${PF}/manual"



1.1262               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1262&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1262&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1261&r2=1.1262

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1261
retrieving revision 1.1262
diff -u -r1.1261 -r1.1262
--- ChangeLog	21 May 2014 21:30:26 -0000	1.1261
+++ ChangeLog	22 May 2014 13:58:46 -0000	1.1262
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1261 2014/05/21 21:30:26 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1262 2014/05/22 13:58:46 polynomial-c Exp $
+
+  22 May 2014; Lars Wendler <polynomial-c@g.o> apache-2.eclass:
+  Eclass cleanup. Now requires >=EAPI-4 ebuilds. Fixed bugs #509922 and
+  #503640.
 
   21 May 2014; Ryan Hill <rhill@g.o> toolchain.eclass:
   Bug #499774, take 2.