apache eclass changes (775a559) - keks-overlay.git

apache eclass changes

Hanno Böck commited on 2009-10-04 17:47:13
Zeige 3 geänderte Dateien mit 112 Einfügungen und 4 Löschungen.

www-servers/apache/Manifest 6c67d82..e3dfc63
www-servers/apache/apache-2.2.13-r1.ebuild 0000000..bdccd19
www-servers/apache/apache-2.2.13.ebuild 3db05a0..4231918

@@ -4,6 +4,7 @@ DIST gentoo-apache-2.2.10-20081025.tar.bz2 60296 RMD160 bc6d9e05a5924cf104e0a07b
 DIST gentoo-apache-2.2.11-20090101.tar.bz2 60721 RMD160 2a2342bcff3778f44ecb148c333da49f71b5ed57 SHA1 6bb963fa73bf2c26d89dc6b808454d1541f103db SHA256 88a24a6e600024386db5cfd704b11cd7a408ba6ef067a2ffe2dc0923993149ca
 DIST gentoo-apache-2.2.12-20090729.tar.bz2 64057 RMD160 b5b3da34571053598c813e87c825d29967394e53 SHA1 f32c29d69888aa64b6460058ef6495f23ca5fbe2 SHA256 c966648a23bdabb6a4608348dfbd6ab4056d0fa1ef71f543d20794e288260520
 DIST gentoo-apache-2.2.13-20090826.tar.bz2 64063 RMD160 38a00f52ff7798b535afe41a069f02670ccb83e3 SHA1 298e21c8244c71f222331921a64ca07eb13cecff SHA256 1d129b6111437029197b5bb5c2cab9ae11ef250640d278aafff16464f689d4f1
+DIST gentoo-apache-2.2.13-r1-20090920.tar.bz2 63767 RMD160 452af532b651c72d4ee265861738869344235cec SHA1 1a052d549005e3e76d6535d5ea09f7af20b3e93e SHA256 48212f91ec6d4a7e5c9f5e78da35ea8e97c9a3faddd8a165bccc5d5658360d32
 DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40
 DIST gentoo-apache-2.2.9-20080615.tar.bz2 60183 RMD160 924b6268324aa679b5ff624ece159dad323028aa SHA1 6c8e053a33a561df2417e718803b65f7ac55b640 SHA256 c3bb95e339d7bdfdcd3bd71927287843df0d34ad2740ddc7913cbb0200fc8072
 DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383
@@ -15,6 +16,7 @@ DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a
 EBUILD apache-2.2.10.ebuild 2845 RMD160 cc94372a6c8e59b9e184458ec3a6b8ab0dae4fae SHA1 5d2cd9424f57027d4bf38ba165dd0656795aa6a4 SHA256 ffd992a0c1e2d952aa6bf710ecc1d0b751b27b30e829bf644f9949aa71c5d0a7
 EBUILD apache-2.2.11.ebuild 2817 RMD160 a8fbf9c307b914c60d1664d984b0c07569bf9f40 SHA1 0e8111b5e721db073f8b355e109e48a0013aabb7 SHA256 6356b6252a75b9ea9a1be4b05dfbb072f4a68a12f7052bc8f1c29f6f0f0bcb2f
 EBUILD apache-2.2.12.ebuild 2576 RMD160 ecdbee41d9343fd3876556c4e2b0983bcc0629d1 SHA1 d47e9f14413cdcded5e5a8ddf1aff1fcc3400f29 SHA256 ca521ec82bebad9a5cc13ac25933cdcdd2543f842432a8d2407a8eda4d8cdcbb
-EBUILD apache-2.2.13.ebuild 2576 RMD160 67e572c52e482ba31f25d2fd59129ceaefbfd760 SHA1 4823bf002d409a871aeefec74296b6af64c990dd SHA256 5551511b9b9cc957784061fba702bd1871f374a9b5d3a70b4f066bfc6c138ea7
+EBUILD apache-2.2.13-r1.ebuild 2581 RMD160 1edc8fc12ce275e1682a3e678d60a1a35bd7d826 SHA1 6f1139489fb8e333d51221eb0d4bf0cf6c0bf624 SHA256 42ae7db04a987450d026c286462b27b0cc04ec48c27994a75f48d3934747ddfd
+EBUILD apache-2.2.13.ebuild 2580 RMD160 bd9bda9465e6c81268754510585579266480f4a3 SHA1 2d6afeb653c0b007e65c1b79e8904a2082cf8fbd SHA256 54ef1cca62df1c8f36f12ce7cd22b3316b8203dabe973073824bcf0383e2c295
 EBUILD apache-2.2.8-r3.ebuild 5288 RMD160 096b8185d25c485fd2bd13c09de9de8b5e11dcc8 SHA1 5aff0c23059bb10346c1b2988f496becc28f3a19 SHA256 2cb835468f5968a42b86924909b50cdbd9e0c4e24f0fe30e8c547d82fe49e97a
 EBUILD apache-2.2.9.ebuild 2812 RMD160 91b5a44a2db30a6d85e3302bfe9dc16bfcbaf045 SHA1 764bb36273e23745f2ba2cb6a36184096c650f12 SHA256 1302cc772b0404fd65eb9ea7a970558ecc8b0861049a07e122dc95387d45b6e4

www-servers/apache/apache-2.2.13-r1.ebuild

Zeige Datei @ 775a559

...	...	@@ -0,0 +1,104 @@
	1	+# Copyright 1999-2009 Gentoo Foundation
	2	+# Distributed under the terms of the GNU General Public License v2
	3	+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.13-r1.ebuild,v 1.1 2009/09/20 08:37:34 hollow Exp $
	4	+
	5	+# latest gentoo apache files
	6	+GENTOO_PATCHSTAMP="20090920"
	7	+GENTOO_DEVELOPER="hollow"
	8	+
	9	+# IUSE/USE_EXPAND magic
	10	+IUSE_MPMS_FORK="itk peruser prefork"
	11	+IUSE_MPMS_THREAD="event worker"
	12	+
	13	+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
	14	+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
	15	+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
	16	+charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
	17	+ext_filter file_cache filter headers ident imagemap include info log_config
	18	+log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
	19	+proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
	20	+status substitute unique_id userdir usertrack version vhost_alias"
	21	+
	22	+# inter-module dependencies
	23	+# TODO: this may still be incomplete
	24	+MODULE_DEPENDS="
	25	+ dav_fs:dav
	26	+ dav_lock:dav
	27	+ deflate:filter
	28	+ disk_cache:cache
	29	+ ext_filter:filter
	30	+ file_cache:cache
	31	+ log_forensic:log_config
	32	+ logio:log_config
	33	+ mem_cache:cache
	34	+ mime_magic:mime
	35	+ proxy_ajp:proxy
	36	+ proxy_balancer:proxy
	37	+ proxy_connect:proxy
	38	+ proxy_ftp:proxy
	39	+ proxy_http:proxy
	40	+ substitute:filter
	41	+"
	42	+
	43	+# module<->define mappings
	44	+MODULE_DEFINES="
	45	+ auth_digest:AUTH_DIGEST
	46	+ authnz_ldap:AUTHNZ_LDAP
	47	+ cache:CACHE
	48	+ dav:DAV
	49	+ dav_fs:DAV
	50	+ dav_lock:DAV
	51	+ disk_cache:CACHE
	52	+ file_cache:CACHE
	53	+ info:INFO
	54	+ ldap:LDAP
	55	+ mem_cache:CACHE
	56	+ proxy:PROXY
	57	+ proxy_ajp:PROXY
	58	+ proxy_balancer:PROXY
	59	+ proxy_connect:PROXY
	60	+ proxy_ftp:PROXY
	61	+ proxy_http:PROXY
	62	+ ssl:SSL
	63	+ status:STATUS
	64	+ suexec:SUEXEC
	65	+ userdir:USERDIR
	66	+"
	67	+
	68	+# critical modules for the default config
	69	+MODULE_CRITICAL="
	70	+ authz_host
	71	+ dir
	72	+ mime
	73	+"
	74	+
	75	+inherit apache-2
	76	+
	77	+DESCRIPTION="The Apache Web Server."
	78	+HOMEPAGE="http://httpd.apache.org/"
	79	+
	80	+# some helper scripts are Apache-1.1, thus both are here
	81	+LICENSE="Apache-2.0 Apache-1.1"
	82	+SLOT="2"
	83	+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
	84	+IUSE="peruser_dc"
	85	+
	86	+DEPEND="${DEPEND}
	87	+ apache2_modules_deflate? ( sys-libs/zlib )"
	88	+
	89	+RDEPEND="${RDEPEND}
	90	+ apache2_modules_mime? ( app-misc/mime-types )"
	91	+
	92	+src_prepare() {
	93	+ if use peruser_dc ; then
	94	+ if ! use apache2_mpms_peruser ; then
	95	+ die "USE=peruser_dc requires APACHE2_MPMS=peruser"
	96	+ fi
	97	+ else
	98	+ EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.patch"
	99	+ fi
	100	+
	101	+ apache-2_src_prepare
	102	+ cd "${S}"
	103	+ epatch "${FILESDIR}/apache-noip.diff"
	104	+}

www-servers/apache/apache-2.2.13.ebuild

Zeige Datei @ 775a559

@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.13.ebuild,v 1.1 2009/08/26 08:15:30 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.13.ebuild,v 1.2 2009/09/20 08:37:34 hollow Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20090826"
@@ -89,7 +89,7 @@ DEPEND="${DEPEND}
 RDEPEND="${RDEPEND}
 	apache2_modules_mime? ( app-misc/mime-types )"
 
-src_unpack() {
+src_prepare() {
 	if use peruser_dc ; then
 		if ! use apache2_mpms_peruser ; then
 			die "USE=peruser_dc requires APACHE2_MPMS=peruser"
@@ -98,7 +98,9 @@ src_unpack() {
 		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.patch"
 	fi
 
-	apache-2_src_unpack
+	apache-2_src_prepare
+
 	cd "${S}"
 	epatch "${FILESDIR}/apache-noip.diff"
+
 }


...	...	@@ -4,6 +4,7 @@ DIST gentoo-apache-2.2.10-20081025.tar.bz2 60296 RMD160 bc6d9e05a5924cf104e0a07b
4	4	DIST gentoo-apache-2.2.11-20090101.tar.bz2 60721 RMD160 2a2342bcff3778f44ecb148c333da49f71b5ed57 SHA1 6bb963fa73bf2c26d89dc6b808454d1541f103db SHA256 88a24a6e600024386db5cfd704b11cd7a408ba6ef067a2ffe2dc0923993149ca
5	5	DIST gentoo-apache-2.2.12-20090729.tar.bz2 64057 RMD160 b5b3da34571053598c813e87c825d29967394e53 SHA1 f32c29d69888aa64b6460058ef6495f23ca5fbe2 SHA256 c966648a23bdabb6a4608348dfbd6ab4056d0fa1ef71f543d20794e288260520
6	6	DIST gentoo-apache-2.2.13-20090826.tar.bz2 64063 RMD160 38a00f52ff7798b535afe41a069f02670ccb83e3 SHA1 298e21c8244c71f222331921a64ca07eb13cecff SHA256 1d129b6111437029197b5bb5c2cab9ae11ef250640d278aafff16464f689d4f1
	7	+DIST gentoo-apache-2.2.13-r1-20090920.tar.bz2 63767 RMD160 452af532b651c72d4ee265861738869344235cec SHA1 1a052d549005e3e76d6535d5ea09f7af20b3e93e SHA256 48212f91ec6d4a7e5c9f5e78da35ea8e97c9a3faddd8a165bccc5d5658360d32
7	8	DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40
8	9	DIST gentoo-apache-2.2.9-20080615.tar.bz2 60183 RMD160 924b6268324aa679b5ff624ece159dad323028aa SHA1 6c8e053a33a561df2417e718803b65f7ac55b640 SHA256 c3bb95e339d7bdfdcd3bd71927287843df0d34ad2740ddc7913cbb0200fc8072
9	10	DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383
...	...	@@ -15,6 +16,7 @@ DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a
15	16	EBUILD apache-2.2.10.ebuild 2845 RMD160 cc94372a6c8e59b9e184458ec3a6b8ab0dae4fae SHA1 5d2cd9424f57027d4bf38ba165dd0656795aa6a4 SHA256 ffd992a0c1e2d952aa6bf710ecc1d0b751b27b30e829bf644f9949aa71c5d0a7
16	17	EBUILD apache-2.2.11.ebuild 2817 RMD160 a8fbf9c307b914c60d1664d984b0c07569bf9f40 SHA1 0e8111b5e721db073f8b355e109e48a0013aabb7 SHA256 6356b6252a75b9ea9a1be4b05dfbb072f4a68a12f7052bc8f1c29f6f0f0bcb2f
17	18	EBUILD apache-2.2.12.ebuild 2576 RMD160 ecdbee41d9343fd3876556c4e2b0983bcc0629d1 SHA1 d47e9f14413cdcded5e5a8ddf1aff1fcc3400f29 SHA256 ca521ec82bebad9a5cc13ac25933cdcdd2543f842432a8d2407a8eda4d8cdcbb
18		-EBUILD apache-2.2.13.ebuild 2576 RMD160 67e572c52e482ba31f25d2fd59129ceaefbfd760 SHA1 4823bf002d409a871aeefec74296b6af64c990dd SHA256 5551511b9b9cc957784061fba702bd1871f374a9b5d3a70b4f066bfc6c138ea7
	19	+EBUILD apache-2.2.13-r1.ebuild 2581 RMD160 1edc8fc12ce275e1682a3e678d60a1a35bd7d826 SHA1 6f1139489fb8e333d51221eb0d4bf0cf6c0bf624 SHA256 42ae7db04a987450d026c286462b27b0cc04ec48c27994a75f48d3934747ddfd
	20	+EBUILD apache-2.2.13.ebuild 2580 RMD160 bd9bda9465e6c81268754510585579266480f4a3 SHA1 2d6afeb653c0b007e65c1b79e8904a2082cf8fbd SHA256 54ef1cca62df1c8f36f12ce7cd22b3316b8203dabe973073824bcf0383e2c295
19	21	EBUILD apache-2.2.8-r3.ebuild 5288 RMD160 096b8185d25c485fd2bd13c09de9de8b5e11dcc8 SHA1 5aff0c23059bb10346c1b2988f496becc28f3a19 SHA256 2cb835468f5968a42b86924909b50cdbd9e0c4e24f0fe30e8c547d82fe49e97a
20	22	EBUILD apache-2.2.9.ebuild 2812 RMD160 91b5a44a2db30a6d85e3302bfe9dc16bfcbaf045 SHA1 764bb36273e23745f2ba2cb6a36184096c650f12 SHA256 1302cc772b0404fd65eb9ea7a970558ecc8b0861049a07e122dc95387d45b6e4

...	...	@@ -1,6 +1,6 @@
1	1	# Copyright 1999-2009 Gentoo Foundation
2	2	# Distributed under the terms of the GNU General Public License v2
3		-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.13.ebuild,v 1.1 2009/08/26 08:15:30 hollow Exp $
	3	+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.13.ebuild,v 1.2 2009/09/20 08:37:34 hollow Exp $
4	4
5	5	# latest gentoo apache files
6	6	GENTOO_PATCHSTAMP="20090826"
...	...	@@ -89,7 +89,7 @@ DEPEND="${DEPEND}
89	89	RDEPEND="${RDEPEND}
90	90	apache2_modules_mime? ( app-misc/mime-types )"
91	91
92		-src_unpack() {
	92	+src_prepare() {
93	93	if use peruser_dc ; then
94	94	if ! use apache2_mpms_peruser ; then
95	95	die "USE=peruser_dc requires APACHE2_MPMS=peruser"
...	...	@@ -98,7 +98,9 @@ src_unpack() {
98	98	EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.patch"
99	99	fi
100	100
101		- apache-2_src_unpack
	101	+ apache-2_src_prepare
	102	+
102	103	cd "${S}"
103	104	epatch "${FILESDIR}/apache-noip.diff"
	105	+
104	106	}
105	107