ottxor 14/07/27 21:07:07 Modified: apache-2.4.10.ebuild ChangeLog Log: Added prefix support (bug #433736) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.2 www-servers/apache/apache-2.4.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild?r1=1.1&r2=1.2 Index: apache-2.4.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apache-2.4.10.ebuild 24 Jul 2014 02:30:58 -0000 1.1 +++ apache-2.4.10.ebuild 27 Jul 2014 21:07:07 -0000 1.2 @@ -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/www-servers/apache/apache-2.4.10.ebuild,v 1.1 2014/07/24 02:30:58 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.10.ebuild,v 1.2 2014/07/27 21:07:07 ottxor Exp $ EAPI=5 @@ -122,7 +122,7 @@ # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +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" IUSE="" pkg_setup() { @@ -157,25 +157,25 @@ 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" + rm "${ED}"/$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" + rm "${ED}"/$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" + rm "${ED}"/$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" + rm "${ED}/"$i || die "Failed to prune apache-tools bits" done # install apxs in /usr/bin (bug #502384) and put a symlink into the # old location until all ebuilds and eclasses have been modified to # use the new location. local apxs="/usr/bin/apxs" - cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs" - ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die - chmod 0755 "${D}"${apxs} || die + cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs" + ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die + chmod 0755 "${ED}"${apxs} || die # Note: wait for mod_systemd to be included in the next release, # then apache2.4.service can be used and systemd support controlled 1.278 www-servers/apache/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.278&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.278&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.277&r2=1.278 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- ChangeLog 24 Jul 2014 02:30:58 -0000 1.277 +++ ChangeLog 27 Jul 2014 21:07:07 -0000 1.278 @@ -1,6 +1,9 @@ # ChangeLog for www-servers/apache # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.277 2014/07/24 02:30:58 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.278 2014/07/27 21:07:07 ottxor Exp $ + + 27 Jul 2014; Christoph Junghans <[email protected]> apache-2.4.10.ebuild: + Added prefix support (bug #433736) *apache-2.4.10 (24 Jul 2014)
