Fix the Makefile to use the proper location for our builddir (/usr/local/apache2 vs. /usr/$(get_libdir)/apache2), thanks to Samir M. Nassar <bugzilla at steamedpenguin.com> in #179597.

Package-Manager: portage-2.1.2.7

3 files changed, 22 insertions, 14 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index 84708f9a7ab5..7e6252a7f97f 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_fcgid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.28 2007/05/23 20:12:11 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.29 2007/05/24 20:14:16 phreak Exp $
+
+  24 May 2007; Christian Heim <phreak@gentoo.org> mod_fcgid-2.1-r1.ebuild:
+  Fix the Makefile to use the proper location for our builddir
+  (/usr/local/apache2 vs. /usr/$(get_libdir)/apache2), thanks to Samir M.
+  Nassar <bugzilla at steamedpenguin.com> in #179597.
 
 *mod_fcgid-2.1-r1 (23 May 2007)
 
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index bf6e18e5d9b0..69e79b176942 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -24,14 +24,14 @@ EBUILD mod_fcgid-2.0.ebuild 941 RMD160 9d3e744de350acc25de0f77a49937a7d5554eae8
 MD5 fe346b671f71d842a2295fa1148f8e1b mod_fcgid-2.0.ebuild 941
 RMD160 9d3e744de350acc25de0f77a49937a7d5554eae8 mod_fcgid-2.0.ebuild 941
 SHA256 5057ff5a53826bbd96c10c458a2169396be9f4682bcd11b69b18bf2bd077452a mod_fcgid-2.0.ebuild 941
-EBUILD mod_fcgid-2.1-r1.ebuild 1290 RMD160 f21a5a8a53e6b205e81a6f67b30984e8c99ea656 SHA1 90b8a4af9dcb97e04f4f2e245f959d7b4fe33d33 SHA256 551f32b3511f5505550f3c4ca412a5567b89fa9946b4c8bec254e97a6d20e151
-MD5 d011814a70e86543c79e3c2a6c3ebc2c mod_fcgid-2.1-r1.ebuild 1290
-RMD160 f21a5a8a53e6b205e81a6f67b30984e8c99ea656 mod_fcgid-2.1-r1.ebuild 1290
-SHA256 551f32b3511f5505550f3c4ca412a5567b89fa9946b4c8bec254e97a6d20e151 mod_fcgid-2.1-r1.ebuild 1290
-MISC ChangeLog 5250 RMD160 10e0e4fd70b522611742a2d6864573ffbe0280f6 SHA1 891234284b44d1082016dad1ae3bd4326cbddcd2 SHA256 3961ce6e5ed70bf9fd6d4ad25e50977818875bc489200c02322ffae85a07d683
-MD5 5bac689b6b99045115bc9e712cd96ef2 ChangeLog 5250
-RMD160 10e0e4fd70b522611742a2d6864573ffbe0280f6 ChangeLog 5250
-SHA256 3961ce6e5ed70bf9fd6d4ad25e50977818875bc489200c02322ffae85a07d683 ChangeLog 5250
+EBUILD mod_fcgid-2.1-r1.ebuild 1443 RMD160 e5cbf8f15a0b6151cff5faf280b9f78f8e958c10 SHA1 c067d831576de6b1b5a8b81a7805b7ccd2d92822 SHA256 5c2d9818e1911b4204ad19216fe1263ba373944139f10fed2119fe52bdad21ec
+MD5 79537b1a83bfeadf09bb833e8cde16f2 mod_fcgid-2.1-r1.ebuild 1443
+RMD160 e5cbf8f15a0b6151cff5faf280b9f78f8e958c10 mod_fcgid-2.1-r1.ebuild 1443
+SHA256 5c2d9818e1911b4204ad19216fe1263ba373944139f10fed2119fe52bdad21ec mod_fcgid-2.1-r1.ebuild 1443
+MISC ChangeLog 5517 RMD160 327798d47c2d1bd0201a3d4cf894f4b342e59825 SHA1 3f09987bc62054936583623cdc6661a2fe704fd5 SHA256 dbedf702b082b18b8a94aa5292aac33fbdd7269465217b6c1fc9bc727f0f9072
+MD5 95801ff8c35fa5f028f593d8591dfff1 ChangeLog 5517
+RMD160 327798d47c2d1bd0201a3d4cf894f4b342e59825 ChangeLog 5517
+SHA256 dbedf702b082b18b8a94aa5292aac33fbdd7269465217b6c1fc9bc727f0f9072 ChangeLog 5517
 MISC metadata.xml 483 RMD160 56be90c965ab5663636d639624c7778409e72347 SHA1 4704b1f7b6e558722c8613e66df8d148165d7a64 SHA256 9acd2c7ac26a99c1ba655aa7912526906c3e5d03529aeadcb08f9b40373244bc
 MD5 b04c3f93349f84b2bc615931f1c1d6c9 metadata.xml 483
 RMD160 56be90c965ab5663636d639624c7778409e72347 metadata.xml 483
@@ -48,7 +48,7 @@ SHA256 cc68ac5febecd1750373fb497c2f00536f093a83f0f19efd5d7b174d3c2d97fa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVKAtyuNVb5qfaOYRAgzzAJ9eXc7hqsKZnHYQjFiUgz+CkkClsQCfXOlo
-MITaXs5MdzexWdDY1quQP2M=
-=I3Sp
+iD8DBQFGVfIdyuNVb5qfaOYRAn3KAJ9cHjJD2/LYIUPDIf3atnZxmomYcACfVxBI
+m7tNd3C8LNn7k+JsIQpXZtk=
+=7sdn
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild
index bcf9dcbffe33..e6991c28b48c 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild,v 1.1 2007/05/23 20:12:11 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild,v 1.2 2007/05/24 20:14:16 phreak Exp $
 
-inherit apache-module eutils
+inherit apache-module eutils multilib
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
@@ -35,6 +35,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-apr_shm_remove.patch
+
+	# Fix the stupid Makefile, assuming our builddir is in /usr/local
+	sed -e "s,^top_dir.*=.*,top_dir = /usr/$(get_libdir)/apache2," -i Makefile
 }
 
 src_install() {