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

Respect CC and LDFLAGS
(Maintainer is in devaway status)
(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 15 insertions, 12 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/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
 	}
 }