Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/
Date: Mon, 23 Oct 2017 15:31:12
Message-Id: 1508772657.c5ade0843ccd9f9e01a9bf99265f50fd2b12e8f7.polynomial-c@gentoo
1 commit: c5ade0843ccd9f9e01a9bf99265f50fd2b12e8f7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 23 14:35:14 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 23 15:30:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ade084
7
8 www-servers/apache: Removed old.
9
10 Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12 www-servers/apache/Manifest | 2 -
13 www-servers/apache/apache-2.2.31-r1.ebuild | 118 -----------------------------
14 2 files changed, 120 deletions(-)
15
16 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
17 index 2a8f138b27f..f68eb21eda4 100644
18 --- a/www-servers/apache/Manifest
19 +++ b/www-servers/apache/Manifest
20 @@ -1,8 +1,6 @@
21 -DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
22 DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 SHA256 27a1755e3cee4bf4976fd3ed7aeb55db7ad3c0076ae2081ae626d4133c91aac2 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a WHIRLPOOL 4480bc9ff7a7291eacdc4a8c77e12e58c48f8e1c87ed164a4af42dbdaceebd554343384291723310cbf20d8d0660817f59aa72e7cf541283a142d9f1b3fa58c2
23 DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 SHA256 d81e32d876594b48a7ff6d9123bf776c5bea5453eddd2fe40f4a9b79c11537aa SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d WHIRLPOOL fb61224b2104e611237e1d09eb4dfb3d2b8f023348c9622f7f19434b6b77d63786c41af17a300d994c14d983676f3753ab6fa52f7a7fcd07b9cea3d7eeacc9b9
24 DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 SHA256 10c7404707508ce91ce59974f55fe4368ee153b299f697441f703dab1aefd17a SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8 WHIRLPOOL 143092df671320d353bb8221fe62351f5f70262fa5e83cad6904633bcbbd177810717f297081d59e3e3a37e2cb42a004c0575fb55d52e0d1ae7197768b96aef8
25 -DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
26 DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd
27 DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba
28 DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed
29
30 diff --git a/www-servers/apache/apache-2.2.31-r1.ebuild b/www-servers/apache/apache-2.2.31-r1.ebuild
31 deleted file mode 100644
32 index 7aa6f4ad3c0..00000000000
33 --- a/www-servers/apache/apache-2.2.31-r1.ebuild
34 +++ /dev/null
35 @@ -1,118 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -# latest gentoo apache files
42 -GENTOO_PATCHSTAMP="20140922"
43 -GENTOO_DEVELOPER="polynomial-c"
44 -GENTOO_PATCHNAME="gentoo-apache-2.2.29"
45 -
46 -# IUSE/USE_EXPAND magic
47 -IUSE_MPMS_FORK="itk peruser prefork"
48 -IUSE_MPMS_THREAD="event worker"
49 -
50 -IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
51 -authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
52 -authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
53 -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
54 -env expires ext_filter file_cache filter headers ident imagemap include info
55 -log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
56 -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
57 -reqtimeout setenvif speling status substitute unique_id userdir usertrack
58 -version vhost_alias"
59 -# The following are also in the source as of this version, but are not available
60 -# for user selection:
61 -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
62 -# optional_fn_import optional_hook_export optional_hook_import
63 -
64 -# inter-module dependencies
65 -# TODO: this may still be incomplete
66 -MODULE_DEPENDS="
67 - dav_fs:dav
68 - dav_lock:dav
69 - deflate:filter
70 - disk_cache:cache
71 - ext_filter:filter
72 - file_cache:cache
73 - log_forensic:log_config
74 - logio:log_config
75 - mem_cache:cache
76 - mime_magic:mime
77 - proxy_ajp:proxy
78 - proxy_balancer:proxy
79 - proxy_connect:proxy
80 - proxy_ftp:proxy
81 - proxy_http:proxy
82 - proxy_scgi:proxy
83 - substitute:filter
84 -"
85 -
86 -# module<->define mappings
87 -MODULE_DEFINES="
88 - auth_digest:AUTH_DIGEST
89 - authnz_ldap:AUTHNZ_LDAP
90 - cache:CACHE
91 - dav:DAV
92 - dav_fs:DAV
93 - dav_lock:DAV
94 - disk_cache:CACHE
95 - file_cache:CACHE
96 - info:INFO
97 - ldap:LDAP
98 - mem_cache:CACHE
99 - proxy:PROXY
100 - proxy_ajp:PROXY
101 - proxy_balancer:PROXY
102 - proxy_connect:PROXY
103 - proxy_ftp:PROXY
104 - proxy_http:PROXY
105 - ssl:SSL
106 - status:STATUS
107 - suexec:SUEXEC
108 - userdir:USERDIR
109 -"
110 -
111 -# critical modules for the default config
112 -MODULE_CRITICAL="
113 - authz_host
114 - dir
115 - mime
116 -"
117 -
118 -inherit apache-2 systemd toolchain-funcs
119 -
120 -DESCRIPTION="The Apache Web Server"
121 -HOMEPAGE="https://httpd.apache.org/"
122 -
123 -# some helper scripts are Apache-1.1, thus both are here
124 -LICENSE="Apache-2.0 Apache-1.1"
125 -SLOT="2"
126 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
127 -IUSE=""
128 -
129 -PATCHES=(
130 - "${FILESDIR}/${PN}-asf-httpoxy.patch"
131 -)
132 -
133 -src_configure() {
134 - # Brain dead check.
135 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
136 -
137 - apache-2_src_configure
138 -}
139 -
140 -src_install() {
141 - apache-2_src_install
142 -
143 - # install apxs in /usr/bin (bug #502384) and put a symlink into the
144 - # old location until all ebuilds and eclasses have been modified to
145 - # use the new location.
146 - local apxs_dir="/usr/bin"
147 - dodir ${apxs_dir}
148 - mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
149 - ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
150 -
151 - systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
152 - systemd_dotmpfilesd "${FILESDIR}/apache.conf"
153 -}