Fix doenvd calls in nxserver eclasses, bug 173884

diff --git a/eclass/nxserver-1.3.2.eclass b/eclass/nxserver-1.3.2.eclass
index cc087e256778b4b32010153be2185ddcdca42a0f..87caa61822a7536dbf9dd7c7d6f2f8acf84e9c47 100644 (file)
--- a/eclass/nxserver-1.3.2.eclass
+++ b/eclass/nxserver-1.3.2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.14 2007/03/26 20:24:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.15 2007/04/13 16:56:42 voyageur Exp $
 #
 # DEPRECATED
 # eclass for handling the different nxserver binaries available
@@ -76,8 +76,7 @@ nxserver-1.3.2_src_install() {
        dodir /usr/NX/var/sessions
        touch ${D}/usr/NX/var/sessions/NOT_EMPTY
 
-       insinto /etc/env.d
-       doins ${FILESDIR}/1.3.0/50nxserver
+       doenvd ${FILESDIR}/1.3.0/50nxserver
 }
 
 nxserver-1.3.2_pkg_postinst() {

diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index 09a615b10efeb0d36c88e05b3ca1cc9b87cdd41a..2273201180e3775a3066e168962aad692708338c 100644 (file)
--- a/eclass/nxserver-1.4.eclass
+++ b/eclass/nxserver-1.4.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.12 2007/03/26 20:24:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.13 2007/04/13 16:56:42 voyageur Exp $
 #
 # DEPRECATED
 # eclass for handling the different nxserver binaries available
@@ -77,8 +77,7 @@ nxserver-1.4_src_install() {
        dodir /usr/NX/var
        keepdir /usr/NX/var/sessions
 
-       insinto /etc/env.d
-       doins ${FILESDIR}/1.3.0/50nxserver
+       doenvd ${FILESDIR}/1.3.0/50nxserver
 }
 
 nxserver-1.4_pkg_postinst() {

diff --git a/eclass/nxserver.eclass b/eclass/nxserver.eclass
index d6567f204395aeabcd809ca0445e1a66da896064..2b00a421afefac3f295e4860b9bee2b653f2fda2 100644 (file)
--- a/eclass/nxserver.eclass
+++ b/eclass/nxserver.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.21 2007/03/26 20:24:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.22 2007/04/13 16:56:42 voyageur Exp $
 #
 # DEPRECATED
 # eclass for handling the different nxserver binaries available
@@ -69,8 +69,7 @@ nxserver_src_install() {
        dodir /usr/NX/var/sessions
        touch ${D}/usr/NX/var/sessions/NOT_EMPTY
 
-       insinto /etc/env.d
-       doins ${FILESDIR}/${PV}/50nxserver
+       doenvd ${FILESDIR}/${PV}/50nxserver
 }
 
 nxserver_pkg_postinst() {

diff --git a/eclass/nxserver_1.5.eclass b/eclass/nxserver_1.5.eclass
index 750edb2ac2dff45fa2259fb15403ec0818d553a9..fe2709362dd6b7c2fe244e250cbf3f011630506d 100644 (file)
--- a/eclass/nxserver_1.5.eclass
+++ b/eclass/nxserver_1.5.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver_1.5.eclass,v 1.5 2007/03/26 20:24:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver_1.5.eclass,v 1.6 2007/04/13 16:56:42 voyageur Exp $
 #
 # DEPRECATED
 # eclass for handling the different nxserver binaries available
@@ -99,8 +99,7 @@ nxserver_1.5_src_install() {
        dodir /usr/NX/var
        keepdir /usr/NX/var/sessions
 
-       insinto /etc/env.d
-       doins ${FILESDIR}/1.3.0/50nxserver
+       doenvd ${FILESDIR}/1.3.0/50nxserver
 }
 
 nxserver_1.5_pkg_postinst() {