diff options
author | 2013-03-05 12:13:40 +0000 | |
---|---|---|
committer | 2013-03-05 12:13:40 +0000 | |
commit | 52e94a98ff639ca029c12c6aa4fe8701d4cef73c (patch) | |
tree | 9b6e10a9db98358c7528faaa18e36cff1c643949 | |
parent | Removed older ebuilds. EAPI bump (diff) | |
download | gentoo-2-52e94a98ff639ca029c12c6aa4fe8701d4cef73c.tar.gz gentoo-2-52e94a98ff639ca029c12c6aa4fe8701d4cef73c.tar.bz2 gentoo-2-52e94a98ff639ca029c12c6aa4fe8701d4cef73c.zip |
Remove old
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 7194459F)
-rw-r--r-- | www-servers/apache/ChangeLog | 6 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.22-r1.ebuild | 110 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.23.ebuild | 110 | ||||
-rw-r--r-- | www-servers/apache/apache-2.4.3.ebuild | 212 |
4 files changed, 5 insertions, 433 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index ddab58caf114..56658fb6e88b 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/apache # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.223 2013/03/05 09:52:06 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.224 2013/03/05 12:13:40 ago Exp $ + + 05 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -apache-2.2.22-r1.ebuild, + -apache-2.2.23.ebuild, -apache-2.4.3.ebuild: + Remove old 05 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org> apache-2.4.4.ebuild: QA: Return ebuild to ~arch. diff --git a/www-servers/apache/apache-2.2.22-r1.ebuild b/www-servers/apache/apache-2.2.22-r1.ebuild deleted file mode 100644 index 98785ab73a8b..000000000000 --- a/www-servers/apache/apache-2.2.22-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.22-r1.ebuild,v 1.2 2012/05/12 18:12:05 aballier Exp $ - -EAPI="2" - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20120213" -GENTOO_DEVELOPER="jmbsvicetto" -GENTOO_PATCHNAME="gentoo-apache-2.2.22" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="itk peruser prefork" -IUSE_MPMS_THREAD="event worker" - -IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon -authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default -authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio -env expires ext_filter file_cache filter headers ident imagemap include info -log_config log_forensic logio mem_cache mime mime_magic negotiation proxy -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite -reqtimeout setenvif speling status substitute unique_id userdir usertrack -version vhost_alias" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - dav_fs:dav - dav_lock:dav - deflate:filter - disk_cache:cache - ext_filter:filter - file_cache:cache - log_forensic:log_config - logio:log_config - mem_cache:cache - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_connect:proxy - proxy_ftp:proxy - proxy_http:proxy - proxy_scgi:proxy - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - disk_cache:CACHE - file_cache:CACHE - info:INFO - ldap:LDAP - mem_cache:CACHE - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_http:PROXY - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authz_host - dir - mime -" - -inherit apache-2 - -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org/" - -# 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="${DEPEND} - >=dev-libs/openssl-0.9.8m - apache2_modules_deflate? ( sys-libs/zlib )" - -# dependency on >=dev-libs/apr-1.4.5 for bug #368651 -RDEPEND="${RDEPEND} - >=dev-libs/apr-1.4.5 - >=dev-libs/openssl-0.9.8m - apache2_modules_mime? ( app-misc/mime-types )" - -# init script fixup - should be rolled into next tarball #389965 -src_prepare() { - apache-2_src_prepare - sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" - cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix" -} diff --git a/www-servers/apache/apache-2.2.23.ebuild b/www-servers/apache/apache-2.2.23.ebuild deleted file mode 100644 index fbd6e05a0a2c..000000000000 --- a/www-servers/apache/apache-2.2.23.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.23.ebuild,v 1.7 2012/10/20 16:36:13 armin76 Exp $ - -EAPI="2" - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20121012" -GENTOO_DEVELOPER="patrick" -#GENTOO_PATCHNAME="gentoo-apache-2.2.22" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="itk peruser prefork" -IUSE_MPMS_THREAD="event worker" - -IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon -authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default -authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio -env expires ext_filter file_cache filter headers ident imagemap include info -log_config log_forensic logio mem_cache mime mime_magic negotiation proxy -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite -reqtimeout setenvif speling status substitute unique_id userdir usertrack -version vhost_alias" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - dav_fs:dav - dav_lock:dav - deflate:filter - disk_cache:cache - ext_filter:filter - file_cache:cache - log_forensic:log_config - logio:log_config - mem_cache:cache - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_connect:proxy - proxy_ftp:proxy - proxy_http:proxy - proxy_scgi:proxy - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - disk_cache:CACHE - file_cache:CACHE - info:INFO - ldap:LDAP - mem_cache:CACHE - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_http:PROXY - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authz_host - dir - mime -" - -inherit apache-2 - -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org/" - -# 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="${DEPEND} - >=dev-libs/openssl-0.9.8m - apache2_modules_deflate? ( sys-libs/zlib )" - -# dependency on >=dev-libs/apr-1.4.5 for bug #368651 -RDEPEND="${RDEPEND} - >=dev-libs/apr-1.4.5 - >=dev-libs/openssl-0.9.8m - apache2_modules_mime? ( app-misc/mime-types )" - -# init script fixup - should be rolled into next tarball #389965 -src_prepare() { - apache-2_src_prepare - sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" - cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix" -} diff --git a/www-servers/apache/apache-2.4.3.ebuild b/www-servers/apache/apache-2.4.3.ebuild deleted file mode 100644 index 9a2309852bc8..000000000000 --- a/www-servers/apache/apache-2.4.3.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.3.ebuild,v 1.2 2012/10/13 03:13:09 mr_bones_ Exp $ - -EAPI="2" - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20121012" -GENTOO_DEVELOPER="patrick" -#GENTOO_PATCHNAME="gentoo-apache-2.4.1" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="itk peruser prefork" -IUSE_MPMS_THREAD="event worker" - -# << obsolete modules: -# authn_default authz_default mem_cache -# mem_cache is replaced by cache_disk -# ?? buggy modules -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found -# >> added modules for reason: -# compat: compatibility with 2.2 access control -# authz_host: new module for access control -# authn_core: functionality provided by authn_alias in previous versions -# authz_core: new module, provides core authorization capabilities -# cache_disk: replacement for mem_cache -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). -# socache_shmcb: shared object cache provider. Default config with ssl needs it -# unixd: fixes startup error: Invalid command 'User' -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon -authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm -authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio -env expires ext_filter file_cache filter headers ident imagemap include info -lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat -log_config log_forensic logio mime mime_magic negotiation proxy -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite -reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack -unixd version vhost_alias" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - dav_fs:dav - dav_lock:dav - deflate:filter - cache_disk:cache - ext_filter:filter - file_cache:cache - lbmethod_byrequests:proxy_balancer - lbmethod_byrequests:slotmem_shm - lbmethod_bytraffic:proxy_balancer - lbmethod_bybusyness:proxy_balancer - lbmethod_heartbeat:proxy_balancer - log_forensic:log_config - logio:log_config - cache_disk:cache - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_connect:proxy - proxy_ftp:proxy - proxy_http:proxy - proxy_scgi:proxy - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - cache_disk:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - file_cache:CACHE - info:INFO - ldap:LDAP - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_http:PROXY - socache_shmcb:SSL - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authn_core - authz_core - authz_host - dir - mime - unixd -" -# dependend criticals -use ssl && MODULE_CRITICAL+=" socache_shmcb" -use doc && MODULE_CRITICAL+=" alias negotiation setenvif" - -inherit eutils apache-2 - -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org/" - -# 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 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="${DEPEND} - >=dev-libs/openssl-0.9.8m - apache2_modules_deflate? ( sys-libs/zlib )" - -# dependency on >=dev-libs/apr-1.4.5 for bug #368651 -RDEPEND="${RDEPEND} - >=dev-libs/apr-1.4.5 - >=dev-libs/openssl-0.9.8m - apache2_modules_mime? ( app-misc/mime-types )" - -# init script fixup - should be rolled into next tarball #389965 -src_prepare() { - # the following patch can be removed once it is included in - # GENTOO_PATCHNAME="gentoo-apache-2.4.1" ... - if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then - cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}" - epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \ - || die "epatch failed" - cd "${S}" || die "Failed to cd to ${S}" - fi - apache-2_src_prepare - sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" -} - -src_install() { - apache-2_src_install - for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do - rm "${D}/"$i || die "Failed to prune apache-tools bits" - done - - # well, actually installing things makes them more installed, I guess? - cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs" - chmod 0755 "${D}"/usr/sbin/apxs - - # create dir defined in 40_mod_ssl.conf - if use ssl; then - dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex" - fi -} - -pkg_postinst() -{ - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" - # warnings that default config might not work out of the box - for mod in $MODULE_CRITICAL; do - if ! use "apache2_modules_${mod}"; then - echo - ewarn "Warning: Critical module not installed!" - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" - ewarn "are highly recomended but might not be in the base profile yet." - ewarn "Default config for ssl needs module 'socache_shmcb'." - ewarn "Enabling the following flags is highly recommended:" - for cmod in $MODULE_CRITICAL; do - use "apache2_modules_${cmod}" || \ - ewarn "+ apache2_modules_${cmod}" - done - echo - break - fi - done - # warning for proxy_balancer and missing load balancing scheduler - if use apache2_modules_proxy_balancer; then - local lbset= - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do - if use "apache2_modules_${mod}"; then - lbset=1 && break - fi - done - if [ ! $lbset ]; then - echo - ewarn "Info: Missing load balancing scheduler algorithm module" - ewarn "(They were split off from proxy_balancer in 2.3)" - ewarn "In order to get the ability of load balancing, at least" - ewarn "one of these modules has to be present:" - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" - echo - fi - fi -} |