[gentoo-commits] gentoo-x86 commit in www-apache/mod_h2: mod_h2-0.6.4.ebuild mod_h2-9999.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in www-apache/mod_h2: mod_h2-0.6.4.ebuild mod_h2-9999.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      15/06/10 11:30:27

  Modified:             mod_h2-9999.ebuild ChangeLog
  Added:                mod_h2-0.6.4.ebuild
  Log:
  Version bump.  Require apache use either mpm_worker or mpm_event per upstream docs.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.3                  www-apache/mod_h2/mod_h2-9999.ebuild

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

Index: mod_h2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_h2-9999.ebuild	1 Jun 2015 06:08:55 -0000	1.2
+++ mod_h2-9999.ebuild	10 Jun 2015 11:30:27 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.2 2015/06/01 06:08:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.3 2015/06/10 11:30:27 vapier Exp $
 
 EAPI="5"
 
@@ -25,6 +25,16 @@
 	ssl? ( www-servers/apache[alpn] )"
 DEPEND="${RDEPEND}"
 
+# The mpm_prefork module doesn't work right.  See upstream docs.
+# The threads logic is to handle the default eclass behavior which selects a
+# default mpm via the USE=threads flag.
+RDEPEND+="
+	|| (
+		www-servers/apache[apache2_mpms_worker]
+		www-servers/apache[apache2_mpms_event]
+		www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser]
+	)"
+
 need_apache2_4
 
 src_configure() {



1.5                  www-apache/mod_h2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	1 Jun 2015 14:40:41 -0000	1.4
+++ ChangeLog	10 Jun 2015 11:30:27 -0000	1.5
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_h2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.4 2015/06/01 14:40:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.5 2015/06/10 11:30:27 vapier Exp $
+
+*mod_h2-0.6.4 (10 Jun 2015)
+
+  10 Jun 2015; Mike Frysinger <vapier@gentoo.org> +mod_h2-0.6.4.ebuild,
+  mod_h2-9999.ebuild:
+  Version bump.  Require apache use either mpm_worker or mpm_event per upstream
+  docs.
 
 *mod_h2-0.6.3 (01 Jun 2015)
 



1.1                  www-apache/mod_h2/mod_h2-0.6.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_h2/mod_h2-0.6.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_h2/mod_h2-0.6.4.ebuild?rev=1.1&content-type=text/plain

Index: mod_h2-0.6.4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-0.6.4.ebuild,v 1.1 2015/06/10 11:30:27 vapier Exp $

EAPI="5"

inherit apache-module

if [[ ${PV} == 9999 ]] ; then
	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
	inherit git-2
else
	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"
	KEYWORDS="~amd64 ~x86"
fi

DESCRIPTION="HTTP/2 module for Apache"
HOMEPAGE="https://github.com/icing/mod_h2"

LICENSE="Apache-2.0"
SLOT="0"
IUSE="ssl"

RDEPEND="=net-libs/nghttp2-0.7*
	ssl? ( www-servers/apache[alpn] )"
DEPEND="${RDEPEND}"

# The mpm_prefork module doesn't work right.  See upstream docs.
# The threads logic is to handle the default eclass behavior which selects a
# default mpm via the USE=threads flag.
RDEPEND+="
	|| (
		www-servers/apache[apache2_mpms_worker]
		www-servers/apache[apache2_mpms_event]
		www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser]
	)"

need_apache2_4

src_configure() {
	econf \
		--docdir='$(datarootdir)'/doc/${PF} \
		--disable-werror \
		--disable-sandbox
}

src_compile() {
	default
}

src_install() {
	default

	APACHE2_MOD_DEFINE="HTTP2"
	insinto "${APACHE_MODULES_CONFDIR}"
	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
}