Permalink
Browse files

fix of 2gis + fix of luajit messages (about eselect) + sacred icon fix

  • Loading branch information...
1 parent 3b45d97 commit 9d1303743dec16ec1f42658e9f47824d7ce3594b @msva committed Jan 27, 2012
@@ -17,7 +17,8 @@ RDEPEND=">=app-misc/2gis-3.0.7.1"
IUSE=""
SRC_URI=""
-RESTRICT="mirror"
+
+S="${WORKDIR}"
MY_PV_YEAR=$(get_version_component_range 1)
MY_PV_MON=$(get_version_component_range 2)
@@ -92,6 +93,11 @@ my_add_town uli Ulyanovsk 2011 11
my_add_town yar Yaroslavl 2010 6
my_add_town yak Yakutsk 2011 8
+src_prepare() {
+ mv "${WORKDIR}"/2gis "${S}"
+ default
+}
+
src_install() {
insinto /opt/2gis
# Only attempt to install any data if the user has enabled at least
@@ -10,8 +10,6 @@ DESCRIPTION="Proprietary freeware multimedia map of several Russian and Ukrainia
HOMEPAGE="http://2gis.ru"
SRC_URI="http://download.2gis.ru/arhives/2GISShell-${PV}.orig.zip"
-ICON_SIZE="48x48"
-
LICENSE="2Gis-ru"
SLOT="0"
KEYWORDS="~x86 ~amd64"
@@ -21,14 +19,20 @@ DEPEND="app-arch/unzip"
RDEPEND="app-emulation/wine
data? ( app-misc/2gis-data )"
+S="${WORKDIR}"
+
src_install() {
insinto /opt/${PN}
doins -r 2gis/3.0/* || die
- bash "${FILESDIR}"/exe2png 2gis/3.0/grym.exe 2gis.png "${ICON_SIZE}"
- insinto /usr/share/icons/hicolor/"${ICON_SIZE}"/apps
- doins 2gis.png
+ bash "${FILESDIR}"/exe2png "2gis/3.0/grym.exe" "2gis.png" "48x48"
+ for path in $(find /usr/share/icons/hicolor -maxdepth 1 -type d -iname '[0-9]*x[0-9]*'); do
+ size=$(basename "${path}")
+ convert 2gis_256.png -resize "${size}" 2gis.png
+ insinto "${path}"/apps
+ doins 2gis.png
+ done
make_wrapper 2gis "wine grym.exe -nomta" /opt/${PN}
- make_desktop_entry 2gis "2Gis" 2gis.png "Navigation" || die
+ make_desktop_entry 2gis "2Gis" 2gis "Qt;KDE;Education;Geography" || die
}
@@ -54,3 +54,9 @@ src_install(){
pax-mark m "${D}usr/bin/luajit-${PV}"
dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
}
+
+pkg_postinst() {
+ ewarn "Now you should select LuaJIT version to use as system default LuaJIT interpreter."
+ ewarn "Use 'eselect luajit list' to look for installed versions and"
+ ewarn "Use 'eselect luajit set <NUMBER_or_NAME>' to set version you chose."
+}
@@ -40,3 +40,9 @@ src_install(){
pax-mark m "${D}usr/bin/luajit-${PV}"
dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
}
+
+pkg_postinst() {
+ ewarn "Now you should select LuaJIT version to use as system default LuaJIT interpreter."
+ ewarn "Use 'eselect luajit list' to look for installed versions and"
+ ewarn "Use 'eselect luajit set <NUMBER_or_NAME>' to set version you chose."
+}
@@ -48,3 +48,9 @@ src_install(){
pax-mark m "${D}usr/bin/luajit-${PV}"
dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
}
+
+pkg_postinst() {
+ ewarn "Now you should select LuaJIT version to use as system default LuaJIT interpreter."
+ ewarn "Use 'eselect luajit list' to look for installed versions and"
+ ewarn "Use 'eselect luajit set <NUMBER_or_NAME>' to set version you chose."
+}
@@ -59,7 +59,7 @@ src_install() {
dodir /usr/games/bin
dosym /opt/sacred/sacred /usr/games/bin/sacred
newicon ${S}"/icon.xpm" "${PN}.png"
- make_desktop_entry ${PN} "Sacred: Gold Edition" ${PN}.png "Games"
+ make_desktop_entry "${PN}" "Sacred: Gold Edition" "${PN}" "Games"
}
pkg_postinst() {

0 comments on commit 9d13037

Please sign in to comment.