gentoo resync : 18.11.2017

5 files changed, 29 insertions, 208 deletions

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index e9fad0bf4faa..6079477f3852 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,14 +1,10 @@
 AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145671964a0c40bd SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6 WHIRLPOOL 6a0de80f0eb8479e54e644e8a729d4b45bba6b0ce2fd0662309ed4f6e70b4e36ff531cf23a220485e0ec26bb0349efe782279d9a7e66d1d54af99f3520a1de60
 DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d WHIRLPOOL c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
-DIST scite362.tgz 2368491 SHA256 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3 SHA512 cb9618e962a16db7484e16a494b3da39f210250277e9772b112af5e16649b38f27ead0ec61664b1211c9263880cb7f3c34b5b32d94a4e70087fb1503805740c1 WHIRLPOOL 52a31f0e1518a9d8f6107aa22eead7da89e1d1ea6523a2aae57fbd7a3a8ecbd192c124c3d2550acea6383457763d6e501b14791ec6490a54379c5d13356e42da
-DIST scite364.tgz 2386959 SHA256 6a27a1062b838e0fe914fb045f265935e5d39e34d69ae894b55f971437192baa SHA512 eaba353edac23902a8f446fb8877f3e5dd43221e5289bc38941d76068a3f7c87602e9eb5828e6caafec56657d05b5268aad2a1bb36356a14154de3c22602c76d WHIRLPOOL f1b4c64eb4a5c6d6e73ffb3f457a5b5ddf8d31cf5f5778b204c05a093bcfb8e78e7a8cab634cf369ce29f200c11b933492f01c30afb268f581d465ed31157c88
 DIST scite365.tgz 2391190 SHA256 dde62ebebbd4c36afd81ab0e745ff04839f4cfc911496f2d0463aade1374b9d1 SHA512 193dcb1f8787a7c7d520ce62462e5c95e7b6bcaf79f4ab23f9885474fb0444dbc5a69a0d45eafc592e5fff2a2e746a9aba599799e847e3c74d3436eed26580a9 WHIRLPOOL e79a2f05444c16f40f6c84fd252d3b71247a48f6af27f912d3f51de99b968c93ec505bc903aa4df407d1ff503f3ce35052004c46e3f7fe8502d0d0ef4939610e
 DIST scite402.tgz 2424648 SHA256 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283 WHIRLPOOL 0de24e65f718c49d183ee44520b7b46249dfb41eaa6d2b35e79b6b31e53c0f308c919c99f5c8b704a8d9d606e023306bcab4b3acd8339fd29e57d1a467bdc68f
-EBUILD scite-3.5.5.ebuild 2010 SHA256 fe32a3838989430db51902afd73fe0e8422d2b14164d8b85df5c282665d69c2b SHA512 c98244ce5d8f60cb6e5ebe26eb0b33184e24ce90b3723d723a39ed190907a312ca861429bf56fe6ad20f7d17033c1da250f5944b024faea0e476b18734142613 WHIRLPOOL 87e0967de779707a6ab62906cc12028a75db9fb4a96c0a9fe381b9a81e72103d61cf12122da491ca22be359f0d6b8ce93f6d85765d6b8b751f186945d4753256
-EBUILD scite-3.6.2-r1.ebuild 2230 SHA256 4eacbe7dda38a76f4eb98fa396e7caa34089c58fa863f36f36caef210e9edd88 SHA512 fd9322978cb183a70df82616ecb8767758193fb7e10727cc787358a46b8b2abc63c3d3fb048466b7b23254125d39685308b0b3aa5603d43c92861ffc8cfb6b67 WHIRLPOOL ad43959c9e1322c07703b07b1e9346de25797f1a61d9e26602e477fd96aa093038f58dbfdcc994875e96d30177d5f830d5170bd2b44ab0df4ab5e887f26b63c8
-EBUILD scite-3.6.4-r1.ebuild 2084 SHA256 886449b24fe229a72708bfcc9b5374737753cc9e6cbcecdcdf337fb9be4f8323 SHA512 a10149157d4365c3ba7f892b64f64d55679d49bd9683fb175b1489dae07e5efc090c9185b9de0615e9d7f6057eecdac04310a3b4a0df86200bb222bd0f9c3b1e WHIRLPOOL c5ee6237720a03d574d5a12935a0322c6cd7975a78eec60282f9fa2f41d5f5ebe642c03765d57ea6966533ed992deec243b46392d2e8dfb64fc446639e66adb2
+EBUILD scite-3.5.5.ebuild 2116 SHA256 d9c275294580a5f8172e8c36d31d561c1125ddfe076326226bdda223ee3f2978 SHA512 3cb6bea06bb846d448eb5643037cf961d916fdcca96efce4202fb4eb351741300f170b91c777831129dab523fc1644bf1955b586811cdb3b02dcd4a93a9f98bb WHIRLPOOL 5d150d6d8615124c5ed6f4eaf8d36d3401e76855af4ec374133da8210ae4fa9a8038f81e4128377b6d36dd36222efc378f2e171645188a0366bef82bb63db7e5
 EBUILD scite-3.6.5-r1.ebuild 2242 SHA256 9966df1c1c974ee6c29cd51c5324e2fbf650d6898fd2efabd0c97eca68ac2132 SHA512 1fa0330ecbaef2dd14b39eb5b285a6ce7db9ee227749675e9658d278b3c0cab26920f633525717e129e7a95ea134b8cd95aab839ea180c8099512d408c2c8969 WHIRLPOOL b6eafffc9fe83985bd1e53d6aae581b14e681ec6ea24b21d8ccd6c643061682fd1505f1b259765e83424240788f24d9e03c87b8ca37df862745c621feba4b690
-EBUILD scite-4.0.2.ebuild 2895 SHA256 cc762ff43346b0c35f4a9425aaf7cf6020f04ebbe68867820d579ad015890753 SHA512 069a6a6cb6bdd0bd825316454234f3fbe85aea0ae588d144bcac74a143c435094dbf8362334391e40f5bfe0184fc68df53e31c8e6b1fef782f54b2321f6b3e6d WHIRLPOOL f3224784eaf02733c8912b8b1646da3321f8cca7889d805e3c83c69d1c764235de1a54ca22b7e66df7ce391287adb7d32ba355680ed61503e362af4804060f7b
+EBUILD scite-4.0.2.ebuild 2698 SHA256 ea84c21c47999b0db46c76a0a33b7f6163699917fb87a51d2f0115835e402487 SHA512 3eb0d670b8a34f87ca2f7e8d1415f72884f07e5bb5815091db4380386b882b961ccf4273a0d48a1376cd32d8374f706e502eee9ba79bef83517f0c9ec6e0ec0b WHIRLPOOL 41f17a32e595afe70d21adebd8c6ff0140fd9b482707485a6c520c41c077194364796ed97402c285082d2dd14f1d18b229c65bc0855e06542b6eca4e9d29eea3
 MISC ChangeLog 5790 SHA256 052066d20930b18f4ae4d9f5c4f4697d85f8a4f6127a35aa919ac155215b6e61 SHA512 6c52a789ccb525626ba2965daa7c3dd3717ee02e7404906150051045e7262943614b41365cdd492a218d720e185383740c7e011928c1128a3eb71df434d5b8d2 WHIRLPOOL c37f157299b2411ed7ecfe0202bc4e13cc5911af0c27c092db1575a8bf5c014d715ee1ff0842601c2b400b2e7a570ea9fa1fa7eb877fd8a238da77d9edca8955
 MISC ChangeLog-2015 25317 SHA256 3b1310b98327bf4b23c3acb7d15f883cd0a9d13cf2b6f92f97259f2b43da9fd4 SHA512 1f3c941c3475a4eba7bd4e7ceb3993f6fb625987d6e0a1689d3911331574ad5d1ed6b739dfd8ffb28f9b8f1a90d3ffedf6ecc2040678964db2ad049d30d19774 WHIRLPOOL 9b99f277b6e4f0b049afd7135a452c076d985c8d474bb9db9f9f9e847b99c417bbb810ce8e03468e4e1bd79a3424210108a1f9302d4b561942f40bcd0c8135b9
 MISC metadata.xml 506 SHA256 276825e477f57a5363dec2267e32b8e51569f236fb5fb1065c0b4a3ac5ef68aa SHA512 1682078953211fb3ec2e86750fe62cbf8a8f309fa05452e640bd7ca70b13452d626b88eddf7f741e669e77d8676c4abe63e6e7036182bdc51a8bff57fa116b03 WHIRLPOOL fdba81194a76f645d23796f9c1d545e8da66bf7aa46e6966df8de9e8e0722a34db1481e06870caacae02534ba69da7c67eb4ddb341bf887cb2d008aa9a45fcb9
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
index e63650313670..e780172d8def 100644
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ b/app-editors/scite/scite-3.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils xdg-utils
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful editor for programmers"
@@ -82,3 +82,11 @@ src_install() {
 	doman ../doc/scite.1
 	dodoc ../README
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/scite/scite-3.6.2-r1.ebuild b/app-editors/scite/scite-3.6.2-r1.ebuild
deleted file mode 100644
index 3e957af42976..000000000000
--- a/app-editors/scite/scite-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gtk+:2=
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${WORKDIR}/scite/gtk/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching /scite/gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${WORKDIR}/scite/gtk/SciTE.desktop" \
-		-e "s/^Encoding/#Encoding/" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
-
-	sed -i "${S}/makefile" \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
-			-C "${WORKDIR}/scintilla/gtk"
-
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-3.6.4-r1.ebuild b/app-editors/scite/scite-3.6.4-r1.ebuild
deleted file mode 100644
index 204a7029a454..000000000000
--- a/app-editors/scite/scite-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.0:2=
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i makefile \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-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' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}"
-
-}
-
-src_compile() {
-	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake prefix="${ED}/usr" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index e8a034593e4b..0134016bc35c 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs eutils flag-o-matic gnome2-utils xdg-utils
+inherit toolchain-funcs flag-o-matic gnome2-utils xdg-utils
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful, highly configurable, small editor with syntax
@@ -35,25 +35,10 @@ src_prepare() {
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e "s#-Os##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${WORKDIR}/scite/gtk/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching /scite/gtk/makefile"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-		|| die "error patching /scite/src/perl.prperties"
-
-	# repair and enhance the .desktop file
-	sed -i "${WORKDIR}/scite/gtk/SciTE.desktop" \
-		-e "s/^Encoding/#Encoding/" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
+		|| die "error patching scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
+		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 		-e 's#usr/local#usr#g' \
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
@@ -63,7 +48,18 @@ src_prepare() {
 		-e 's#${D}##' \
 		-e 's#-g root#-g 0#' \
 		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
+		|| die "error patching scite/gtk/makefile"
+
+	# repair and enhance the .desktop file
+	sed -i "${S}/SciTE.desktop" \
+		-e "s#text/plain#text/\*;application/xhtml+xml#" \
+		-e "s#^Categories=\(.*\)#Categories=Development;#" \
+		|| die "error patching scite/gtk/SciTe.desktop"
+
+	#  add the ebuild suffix as shell type for working with ebuilds
+	sed -i "${WORKDIR}/scite/src/perl.properties" \
+		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+		|| die "error patching scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
@@ -74,10 +70,10 @@ src_prepare() {
 
 src_compile() {
 	# prepare make options
-	emake_pars="GTK3=1"
+	local emake_pars="GTK3=1"
 	if ! use lua; then
 		emake_pars+=" NO_LUA=1"
-	fi;
+	fi
 
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
 			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
@@ -86,14 +82,11 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
 	emake DESTDIR="${ED}" install
 
 	# we have to keep this because otherwise it'll break upgrading
 	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym "scite" "/usr/bin/SciTE"
+	dosym scite /usr/bin/SciTE
 
 	doman ../doc/scite.1
 	dodoc ../README