--- nginx-1.7.6.ebuild.ori 2014-10-02 20:29:23.915742381 +0200 +++ nginx-1.7.6.ebuild 2014-10-02 20:30:06.506166068 +0200 @@ -495,11 +495,11 @@ --with-cc-opt="-I${EROOT}usr/include" \ --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ - --http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \ - --http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \ - --http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \ - --http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \ - --http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ ${myconf} || die "configure failed" # A purely cosmetic change that makes nginx -V more readable. This can be @@ -517,9 +517,9 @@ } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${D%/}" install - cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die + cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die newinitd "${FILESDIR}"/nginx.initd-r2 nginx @@ -530,7 +530,7 @@ # just keepdir. do not copy the default htdocs files (bug #449136) keepdir /var/www/localhost - rm -rf "${D}"/usr/html || die + rm -rf "${D}"usr/html || die # set up a list of directories to keep local keepdir_list="${NGINX_HOME_TMP}"/client @@ -555,7 +555,7 @@ if use nginx_modules_http_perl; then cd "${S}"/objs/src/http/modules/perl/ - einstall DESTDIR="${D}" INSTALLDIRS=vendor + einstall DESTDIR="${D%/}" INSTALLDIRS=vendor fixlocalpod fi @@ -638,9 +638,9 @@ pkg_postinst() { if use ssl; then - if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then + if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then install_cert /etc/ssl/${PN}/${PN} - use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} fi fi @@ -666,7 +666,7 @@ ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "This is a one-time change and will not happen on subsequent updates." ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}" - chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} + chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} fi # If the nginx user can't change into or read the dir, display a warning.