From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Fri, 13 Apr 2007 16:56:42 +0000 (+0000)
Subject: Fix doenvd calls in nxserver eclasses, bug 173884
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa160cd0aad56bb93231977e3f4ca6301434e228;p=gentoo.git

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 cc087e256778..87caa61822a7 100644
--- 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 09a615b10efe..2273201180e3 100644
--- 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 d6567f204395..2b00a421afef 100644
--- 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 750edb2ac2df..fe2709362dd6 100644
--- 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() {