--- /home/cvsroot/gentoo-src/portage/bin/ebuild.sh	2004-06-10 00:11:54.000000000 -0400
+++ /usr/sbin/ebuild.sh	2004-06-11 01:38:35.000000000 -0400
@@ -858,8 +853,46 @@
 
 dyn_package() {
 	trap "abort_package" SIGINT SIGQUIT
+	local x
+
+	if hasq multipackage $FEATURES; then
+		# mkdir -p image-dev image-doc image-bin
+		if [ -d "${BUILDDIR}/image/usr/include" ]; then
+			mkdir -p "${BUILDDIR}/image-dev/usr/"
+			mv "${BUILDDIR}/image/usr/include" "${BUILDDIR}/image-dev/usr/"
+		fi
+		cd "${BUILDDIR}/image"
+		find ./ -name '*.a' -o -name '*.h' -o -name '*.la'| while read x; do
+			mkdir -p "${BUILDDIR}/image-dev/`dirname ${x}`"
+			cp "${x}" "${BUILDDIR}/image-dev/${x}"
+			rm "${BUILDDIR}/image/${x}"
+		done
+		for x in doc info man ${PN} ${PN}-${PV} ${PF}; do
+			if [ -d "${BUILDDIR}/image/usr/share/${x}" ]; then
+				mkdir -p "${BUILDDIR}/image-doc/usr/share/"
+				mv "${BUILDDIR}/image/usr/share/${x}" "${BUILDDIR}/image-doc/usr/share/"
+			fi
+		done
+		for x in doc dev ; do
+			if [ -e "${BUILDDIR}/image-${x}" ]; then
+				cd "${BUILDDIR}/image-${x}"
+				echo "--- ${x} ---"
+				tar cpvf - ./ | bzip2 -f > "../${x}.tar.bz2" || die "Failed to create ${x}-tarball"
+				ln -sf "../All/${PN}-${x}-${PV}-${PR}.tbz2" "${PKGDIR}/${CATEGORY}/${PN}-${x}-${PV}-${PR}.tbz2" || \
+					die "Failed to create symlink in ${PKGDIR}/${CATEGORY}"
+				cd ..
+				xpak build-info inf.xpak
+				tbz2tool join "${x}.tar.bz2" inf.xpak "${PN}-${x}-${PV}-${PR}.tbz2"
+				mv "${PN}-${x}-${PV}-${PR}.tbz2" "${PKGDIR}/All" || die "Failed to move tbz2 to ${PKGDIR}/All"
+				rm ${x}.tar.bz2
+				echo "-----------"
+
+			fi
+		done
+	fi
+
 	cd "${BUILDDIR}/image"
-	tar cpvf - ./ | bzip2 -f > ../bin.tar.bz2 || die "Failed to create tarball"
+	tar cpvf - ./ | bzip2 -f > ../bin.tar.bz2 || die "Failed to create bin-tarball"
 	cd ..
 	xpak build-info inf.xpak
 	tbz2tool join bin.tar.bz2 inf.xpak "${PF}.tbz2"
@@ -889,7 +922,7 @@
 
 dyn_install() {
 	trap "abort_install" SIGINT SIGQUIT
-	rm -rf "${BUILDDIR}/image"
+	rm -rf "${BUILDDIR}/image"{,-dev,-doc}
 	mkdir "${BUILDDIR}/image"
 	if [ -d "${S}" ]; then
 		cd "${S}"