diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index 831e170094bfb..b768338792098 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
 
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="http://www.opencascade.org/"
 SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
 
@@ -141,8 +141,7 @@ src_install() {
 		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
 	fi
 
-	insinto /etc/env.d/${PN}
-	newins 50${PN} ${PV}
+	newenvd 50${PN} ${PV}
 
 	#cd "${S}"
 	if use examples ; then
diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild b/sci-libs/opencascade/opencascade-6.8.0.ebuild
index af9f50e21cf47..dbe665866cc23 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
 
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="http://www.opencascade.org/"
 SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
 
@@ -139,8 +139,7 @@ src_install() {
 		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
 	fi
 
-	insinto /etc/env.d/${PN}
-	newins 50${PN} ${PV}
+	newenvd 50${PN} ${PV}
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index dd9590068c701..6058f7f2c9b89 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
 
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="http://www.opencascade.org/"
 SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.tgz"
 
@@ -144,8 +144,7 @@ src_install() {
 		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
 	fi
 
-	insinto /etc/env.d/${PN}
-	newins 50${PN} ${PV}
+	newenvd 50${PN} ${PV}
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples
diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild b/sci-libs/opencascade/opencascade-6.9.1.ebuild
index 894b2e65da51c..a9b507738c7a7 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
 
-DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="http://www.opencascade.org/"
 SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
 
@@ -144,8 +144,7 @@ src_install() {
 		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
 	fi
 
-	insinto /etc/env.d/${PN}
-	newins 50${PN} ${PV}
+	newenvd 50${PN} ${PV}
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples