| 1 |
ottxor 14/07/27 21:07:07 |
| 2 |
|
| 3 |
Modified: apache-2.4.10.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Added prefix support (bug #433736) |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-servers/apache/apache-2.4.10.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: apache-2.4.10.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- apache-2.4.10.ebuild 24 Jul 2014 02:30:58 -0000 1.1 |
| 23 |
+++ apache-2.4.10.ebuild 27 Jul 2014 21:07:07 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v 1.1 2014/07/24 02:30:58 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v 1.2 2014/07/27 21:07:07 ottxor Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -122,7 +122,7 @@ |
| 33 |
# some helper scripts are Apache-1.1, thus both are here |
| 34 |
LICENSE="Apache-2.0 Apache-1.1" |
| 35 |
SLOT="2" |
| 36 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 37 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" |
| 38 |
IUSE="" |
| 39 |
|
| 40 |
pkg_setup() { |
| 41 |
@@ -157,25 +157,25 @@ |
| 42 |
src_install() { |
| 43 |
apache-2_src_install |
| 44 |
for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |
| 45 |
- rm "${D}"/$i || die "Failed to prune apache-tools bits" |
| 46 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
| 47 |
done |
| 48 |
for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do |
| 49 |
- rm "${D}"/$i || die "Failed to prune apache-tools bits" |
| 50 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
| 51 |
done |
| 52 |
for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do |
| 53 |
- rm "${D}"/$i || die "Failed to prune apache-tools bits" |
| 54 |
+ rm "${ED}"/$i || die "Failed to prune apache-tools bits" |
| 55 |
done |
| 56 |
for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do |
| 57 |
- rm "${D}/"$i || die "Failed to prune apache-tools bits" |
| 58 |
+ rm "${ED}/"$i || die "Failed to prune apache-tools bits" |
| 59 |
done |
| 60 |
|
| 61 |
# install apxs in /usr/bin (bug #502384) and put a symlink into the |
| 62 |
# old location until all ebuilds and eclasses have been modified to |
| 63 |
# use the new location. |
| 64 |
local apxs="/usr/bin/apxs" |
| 65 |
- cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs" |
| 66 |
- ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die |
| 67 |
- chmod 0755 "${D}"${apxs} || die |
| 68 |
+ cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs" |
| 69 |
+ ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die |
| 70 |
+ chmod 0755 "${ED}"${apxs} || die |
| 71 |
|
| 72 |
# Note: wait for mod_systemd to be included in the next release, |
| 73 |
# then apache2.4.service can be used and systemd support controlled |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.278 www-servers/apache/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.278&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.278&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.277&r2=1.278 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
| 86 |
retrieving revision 1.277 |
| 87 |
retrieving revision 1.278 |
| 88 |
diff -u -r1.277 -r1.278 |
| 89 |
--- ChangeLog 24 Jul 2014 02:30:58 -0000 1.277 |
| 90 |
+++ ChangeLog 27 Jul 2014 21:07:07 -0000 1.278 |
| 91 |
@@ -1,6 +1,9 @@ |
| 92 |
# ChangeLog for www-servers/apache |
| 93 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.277 2014/07/24 02:30:58 patrick Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.278 2014/07/27 21:07:07 ottxor Exp $ |
| 96 |
+ |
| 97 |
+ 27 Jul 2014; Christoph Junghans <ottxor@g.o> apache-2.4.10.ebuild: |
| 98 |
+ Added prefix support (bug #433736) |
| 99 |
|
| 100 |
*apache-2.4.10 (24 Jul 2014) |
Archives