[gentoo-commits] gentoo-x86 commit in www-servers/apache: ChangeLog apache-2.4.4-r3.ebuild

[Fabio Erculiani (lxnay)]

lxnay       13/05/21 15:19:08

  Modified:             ChangeLog apache-2.4.4-r3.ebuild
  Log:
  drop mod_systemd patch for now, since it requires more work in apache-2.eclass, it will be available anyway in the next release, fix bug #470774
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)

Revision  Changes    Path
1.231                www-servers/apache/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.231&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.231&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.230&r2=1.231

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- ChangeLog	20 May 2013 08:58:01 -0000	1.230
+++ ChangeLog	21 May 2013 15:19:08 -0000	1.231
@@ -1,6 +1,11 @@
 # 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.230 2013/05/20 08:58:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.231 2013/05/21 15:19:08 lxnay Exp $
+
+  21 May 2013; Fabio Erculiani <lxnay@g.o> apache-2.4.4-r3.ebuild:
+  drop mod_systemd patch for now, since it requires more work in
+  apache-2.eclass, it will be available anyway in the next release, fix bug
+  #470774
 
 *apache-2.2.24-r1 (20 May 2013)
 



1.4                  www-servers/apache/apache-2.4.4-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?r1=1.3&r2=1.4

Index: apache-2.4.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache-2.4.4-r3.ebuild	20 May 2013 08:58:01 -0000	1.3
+++ apache-2.4.4-r3.ebuild	21 May 2013 15:19:08 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.3 2013/05/20 08:58:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.4 2013/05/21 15:19:08 lxnay Exp $
 
 EAPI="2"
 
@@ -146,10 +146,6 @@
 	fi
 	apache-2_src_prepare
 	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
-
-	# mod_systemd support, merged upstream already:
-	# http://svn.apache.org/viewvc?view=revision&revision=1393976
-	epatch "${FILESDIR}/httpd-2.4.3-mod_systemd.patch"
 }
 
 src_install() {
@@ -176,7 +172,10 @@
 		dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex"
 	fi
 
-	systemd_newunit "${FILESDIR}/apache2.4.service" "apache2.service"
+	# Note: wait for mod_systemd to be included in the next release,
+	# then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
 	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
 	insinto /etc/apache2/modules.d
 	doins "${FILESDIR}/00_systemd.conf"