commit: 8ea384dc7c95b0221471da2866061835f77c78a6
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 13 22:23:35 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 04:52:44 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=8ea384dc
added .desktop files
---
media-gfx/Cura/Cura-15.01.ebuild | 11 ++++++-----
media-gfx/Cura/Manifest | 2 +-
media-gfx/Slic3r-bin/Manifest | 4 ++--
media-gfx/Slic3r-bin/Slic3r-bin-1.1.7.ebuild | 13 ++++++++++---
media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild | 13 ++++++++++---
media-gfx/Slic3r/Manifest | 2 +-
media-gfx/Slic3r/Slic3r-9999.ebuild | 5 +++++
7 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/media-gfx/Cura/Cura-15.01.ebuild b/media-gfx/Cura/Cura-15.01.ebuild
index 31da13d..6107a57 100644
--- a/media-gfx/Cura/Cura-15.01.ebuild
+++ b/media-gfx/Cura/Cura-15.01.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
+inherit eutils python-single-r1
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://github.com/daid/${PN}.git"
@@ -34,10 +34,6 @@ DEPEND="${RDEPEND}"
REQUIRED_USE="${PYTHON_REQ_USE}"
-#pkg_setup() {
-# python-single-r1_pkg_setup
-#}
-
src_prepare() {
epatch "${FILESDIR}"/${PN}-nopower.patch
}
@@ -51,4 +47,9 @@ src_install() {
PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" /usr/bin/python2
${EROOT}usr/share/cura/cura.py "\$@"
CURAEOF
dobin "${T}"/cura
+
+ make_desktop_entry cura \
+ Cura \
+ /usr/share/cura/resources/images/c.png \
+ "Graphics;3DGraphics;Engineering;Development"
}
diff --git a/media-gfx/Cura/Manifest b/media-gfx/Cura/Manifest
index f622f03..0ef46d0 100644
--- a/media-gfx/Cura/Manifest
+++ b/media-gfx/Cura/Manifest
@@ -1,3 +1,3 @@
AUX Cura-nopower.patch 3209 SHA256
a67e9c8561f8cc85b0fa58b13acb38eced5ef3c02205d3b8c30f9a7cfade19d2 SHA512
6cad0f33f87b8b5540a6ac2237ef8c734de36f86bea523e61de3f2d60c5e0beba93ed9535b06bb863a7270abf590e71d494c2a59ba898c41035478e5ac189d8f
WHIRLPOOL
b8b0eac2a2450e948f527799655e0411958580f34c5d3bf8dc896b3514698c3faed7b7774de0e5a19fd4a89ab8808a76c65bf2b60e2b20524d2b76ddafa4de8b
DIST Cura-15.01.tar.gz 7120730 SHA256
35aa9be3ce77289353180b11261aecc70da143624e1567df168a81e1b9289889 SHA512
f44f02ab047b550365cfd42fb29ecfc88663e06397b71b33887afcbc6682aa1b818f494f97fbf417407157415fa32db0e8cc1ab539156635439b25cafbd0b34e
WHIRLPOOL
637295d3e616b2af90c688eb783a70aab42cc7ce21785675cb6b6df2da1f055e86ebb94efe5660dc6f0b56d8c24a0871b0f0b63135b55654db3f11711c14c93f
-EBUILD Cura-15.01.ebuild 1299 SHA256
98546e02116b8ee69168d4c8ae9a987022b7e2965be67e3d46b08f5583fe1ffe SHA512
bdf0432a93edab956cde71f32095a4a7910e43d66ba51be32edfb1bc4aa6262674f293e0b7598822be65033b90034d92500d64ad2fe148709f083462c828ad59
WHIRLPOOL
62094c8a992515ff18bbf3500711db36934fad6a72a88c15a46918550d6ae8eba8bca03dfbfc32e7a8246a992ba2356eed5743364ca14e95e2a68d3303607173
+EBUILD Cura-15.01.ebuild 1386 SHA256
9763b251bb8e24dbcfe9dac3cde36ef83afd36492389cb93e0f8c0877fcdeaa1 SHA512
c8d772f1a7ce70b922b0ec8b01e25d9f6f058c5209a7670a70ab042dd1573d1d17b0828cb994829dafa238e2a6274e83aec0ed97a601269ef8bc61952eb06aed
WHIRLPOOL
2b57598ab26abe5d50e885f8d803fcdc46e124ce5728016b9f1ed7e6c10e57039d8c701cf65ab318d54de940969b722c8dfb860ecd6cd75b4b54d8a903f11bb5
diff --git a/media-gfx/Slic3r-bin/Manifest b/media-gfx/Slic3r-bin/Manifest
index a36130a..9e68790 100644
--- a/media-gfx/Slic3r-bin/Manifest
+++ b/media-gfx/Slic3r-bin/Manifest
@@ -2,5 +2,5 @@ DIST slic3r-linux-x86-1-1-7-stable.tar.gz 15645886 SHA256
4ff1740e276bc7ad5453cb
DIST slic3r-linux-x86-1-2-6-experimental.tar.gz 16189245 SHA256
476254c334616159d8c87101768b6bd281662bcae844b644c1829cc46e072604 SHA512
5e9f12f6ba0a6dbc48de831669ef4d2a0e1444852e77f21fef7cd176b9932efd19088ea069096bf9f6e1273fe484680d97682387e5a35ce72e807375c5595f99
WHIRLPOOL
03fb6e2f32ae40caffd7de5bd51cdc1bbaa6ef5dc585317ebe8f57b8a944c6221c3d5cd40e70227898e300f94868cbe89bed04e966306e16456b4824dc674ff3
DIST slic3r-linux-x86_64-1-1-7-stable.tar.gz 15760223 SHA256
01c84fddfd8dbcfe2fe6a3ebf67ec6fde4a7b93495e571fddc8c95d1551d0a1e SHA512
5403506b4721f8f3ef6f8f9b89d5ed041bfe424de2fc0d3a67990e60f3dbdccec61136a24c1577d434d611310f1ec06ab17f75cc128792caa4d7ee331ca348d8
WHIRLPOOL
87ec01769118b13bb0461bb76c412b4e3bd90c5be12293b2d1a4c86c5b99b4be14d9a4eed5cb32e38931cb42997b5f11da40f68350b48e65321ee7940e8903d2
DIST slic3r-linux-x86_64-1-2-6-experimental.tar.gz 16596867 SHA256
a46b9ffb8d98d9010238a3545cdf45502248e98548def18de216bbca8703e655 SHA512
6fe354502452102945d9ec3e88be21712fd04dedef12db72bfb28a531aeb359d972e47db803b888730a6eeb0ce7bb7b06651b1c221c004eb2cca8c8f9c4c5535
WHIRLPOOL
4eec97af882c0205b39b19345249f0c7367ae6b374b5e1b7f8ec785fada24174b6c1b712be74539ff82d5ebbdd30d3469f9aa39e46d580889942e214a28cf507
-EBUILD Slic3r-bin-1.1.7.ebuild 754 SHA256
e8beda59168c93ada49fa82f5f3d19f432e1ef3528e7a853aa5cef1fe21043ef SHA512
3c5b3e21782851a203820d05a1a3e95ef9e014546eef96de66a822173b1f20db90d60d6fd06fc19a009631b949c6f68b51e1e575a5db3cfd557e859dc012b418
WHIRLPOOL
216dc8e2a6c55d4a03a0a86d65a05c00280d910838fc991918cbea4fc8218531f1a6747fc70e2e531f7637e8afeec7585f16a1d30d3c85d42668d7f3f9d7f6fc
-EBUILD Slic3r-bin-1.2.6.ebuild 766 SHA256
5e55c6d33fa6b21e8d812309e166188aa136998795bd19995c1145ebe5e61309 SHA512
90734a4e5290ca1ba596fc339500385a38663492c6272e141040a11d7fafaa3b3d93da89a0d0c9930140b5744bafce11c2dbf0751813e333daff1354851922da
WHIRLPOOL
0e0cec0562a7a336dbd6a49cc131a7c65ca269e8bf1ad257f1d6d393c02f84526f8640e1ff272203593d640a5c99da50403cc2099d9f03a3457585db97d2507d
+EBUILD Slic3r-bin-1.1.7.ebuild 962 SHA256
875681107382b413c7385c22cb67e0e409fa0d356f587a56fdc5ceb277ee14ed SHA512
b5c1690d8560c7e988436ab362831bf5a1c7e33a27b4544993b898a55785088fb2b9a68aef6e47f0b4b305c501fbab33f1dedf69805542620b224b27bacd8f1b
WHIRLPOOL
56f9472af86bb91a9df9e999a8521250aa64a6d45e72561ba447b2663a1e039c3d26ba6dd175410d6f2bdc9b7d219781d0f06717c78eb7893d258f7b5e05d8e8
+EBUILD Slic3r-bin-1.2.6.ebuild 974 SHA256
d8f750bfdec6f3b3405ccc33a6818622e0856e2367a986bcad90851e9c008479 SHA512
911112b8278328ab3d15b7b281e85565c2736af4457f5c68f31c63667df3e58b22ec21f960a9083df32a800c9ace4c6fb27b28bc5b6aae23a3741e3dfb2d3aee
WHIRLPOOL
f06cf085a1f2382fc677034c6735a71af1624ca537b79deae6ee25603d94372d450d7f2189b30105a1ef6ccfc08a6d6796052ae4e1fd654ed61b4675f948b2e9
diff --git a/media-gfx/Slic3r-bin/Slic3r-bin-1.1.7.ebuild
b/media-gfx/Slic3r-bin/Slic3r-bin-1.1.7.ebuild
index 7514447..460fc08 100644
--- a/media-gfx/Slic3r-bin/Slic3r-bin-1.1.7.ebuild
+++ b/media-gfx/Slic3r-bin/Slic3r-bin-1.1.7.ebuild
@@ -4,6 +4,8 @@
EAPI="5"
+inherit eutils multilib
+
SRC_URI="
x86? ( http://dl.slic3r.org/linux/slic3r-linux-x86-${PV//\./-}-stable.tar.gz )
amd64? (
http://dl.slic3r.org/linux/slic3r-linux-x86_64-${PV//\./-}-stable.tar.gz )
@@ -21,9 +23,14 @@ IUSE=""
S=${WORKDIR}
src_install() {
- insinto /usr/lib
+ insinto /usr/$(get_libdir)
doins -r Slic3r
- exeinto /usr/lib/Slic3r/bin
+ exeinto /usr/$(get_libdir)/Slic3r/bin
doexe Slic3r/bin/slic3r
- dosym /usr/lib/Slic3r/bin/slic3r /usr/bin/slic3r
+ dosym /usr/$(get_libdir)/Slic3r/bin/slic3r /usr/bin/slic3r
+
+ make_desktop_entry slic3r \
+ Slic3r-bin \
+ "/usr/$(get_libdir)/Slic3r/res/Slic3r_128px.png" \
+ "Graphics;3DGraphics;Engineering;Development"
}
diff --git a/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
b/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
index 839dc99..620ac50 100644
--- a/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
+++ b/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
@@ -4,6 +4,8 @@
EAPI="5"
+inherit eutils multilib
+
SRC_URI="
x86? (
http://dl.slic3r.org/linux/slic3r-linux-x86-${PV//\./-}-experimental.tar.gz )
amd64? (
http://dl.slic3r.org/linux/slic3r-linux-x86_64-${PV//\./-}-experimental.tar.gz )
@@ -21,9 +23,14 @@ IUSE=""
S=${WORKDIR}
src_install() {
- insinto /usr/lib
+ insinto /usr/$(get_libdir)
doins -r Slic3r
- exeinto /usr/lib/Slic3r/bin
+ exeinto /usr/$(get_libdir)/Slic3r/bin
doexe Slic3r/bin/slic3r
- dosym /usr/lib/Slic3r/bin/slic3r /usr/bin/slic3r
+ dosym /usr/$(get_libdir)/Slic3r/bin/slic3r /usr/bin/slic3r
+
+ make_desktop_entry slic3r \
+ Slic3r-bin \
+ "/usr/$(get_libdir)/Slic3r/res/Slic3r_128px.png" \
+ "Graphics;3DGraphics;Engineering;Development"
}
diff --git a/media-gfx/Slic3r/Manifest b/media-gfx/Slic3r/Manifest
index 9cd6272..5d42c23 100644
--- a/media-gfx/Slic3r/Manifest
+++ b/media-gfx/Slic3r/Manifest
@@ -1,2 +1,2 @@
AUX Slic3r-adjust_var_path.patch 274 SHA256
e32798a894bfb112bf1e87f94e76a1170f34ae40456ca33c684c1bf26f719661 SHA512
83802247efb5c450fc4b9dfbe407b6ff09f25599852287e6cc2a6ddc3f1dd04648ea8194cbd60dbed882dba5cd4a56a3b15992052659a7ec13a80f44c9d151cc
WHIRLPOOL
2c3fca71c01ba9817d24e8f062cba40a40c3d5d6f7d88eddb1d4934cdba9e9716a07a5c9e421d44d637d186a363ac072f570a022a0d32017565bfb861a638172
-EBUILD Slic3r-9999.ebuild 2512 SHA256
5c1cbd33ed5dbb6b12203ff4284d2c61cc25b20afd7242175a79d7c84559b1cd SHA512
cdd667a6658cdc8a1ff62a54ed1ecac8e8fb76d3bf874629e67b23e28e5663e3d741277813799b8a961982a06d4f2906e08179bca51b628200f52a183a17663e
WHIRLPOOL
e18091d8dcb9463201a63d2f4610722eb19fc86004ee74eabdc3ed0c8927d7b26fd7751703ca663691c752227a8bc2484c9aa79cb7c2c00b249a09ac8b7586cf
+EBUILD Slic3r-9999.ebuild 2652 SHA256
ca05fc8214e57f73e75cbfe5fa2abd43af079d044b2302819600d4dbc05a68b1 SHA512
9cf4256ce9b0fcab6d71af75ca4f21fd49d597957e58b2719feaa690aeb16b73631cd093a54ada7fa65be3db7de04dd4db5a6d234d2988066a994ffcde75b392
WHIRLPOOL
9253efe55de3c48b028368beb35b8db2638f52e1ff5d8ca27de26cfc380f82c2b6d7eeab2b10d1d274c3853bf3d60fa2463048f6bef6c6376289a122c75b7ba4
diff --git a/media-gfx/Slic3r/Slic3r-9999.ebuild
b/media-gfx/Slic3r/Slic3r-9999.ebuild
index adfc21b..a85a988 100644
--- a/media-gfx/Slic3r/Slic3r-9999.ebuild
+++ b/media-gfx/Slic3r/Slic3r-9999.ebuild
@@ -120,4 +120,9 @@ src_install() {
doexe slic3r.pl
dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+ make_desktop_entry slic3r.pl \
+ Slic3r \
+ "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+ "Graphics;3DGraphics;Engineering;Development"
}
