--- /usr/portage/sci-electronics/ngspice/ngspice-31.ebuild	2019-11-03 23:39:39.000000000 +0100
+++ /usr/portage/sci-electronics/ngspice/ngspice-31.ebuild	2019-11-04 10:17:29.359965556 +0100
@@ -133,8 +133,8 @@ 
 
 	# merge the installations of all variants
 	for v in "${MULTIBUILD_VARIANTS[@]}" ; do
-		cp -a "${D}_${v}"/* "${D}" || die "Failed to combine multibuild installations"
-		rm -rf "${D}_${v}"
+		cp -a "${D}/${v}"/* "${D}" || die "Failed to combine multibuild installations"
+		rm -rf "${D}/${v}"
 	done
 
 	use tcl && DOCS+=( README.tcl )
@@ -154,15 +154,15 @@ 
 ngspice_install() {
 	pushd "${BUILD_DIR}"
 
-	emake DESTDIR="${D}_${MULTIBUILD_VARIANT}" install
+	emake DESTDIR="${D}/${MULTIBUILD_VARIANT}" install
 
 	# Strip shared-library and Tcl-module builds to the bare minimum;
 	# all the support files will have been handled by the 'binaries' build.
 	if [ "${MULTIBUILD_VARIANT}" != "binaries" ]; then
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/bin{,.debug}
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/share
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug}
+		rm -rf "${D}/${MULTIBUILD_VARIANT}"/usr/bin{,.debug}
+		rm -rf "${D}/${MULTIBUILD_VARIANT}"/usr/share
+		rm -rf "${D}/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la
+		rm -rf "${D}/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug}
 	fi
 }