[gentoo-commits] repo/gentoo:master commit in: app-editors/scite/

[Ian Delaney]

commit:     b6939082a193d1d994be5d25874f7de60dc11a56
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 06:33:46 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 06:59:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6939082

app-editors/scite: bump to vn. 3.6.4

Ebuild added with minor edits by me (to bring ebuild to required form),
submitted by the maintainer via the gentoo bug.
Removed old vn. 3.6.1

Gentoo-bug: #577886

Package-Manager: portage-2.2.28

 app-editors/scite/Manifest                         |  2 +-
 .../{scite-3.6.1.ebuild => scite-3.6.4.ebuild}     | 28 +++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 4064974..131043a 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,3 +1,3 @@
 DIST scite355.tgz 2302137 SHA256 
20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 
cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d
 WHIRLPOOL 
c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
-DIST scite361.tgz 2347061 SHA256 
bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010 SHA512 
5ead063ba98798ec5aa188735f219a19e788fbfaf12c84bce61a08c356e85e73cbbac412731cfdec02266bb8fa94d2a461239ffaba14b99ea65c31eb770dfcc3
 WHIRLPOOL 
8279b3fea54d2ef266dc5d5cb2b16896731e75d20bcdedaa59570e49d8b201fe7085ecac8f63cb06f2511ebd817d137b5189834d19ee7d4ffae43eaf06d465a7
 DIST scite362.tgz 2368491 SHA256 
6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3 SHA512 
cb9618e962a16db7484e16a494b3da39f210250277e9772b112af5e16649b38f27ead0ec61664b1211c9263880cb7f3c34b5b32d94a4e70087fb1503805740c1
 WHIRLPOOL 
52a31f0e1518a9d8f6107aa22eead7da89e1d1ea6523a2aae57fbd7a3a8ecbd192c124c3d2550acea6383457763d6e501b14791ec6490a54379c5d13356e42da
+DIST scite364.tgz 2386959 SHA256 
6a27a1062b838e0fe914fb045f265935e5d39e34d69ae894b55f971437192baa SHA512 
eaba353edac23902a8f446fb8877f3e5dd43221e5289bc38941d76068a3f7c87602e9eb5828e6caafec56657d05b5268aad2a1bb36356a14154de3c22602c76d
 WHIRLPOOL 
f1b4c64eb4a5c6d6e73ffb3f457a5b5ddf8d31cf5f5778b204c05a093bcfb8e78e7a8cab634cf369ce29f200c11b933492f01c30afb268f581d465ed31157c88

diff --git a/app-editors/scite/scite-3.6.1.ebuild 
b/app-editors/scite/scite-3.6.4.ebuild
similarity index 79%
rename from app-editors/scite/scite-3.6.1.ebuild
rename to app-editors/scite/scite-3.6.4.ebuild
index f17d015..2204582 100644
--- a/app-editors/scite/scite-3.6.1.ebuild
+++ b/app-editors/scite/scite-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,12 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux 
~x86-linux"
 IUSE="lua"
 
-RDEPEND="dev-libs/glib:2
-       x11-libs/cairo
-       x11-libs/gtk+:2
-       x11-libs/gdk-pixbuf
-       x11-libs/pango
-       lua? ( >=dev-lang/lua-5:0= )"
+RDEPEND="dev-libs/glib:=
+       x11-libs/cairo:*
+       >=x11-libs/gtk+-2.0:*
+       x11-libs/gdk-pixbuf:*
+       x11-libs/pango:*
+       lua? ( >=dev-lang/lua-5:= )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        >=sys-apps/sed-4"
@@ -43,6 +43,13 @@ src_prepare() {
                -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
                || die "error patching makefile"
 
+       # repair and enhance the .desktop file
+       sed -i SciTE.desktop \
+               -e "s/^Encoding/#Encoding/" \
+               -e "s#text/plain#text/\*;application/xhtml+xml#" \
+               -e "s#^Categories=\(.*\)#Categories=Development;#" \
+               || die "error patching SciTe.desktop"
+
        cd "${S}"
        sed -i makefile \
                -e 's#usr/local#usr#g' \
@@ -55,6 +62,9 @@ src_prepare() {
                -e 's#-g root#-g 0#' \
                -e "s#-Os##" \
                || die "error patching makefile"
+
+       cd "${WORKDIR}"
+
 }
 
 src_compile() {
@@ -76,10 +86,6 @@ src_install() {
        mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
        dosym /usr/bin/scite /usr/bin/SciTE
 
-       # replace .desktop file with our own working version
-       rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
-       domenu "${FILESDIR}/scite.desktop"
-
        doman ../doc/scite.1
        dodoc ../README
 }