| 1 |
commit: 40e4e30122a7de626349c579df7cfe4c30d4e3e0 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 14 15:30:02 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 14 15:30:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e4e301 |
| 7 |
|
| 8 |
app-emulation/virtualbox-bin: Install more icons and mime-type definitions. |
| 9 |
|
| 10 |
bug #572012 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
...uild => virtualbox-bin-5.0.24.108355-r1.ebuild} | 31 ++++++++++++++-------- |
| 16 |
...build => virtualbox-bin-5.1.0.108711-r1.ebuild} | 31 ++++++++++++++-------- |
| 17 |
2 files changed, 40 insertions(+), 22 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
similarity index 92% |
| 21 |
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355.ebuild |
| 22 |
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355-r1.ebuild |
| 23 |
index a205c79..364b030 100644 |
| 24 |
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355.ebuild |
| 25 |
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.24.108355-r1.ebuild |
| 26 |
@@ -113,19 +113,28 @@ src_install() { |
| 27 |
newins "${FILESDIR}/${PN}-config" vbox.cfg |
| 28 |
|
| 29 |
if ! use headless ; then |
| 30 |
- pushd "${S}"/icons &>/dev/null || die |
| 31 |
- for size in * ; do |
| 32 |
- if [ -f "${size}/virtualbox.png" ] ; then |
| 33 |
- insinto "/usr/share/icons/hicolor/${size}/apps" |
| 34 |
- newins "${size}/virtualbox.png" ${PN}.png |
| 35 |
+ newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop |
| 36 |
+ |
| 37 |
+ # set up symlinks (bug #572012) |
| 38 |
+ dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml |
| 39 |
+ |
| 40 |
+ local size ico icofile |
| 41 |
+ for size in 16 24 32 48 64 72 96 128 256 ; do |
| 42 |
+ pushd "${S}"/icons/${size}x${size} &>/dev/null || die |
| 43 |
+ if [[ -f "virtualbox.png" ]] ; then |
| 44 |
+ doicon -s ${size} virtualbox.png |
| 45 |
fi |
| 46 |
+ for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do |
| 47 |
+ icofile="virtualbox-${ico}.png" |
| 48 |
+ if [[ -f "${icofile}" ]] ; then |
| 49 |
+ doicon -s ${size} ${icofile} |
| 50 |
+ fi |
| 51 |
+ done |
| 52 |
+ popd &>/dev/null || die |
| 53 |
done |
| 54 |
- dodir /usr/share/pixmaps |
| 55 |
- cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \ |
| 56 |
- || die |
| 57 |
- popd &>/dev/null || die |
| 58 |
- |
| 59 |
- newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop |
| 60 |
+ doicon -s scalable "${S}"/icons/scalable/virtualbox.svg |
| 61 |
+ insinto /usr/share/pixmaps |
| 62 |
+ newins "${S}"/icons/48x48/virtualbox.png ${PN}.png |
| 63 |
fi |
| 64 |
|
| 65 |
pushd "${S}"/${EXTP_PN} &>/dev/null || die |
| 66 |
|
| 67 |
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 |
| 68 |
similarity index 92% |
| 69 |
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711.ebuild |
| 70 |
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711-r1.ebuild |
| 71 |
index 750f3ac..0c5a781 100644 |
| 72 |
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711.ebuild |
| 73 |
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.0.108711-r1.ebuild |
| 74 |
@@ -113,19 +113,28 @@ src_install() { |
| 75 |
newins "${FILESDIR}/${PN}-config" vbox.cfg |
| 76 |
|
| 77 |
if ! use headless ; then |
| 78 |
- pushd "${S}"/icons &>/dev/null || die |
| 79 |
- for size in * ; do |
| 80 |
- if [ -f "${size}/virtualbox.png" ] ; then |
| 81 |
- insinto "/usr/share/icons/hicolor/${size}/apps" |
| 82 |
- newins "${size}/virtualbox.png" ${PN}.png |
| 83 |
+ newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop |
| 84 |
+ |
| 85 |
+ # set up symlinks (bug #572012) |
| 86 |
+ dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml |
| 87 |
+ |
| 88 |
+ local size ico icofile |
| 89 |
+ for size in 16 24 32 48 64 72 96 128 256 ; do |
| 90 |
+ pushd "${S}"/icons/${size}x${size} &>/dev/null || die |
| 91 |
+ if [[ -f "virtualbox.png" ]] ; then |
| 92 |
+ doicon -s ${size} virtualbox.png |
| 93 |
fi |
| 94 |
+ for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do |
| 95 |
+ icofile="virtualbox-${ico}.png" |
| 96 |
+ if [[ -f "${icofile}" ]] ; then |
| 97 |
+ doicon -s ${size} ${icofile} |
| 98 |
+ fi |
| 99 |
+ done |
| 100 |
+ popd &>/dev/null || die |
| 101 |
done |
| 102 |
- dodir /usr/share/pixmaps |
| 103 |
- cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \ |
| 104 |
- || die |
| 105 |
- popd &>/dev/null || die |
| 106 |
- |
| 107 |
- newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop |
| 108 |
+ doicon -s scalable "${S}"/icons/scalable/virtualbox.svg |
| 109 |
+ insinto /usr/share/pixmaps |
| 110 |
+ newins "${S}"/icons/48x48/virtualbox.png ${PN}.png |
| 111 |
fi |
| 112 |
|
| 113 |
pushd "${S}"/${EXTP_PN} &>/dev/null || die |
Archives