Use ${ROOT} when it's needed (thanks to tove@g.o for reporting)

Respect CC and LDFLAGS
(Maintainer is in devaway status)
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 20 insertions, 17 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 93abb0548e99..ffbac78bae4a 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.207 2009/03/17 11:57:43 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.208 2009/03/17 14:21:05 drizzt Exp $
+
+  17 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> nginx-0.7.39.ebuild:
+  Use ${ROOT} when it's needed (thanks to tove@g.o for reporting) Respect CC
+  and LDFLAGS (Maintainer is in devaway status)
 
   17 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> nginx-0.7.39.ebuild:
   QA: Don't abuse ROOT wrt #232969, #258118. Add ~x86-fbsd keyword (with
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 7ebe5b1b3c8a..c3dab3440f04 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -23,13 +23,13 @@ EBUILD nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703
 EBUILD nginx-0.5.37.ebuild 2948 RMD160 78f82e5df19b6f087b004d4d67f8c45e6c2c7d1c SHA1 d2e73605cb7fe74858ee5a82e7bc3f43a28a7ccb SHA256 fb1f1a0d10d1f2ae43f57ec1182c54c2b9c356c145666b19a28cbd1c28ee3a4e
 EBUILD nginx-0.6.32.ebuild 3060 RMD160 919c8265b2abdb9b4ff63dfc939df30c56a698e3 SHA1 13282784a82670423f56d8d3463a3771c291d9fd SHA256 6bbcb10f4ec9657e94b4178065c073e829385f2b2c9d7e53a19fa0ba258255f1
 EBUILD nginx-0.6.35.ebuild 3062 RMD160 dea41f45eb353450440901ef5ebac526c195eb9b SHA1 ed5074b2449811d5e8be72abf6205f7cb78c4a1a SHA256 da623577ec3225897f7a2571fbbf70d6513684aab664c915359f0c61cd574909
-EBUILD nginx-0.7.39.ebuild 3198 RMD160 cc454daa138293975e2553d2de058433e46c8977 SHA1 a85924557083d14b4393e83191cc662670b8aca3 SHA256 26afae12da0aa7762950f0c991a79fc2f19f2b7eb34475e711c77646bba665de
-MISC ChangeLog 33407 RMD160 b6f317206a39c5265510a62335f4407ba4d15f51 SHA1 b9fab06dd8cc0d2baa12ed9f6cba55a36e26da3d SHA256 eacfba88b2e310afb560a266776893338a4b4e33fa2b1a988193c3d6ab2d9797
+EBUILD nginx-0.7.39.ebuild 3264 RMD160 ea52a182ec419baaa6e1aeb1a3bf2e6306471cd8 SHA1 db638c0e44f901595049a8ffc50909368e336dad SHA256 2466b39a9405f41a901218b100d717a3c3691cf1370d9917c8403fb5d8407e44
+MISC ChangeLog 33606 RMD160 aa092ad4d3e94370b34a7f62404024a276f8f6c3 SHA1 e70549e02e878eb8c5e359d711c126c80552c8d4 SHA256 307db594ac3b320e373cf5eb7ed4df45cdea4070b0fde1ef2aa559f2923e0324
 MISC metadata.xml 595 RMD160 e06fbe391f9ab0805dbe68043559994afd17ec97 SHA1 5c4b053e47410ee159081ace8ca01952a2c23b95 SHA256 f957e3933c4e5b8fb9c97519c4a0d6d30063c076051e285640a24a3d8512dfe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm/kDsACgkQl4DfQEcjpw1/6wCgjIH3hPxXEAfsSTtWjEPp5Luj
-Wo8AnA6WhavaffJVfgmNQ4qMo+9txjlg
-=+W0S
+iEYEARECAAYFAkm/sdUACgkQl4DfQEcjpw19MwCgl9vzH1L1nmOjoPvvYLsAakCY
+oKIAmwVL1h7XbROc0WtGQkaEzNa599zl
+=YQku
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.7.39.ebuild b/www-servers/nginx/nginx-0.7.39.ebuild
index 3528a02080aa..05808fab2064 100644
--- a/www-servers/nginx/nginx-0.7.39.ebuild
+++ b/www-servers/nginx/nginx-0.7.39.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.39.ebuild,v 1.2 2009/03/17 11:57:43 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.39.ebuild,v 1.3 2009/03/17 14:21:05 drizzt Exp $
 
-inherit eutils ssl-cert
+inherit eutils ssl-cert toolchain-funcs
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
@@ -21,14 +21,14 @@ DEPEND="dev-lang/perl
 
 pkg_setup() {
 	ebegin "Creating nginx user and group"
-	enewgroup nginx
-	enewuser nginx -1 -1 /dev/null nginx
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
 	eend ${?}
 }
 
 src_unpack() {
 	unpack ${A}
-	sed -i 's/ make/ $(MAKE)/' "${S}"/auto/lib/perl/make || die
+	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
 }
 
 src_compile() {
@@ -61,6 +61,7 @@ src_compile() {
 	use sub		&& myconf="${myconf} --with-http_sub_module"
 	use random-index	&& myconf="${myconf} --with-http_random_index_module"
 
+	tc-export CC
 	./configure \
 		--prefix=/usr \
 		--conf-path=/etc/${PN}/${PN}.conf \
@@ -74,7 +75,7 @@ src_compile() {
 		--with-sha1-asm --with-sha1=/usr/include \
 		${myconf} || die "configure failed"
 
-	emake || die "failed to compile"
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
 }
 
 src_install() {
@@ -100,11 +101,9 @@ src_install() {
 
 pkg_postinst() {
 	use ssl && {
-		if [ ! -f /etc/ssl/${PN}/${PN}.key ]; then
-			dodir /etc/ssl/${PN}
-			insinto /etc/ssl/${PN}/
-			insopts -m0644 -o nginx -g nginx
-			install_cert /etc/ssl/nginx/nginx
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
 		fi
 	}
 }