add support for macros.d/

Package-Manager: portage-2.2_rc25/cvs/Linux i686

5 files changed, 46 insertions, 42 deletions

diff --git a/www-apache/mod_macro/ChangeLog b/www-apache/mod_macro/ChangeLog
index b3ef81233d21..34afeb57738a 100644
--- a/www-apache/mod_macro/ChangeLog
+++ b/www-apache/mod_macro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_macro
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.17 2008/03/22 17:11:40 hollow Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.18 2009/03/24 10:52:47 hollow Exp $
+
+  24 Mar 2009; Benedikt Böhm <hollow@gentoo.org> +files/00_example.conf,
+  files/27_mod_macro.conf, mod_macro-1.1.10.ebuild:
+  add support for macros.d/
 
   22 Mar 2008; Benedikt Böhm <hollow@gentoo.org> mod_macro-1.1.10.ebuild:
   amd64 stable wrt #208556
diff --git a/www-apache/mod_macro/Manifest b/www-apache/mod_macro/Manifest
index dc4d6fa0ae96..98f22f8f5548 100644
--- a/www-apache/mod_macro/Manifest
+++ b/www-apache/mod_macro/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 27_mod_macro.conf 695 RMD160 47cc33e8039fbbf0591f6622d63a95b458c8d209 SHA1 28e136e1fa52b50a4e13dad546df91af60d11130 SHA256 56d6a4f5f3a732631db66de49f6f3379a883fedc937857f51f243dc6ca5f6b52
+AUX 00_example.conf 619 RMD160 242500748a49d3fb604f5e2c88edd599c24fb35e SHA1 f2520c0305e680c3d6342e908e40c1df6bca737f SHA256 d0aca1e5b925d0646c23caac510c17acc4bab3a98618c7792a90dd2863670207
+AUX 27_mod_macro.conf 140 RMD160 7f47e32d05c754e184cd073740e1d2cd5e4c8f6e SHA1 855cbe6cf16b90d5914cb94e14951d7d6bad0d17 SHA256 09d5fa69b530cd40c4713d9688f4083fb28977fc55ec25974458b9a42d783772
 DIST mod_macro-1.1.10.tar.bz2 13517 RMD160 f7da506621f0074d452793d906d3402e47748766 SHA1 64190e39ef1a19105082ddf0e5397ac369843255 SHA256 9ce558d0b182a721a04e5b499ba2684d07c5ba2c7a552d8a844489beb9e339d0
-EBUILD mod_macro-1.1.10.ebuild 619 RMD160 7f0a590ca9e04bd9c5aa8d84a02a5fc6db48697f SHA1 7002193364349fc7dddead37f11a47f5b25d5b70 SHA256 59b524d404142a2a118501b99564ed85bd91e1fafe5d28700199e6939f518fbb
-MISC ChangeLog 2046 RMD160 3496a8b9d6d5664a0e96516c31e06512abf4df41 SHA1 7d19bcb3ef590692bbe1185b7f12ad173ce5a366 SHA256 bb800ce83349be188bde90ca25b4e8593c72f89d919c882faaffb444652dc41a
+EBUILD mod_macro-1.1.10.ebuild 780 RMD160 d191e4cb12d46cda87cff2586c152a2ef3c87948 SHA1 d255f86783e4d121d61344d1a28f1ceb1e1dccd0 SHA256 ce81aeb8279449a12c249c88c71b291b155756f58fcacdc8f8918de43e80d260
+MISC ChangeLog 2201 RMD160 27bb67ea076eab1681635e406ceb72799266a784 SHA1 ad3e8b882042cca7eb120a9249cf7c523f2b801d SHA256 f10b36e722e93c0000ccf3015759c0a4f22100fed5e9465d8ba5df7be290104d
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH5T3VmPFBzbX68WERAthgAJ984d1Typ9IqmRXjz/eNh1REuC0OQCdFT5Y
-Pu3ujD4fJ5u0H6ngtiW1qCA=
-=nq5D
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_macro/files/00_example.conf b/www-apache/mod_macro/files/00_example.conf
new file mode 100644
index 000000000000..5b60e92ca830
--- /dev/null
+++ b/www-apache/mod_macro/files/00_example.conf
@@ -0,0 +1,26 @@
+# Definition of a MyVirtualHost Macro.
+<Macro MyVirtualHost $host $port $dir>
+	Listen $port
+
+	<VirtualHost $host:$port>
+		DocumentRoot $dir
+
+		<Directory $dir>
+			# do something here...
+		</Directory>
+
+		# limit access to intranet subdir.
+		<Directory $dir/intranet>
+			order deny,allow
+			deny from all
+			allow from 10.0.0.0/8
+		</Directory>
+	</VirtualHost>
+</Macro>
+
+# Use of MyVirtualHost with different arguments.
+#Use MyVirtualHost www.apache.org 80 /projects/apache/web
+#Use MyVirtualHost www.perl.com 8080 /projects/perl/web
+#Use MyVirtualHost www.ensmp.fr 1234 /projects/mines/web
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_macro/files/27_mod_macro.conf b/www-apache/mod_macro/files/27_mod_macro.conf
index 3f84f985e4bb..67ce8e4d2688 100644
--- a/www-apache/mod_macro/files/27_mod_macro.conf
+++ b/www-apache/mod_macro/files/27_mod_macro.conf
@@ -1,30 +1,6 @@
 <IfDefine MACRO>
 LoadModule macro_module modules/mod_macro.so
-
-# Definition of a MyVirtualHost Macro.
-<Macro MyVirtualHost $host $port $dir>
-	Listen $port
-	
-	<VirtualHost $host:$port>
-		DocumentRoot $dir
-
-		<Directory $dir>
-			# do something here...
-		</Directory>
-
-		# limit access to intranet subdir.
-		<Directory $dir/intranet>
-			order deny,allow
-			deny from all
-			allow from 10.0.0.0/8
-		</Directory>
-	</VirtualHost>
-</Macro>
-
-# Use of MyVirtualHost with different arguments.
-#Use MyVirtualHost www.apache.org 80 /projects/apache/web
-#Use MyVirtualHost www.perl.com 8080 /projects/perl/web
-#Use MyVirtualHost www.ensmp.fr 1234 /projects/mines/web
+Include /etc/apache2/macros.d/*.conf
 </IfDefine>
 
 # vim: ts=4 filetype=apache
diff --git a/www-apache/mod_macro/mod_macro-1.1.10.ebuild b/www-apache/mod_macro/mod_macro-1.1.10.ebuild
index 008fed8d49ee..411cede4b513 100644
--- a/www-apache/mod_macro/mod_macro-1.1.10.ebuild
+++ b/www-apache/mod_macro/mod_macro-1.1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/mod_macro-1.1.10.ebuild,v 1.3 2008/03/22 17:11:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/mod_macro-1.1.10.ebuild,v 1.4 2009/03/24 10:52:47 hollow Exp $
 
 inherit apache-module
 
@@ -22,3 +22,10 @@ APACHE2_MOD_DEFINE="MACRO"
 DOCFILES="CHANGES INSTALL README mod_macro.html"
 
 need_apache2_2
+
+src_install() {
+	apache-module_src_install
+	keepdir "${APACHE_CONFDIR}"/macros.d/
+	insinto "${APACHE_CONFDIR}"/macros.d/
+	doins "${FILESDIR}"/00_example.conf
+}