commit: 40e4e30122a7de626349c579df7cfe4c30d4e3e0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 15:30:02 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 15:30:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e4e301
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 <AT> gentoo.org>
...uild => virtualbox-bin-5.0.24.108355-r1.ebuild} | 31 ++++++++++++++--------
...build => virtualbox-bin-5.1.0.108711-r1.ebuild} | 31 ++++++++++++++--------
2 files changed, 40 insertions(+), 22 deletions(-)
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 a205c79..364b030 100644
--- 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 750f3ac..0c5a781 100644
--- 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
