app-emulation/virtualbox-bin: Install more icons and mime-type definitions.

bug #572012

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355-r1.ebuild
similarity index 92%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355-r1.ebuild
index a205c7952432916a1620ec874172657ea051fb30..364b030e9e5f7089e61d069826fc4575315bf3c6 100644 (file)
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355-r1.ebuild
@@ -113,19 +113,28 @@ src_install() {
        newins "${FILESDIR}/${PN}-config" vbox.cfg
 
        if ! use headless ; then
-               pushd "${S}"/icons &>/dev/null || die
-               for size in * ; do
-                       if [ -f "${size}/virtualbox.png" ] ; then
-                               insinto "/usr/share/icons/hicolor/${size}/apps"
-                               newins "${size}/virtualbox.png" ${PN}.png
+               newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+               # set up symlinks (bug #572012)
+               dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+               local size ico icofile
+               for size in 16 24 32 48 64 72 96 128 256 ; do
+                       pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+                       if [[ -f "virtualbox.png" ]] ; then
+                               doicon -s ${size} virtualbox.png
                        fi
+                       for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+                               icofile="virtualbox-${ico}.png"
+                               if [[ -f "${icofile}" ]] ; then
+                                       doicon -s ${size} ${icofile}
+                               fi
+                       done
+                       popd &>/dev/null || die
                done
-               dodir /usr/share/pixmaps
-               cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
-                       || die
-               popd &>/dev/null || die
-
-               newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+               doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+               insinto /usr/share/pixmaps
+               newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
        fi
 
        pushd "${S}"/${EXTP_PN} &>/dev/null || die

diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711-r1.ebuild
similarity index 92%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711-r1.ebuild
index 750f3ac56475696add0dc246de79c42230417003..0c5a78159b355f34559884f837c5e3dc0d5fb7b4 100644 (file)
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711-r1.ebuild
@@ -113,19 +113,28 @@ src_install() {
        newins "${FILESDIR}/${PN}-config" vbox.cfg
 
        if ! use headless ; then
-               pushd "${S}"/icons &>/dev/null || die
-               for size in * ; do
-                       if [ -f "${size}/virtualbox.png" ] ; then
-                               insinto "/usr/share/icons/hicolor/${size}/apps"
-                               newins "${size}/virtualbox.png" ${PN}.png
+               newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+               # set up symlinks (bug #572012)
+               dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+               local size ico icofile
+               for size in 16 24 32 48 64 72 96 128 256 ; do
+                       pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+                       if [[ -f "virtualbox.png" ]] ; then
+                               doicon -s ${size} virtualbox.png
                        fi
+                       for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+                               icofile="virtualbox-${ico}.png"
+                               if [[ -f "${icofile}" ]] ; then
+                                       doicon -s ${size} ${icofile}
+                               fi
+                       done
+                       popd &>/dev/null || die
                done
-               dodir /usr/share/pixmaps
-               cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
-                       || die
-               popd &>/dev/null || die
-
-               newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+               doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+               insinto /usr/share/pixmaps
+               newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
        fi
 
        pushd "${S}"/${EXTP_PN} &>/dev/null || die