gentoo resync : 29.05.2018

17 files changed, 79 insertions, 87 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 97cfb3622685..1f0048e27a2c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 1a400ff8c8af..90c68997bd7c 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -3,7 +3,7 @@ DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5
 DIST bluefish-2.2.6.tar.bz2 3793018 BLAKE2B f77b5e21a3289ebd2c9e3986476dca30e42ff489240adccba91a5aaa4a2e35282fb2b0a38137d249747e0496f410cd51159cdd7dc4e3b46a6affcb68d9b58099 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e
 DIST bluefish-2.2.8.tar.bz2 4097769 BLAKE2B f0e38841dde2e620fa2ea7390891f2c09f349d9861aeeef9b919dbdc67d7be15dd28852736590e99f0cd167feee3089df929e261e8a244f1301e130a3bad451b SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1
 DIST bluefish-2.2.9.tar.bz2 4082978 BLAKE2B a99db5acc2bce79aefccdf676a9ce965f682e99531790f20d6c67ad7f43c566009793efc4f3369aa425fc764dcf05f2a83b0260bf6531845cac2c707009c7967 SHA512 ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae
-EBUILD bluefish-2.2.10.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
+EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 2b122e7bc7e3759e37b9e64ff4a618f5fff15d1931bf33ae4408c870758c61c99f28c7303ce0d3ea8f12a658f85bc4fff28422beb499ef764905121dec0a7bbf SHA512 29663a481073d4d158e0c529479464019d4edc5bb0d639f2755d439bb30e86c36d0935a4ae9f9694c737e9b96a326893f55df6358aa47325d19b70a8f644e61d
 EBUILD bluefish-2.2.6.ebuild 2340 BLAKE2B ffa844212337201b9a851f31b6b47f0e53a79df5624b1045074e729610af1d7a03752bfd6fe1f9559c6ddf557d3d8b3c33dd619aaa2569059322eeff9d9ff1b1 SHA512 d0ff8dd70461bcfe97888ad97bcf8fb4cf8cec932eeb0ca79614ac612ab04623cc928b988bce0f9c301482371d21ceaf093b9e70e2f854a824b18c3655503dba
 EBUILD bluefish-2.2.8.ebuild 2605 BLAKE2B 25c8fcd77c7b717e2625e5c59f20b443e710b92e44d0ac1b59416e410b5bff6b38cf444be6b4ef8249717dc5bc36189a300d17730cd9924918e3a31214bd2154 SHA512 3c096bbbdd8b77c18f5b92246f6d4ac6548c0499148c3562e9a308a45da602f236c1595a1534c8141f5d123c2c3d277eb6f9ff634a60054e852aaf9a7a7df065
 EBUILD bluefish-2.2.9.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
index 2e9a485511db..1b0c1d0173a7 100644
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
 HOMEPAGE="http://bluefish.openoffice.nl/"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="+gtk3 gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 87537972626e..2c518a7e761e 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,3 @@
-DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.91.ebuild 12719 BLAKE2B e9cb6729ddf5a5dc39e83809c627ec70a423368705751bfb330ac6a275fe97645413cd9bcc0e66c29b89d66225f03101dd40494adb090a2b6b717b4e5388d913 SHA512 9a661682ef16a2faf92cbe90dda4265b2b55d72d1a8c6145f9876bc9ded3a943e7c8d985f3b19c9d8b0c1f4898eba21f6db969656c05354654813db43298f8e6
-EBUILD emacs-vcs-26.1.9999.ebuild 12773 BLAKE2B 2fc2d8356806514b478bd61d51a742e11c1d474370c87c31ee2240a9ed0b7b62f451781a65e0f246ceba9b64723c5ec947ae225e116438e2930a296841f7e6b4 SHA512 d0208781658d7b79b97f57db2fa4c7b24a07c1a3cf53dfa0a76a7a1ff37339cf0bbd879a8e8a133b87d3b6885680bce67bb294d83e95376223f74f57219ed578
-EBUILD emacs-vcs-27.0.9999.ebuild 12717 BLAKE2B 28575bb2bfc91a316bb104bcd39b4537d405fb58555c6e56c07d872af65f9795f66f94942ef1cd323305c52f761f362534ca230c7d18af55a56389b8ac923e3e SHA512 e30eeb7226462a7eaa6f447b18baa552fff74a88cb8e7366ecfdd64fe630f7d510155fb34f0d04651ab6114607e0e160a6e584e8e60f9ac3219e10d102b4dbfb
+EBUILD emacs-vcs-26.1.9999.ebuild 12780 BLAKE2B d1cd16d616bf716322d37714653716dbbdc20ceb26ca0ada0e859f57bac434bf7b67d0d767ada655786e6a5216926a042a2363b0b70cb4c49c63baed17c4df9e SHA512 2ef9daa2a935a8b2ac1fa74f809373727f9d58d2a61ffef5dd18cbeedb6863a94e78acc618978a64657a38e3a21946b14e993b1bdeaa5ba94564988e942b4a39
+EBUILD emacs-vcs-27.0.9999.ebuild 12778 BLAKE2B b7212e209607c5e527c49d82591f234ce42ea3ab1d7a5979ae3d7e3594de58c5e1634bd7768e56d56f542b303a752229ac217d2ede09fbddd03c652d45846f2b SHA512 2c1a2b10dbd180517fb75fe438caf15e9fa2493cce2a6b04f1e4abca56dab19a63583e9a8459cef61a17ed9f6fe54e5206c880b1507224306982604c3c6c0be5
 MISC metadata.xml 2799 BLAKE2B 0b1f8190aa0a7884ce80e712caafa063e053e5b100bbf56ca97156e1b99cc32bd22caa20297ca0249b50b3991444b05d33c49051eabad56f20e799fd6c5e7d54 SHA512 cc0a8ac18f7366e0384528b963c9f2de4c6faabca3cfdf4abd92456feb70454c95df125ec0648806614ac0daaabf198acad0bd349295bf7b01b159db96fbece4
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 2db8dd4b76f3..20578fca5aca 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -40,6 +40,7 @@ RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
 	!mailutils? ( net-libs/liblockfile )
@@ -119,9 +120,6 @@ DEPEND="${RDEPEND}
 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
 	sys-apps/texinfo"
-
-	RDEPEND="${RDEPEND}
-	!=app-editors/emacs-${PV%.*}*"
 fi
 
 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
@@ -259,6 +257,7 @@ src_configure() {
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
 		$(use_with mailutils) \
 		$(use_with selinux) \
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index aabc1c6f8936..b8ba118cce43 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -40,6 +40,7 @@ RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
 	!mailutils? ( net-libs/liblockfile )
@@ -256,6 +257,7 @@ src_configure() {
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
 		$(use_with mailutils) \
 		$(use_with selinux) \
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 4221e08c46a2..ea648678f9ac 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,9 +8,11 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.1-rc1.tar.xz 44010228 BLAKE2B c7d8d19a8488a88f3eea4dbf4c545de75956b6a82735826d15b603568577fde8019d7655e936ab60bc61e397f3db074e26d5a1d58534714fcaef585fa63a7719 SHA512 bf5a9fac61f024406b050037505c14c83db95f24760c2e32aa8f7e53cc8c2781883af0c3ffe820b039a9444a10e7fdcae7635b7e3c383718de22d77e7ceabe83
+DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
 EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
 EBUILD emacs-23.4-r17.ebuild 11421 BLAKE2B 88c04aabc068027d0ef6d9a1199d22c90f7b400e9b88396d04e39d8d7981c2601fc08c0881f1cddd310b47a1dd8122f80f2288f9a30eb6f08b35f7b2591e7903 SHA512 d59446d471cc210bcfb20b0d8c0553eb8a47109c301fe6f63de2fa5ec93536e76684619ea6e19dd8543cb52918eaf21569711b6cf4b65dc22948e4171d2d09f0
 EBUILD emacs-24.5-r5.ebuild 11139 BLAKE2B c85b922bae742dc6ee475a937b000e0900d991379d65ade60e20a3de7a9adda271707945b9f543df7017c614a0f30cbaea5c57fd5b4fd7699bdc99f8b7cff468 SHA512 9539a8a4fb5032992cfa6d4a972a482e5015291895412faf4d2923137c271a665cad25a38a2cd3d43fa3535c62c82b4de5a45ae8ae72963ab90cdbf710d1bac5
-EBUILD emacs-25.3-r4.ebuild 11627 BLAKE2B 23edef4da772017396644284dc4753aee0d7aafe04edc5d771e89a1f00797203039d34762a2470b464badec775bf080a4aa0404a529eed3e4ecc752077ce98d2 SHA512 094abf9ed2747bd5c8b0d9120b72f6e6aa11a21a4a3c40d237fced802035f7057999995067915a5995b750faa4041bb93e805a8c2a41b9deabeeecad9cc144c9
+EBUILD emacs-25.3-r4.ebuild 11630 BLAKE2B 765d1ed69b11ba40726443522b0d620cea9b78b838a10d404e3d73366aa26de5801d293be006e5899bdbf6ad4164798dd96c389e935182dfa0c1038339eedbce SHA512 6909cdf101f5858e89e8f0df7ee507f84b7818e55ad5d06f35d533eb906627b57df8992768cc5fa845746fb897269aa3c2d9cb416d776233b9916e7cb4f5defe
+EBUILD emacs-26.1.ebuild 11997 BLAKE2B d6c4e7936d79816231d36c87a10e71c75705b9095b08d1cd8e5b267909997ac5f6dcee7cdc0bcccbcfe344f768461799292a3ca498baba7fe56b382053a63769 SHA512 31134efc2349c475dd4e6d02ca865c87a90dcad9804bbe41a90036de51b819b015d72769b9783d0fd3bdb937ba04496ee95da4b75430ca6ef5b661e0fa8b0a40
 EBUILD emacs-26.1_rc1.ebuild 11961 BLAKE2B e11b2e6958b8586a38a217232e341a817df6cdcb64418462ba3f674f20f145c820bb60170c12b597b3785f4fe914764fcfe87fa94372b9239656626544ccb943 SHA512 34c5da5bd5e82839b7552aba929f8eed35c868a46d968b0e1189f6b3549819b60d012e373d19fa659461ef9a116bc911eceb138376405e31ba0ae314285e4179
 MISC metadata.xml 2741 BLAKE2B aa5276abe676055d9ce3a95dd3ab9208ca1b03676854a26e0309907c7d5aae466cd2746b43db6d2303bda2d1fd650191cf87c8cd983a040d66c9e57dfd59a830 SHA512 136a8328c80529ff045dd183770e629a6a0e9fc0b49258e994023636ec917aea1477be60898b86636071a94f9cccc6e80b06e173c15024cf3a794a2d0f968335
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index fa65731efdb0..c6d29908c41b 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs/emacs-26.1.ebuild
index 157a7ec760b0..09b6c8355e7b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs/emacs-26.1.ebuild
@@ -3,32 +3,16 @@
 
 EAPI=6
 
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-26"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
+inherit elisp-common flag-o-matic multilib readme.gentoo-r1
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -40,6 +24,7 @@ RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
 	!mailutils? ( net-libs/liblockfile )
@@ -116,33 +101,26 @@ DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 #	pax_kernel? ( sys-apps/attr )
 
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
 
 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
+	#eapply ../patch
 	eapply_user
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
 		|| die "unable to sed ctags.1"
 
-	AT_M4DIR=m4 eautoreconf
+	#AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
@@ -256,6 +234,7 @@ src_configure() {
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
 		$(use_with mailutils) \
 		$(use_with selinux) \
diff --git a/app-editors/emact/Manifest b/app-editors/emact/Manifest
index 0b0190c10789..a21237fe622a 100644
--- a/app-editors/emact/Manifest
+++ b/app-editors/emact/Manifest
@@ -1,5 +1,5 @@
 DIST emact-2.56.0.tar.gz 578640 BLAKE2B 2bdf0a88003c0cbd28153737eac588dbb068ed99a1166dc66a5fac33f91d2b3c7e058518733c6eddbfeb3291f3ad89dd4a6bfc4b11ccda0963a314a5fbf4e2b0 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d
 DIST emact-2.58.0.tar.gz 581248 BLAKE2B 9be43cfc37973d683c5c824bf2f2d60d0ffab2791c46a4082f04d83fc705713d5806608e5802e786be4ced4b008842c5c6dca60b7a30c5483b29736ccc21ffe5 SHA512 43108d0bc1989ba6e11f12e86ad5fa4e0b06dc2cc11f54a8b1ca548bb91d2d201f62ffda5e8c11ff75a724229ca1a2ae3e2f439ebc62e1fe3f484f811a88a2c2
 EBUILD emact-2.56.0.ebuild 605 BLAKE2B aaff4cc4d961a4886aed31adc6a367783b344aba442c569ac4e573e3fdcbb71db1caf08d2f6a2d02993db42ca8e86fc6fc0494a20b995abf78d604c2fb990aac SHA512 c1b0ba7d6eafe7e177e412eb7310aff4ca2244c28099e05d38ec668346d3e518cd79b271e9204cfcbe0e9d654a2302105c8288a7b9eacfa4fde395c11737874b
-EBUILD emact-2.58.0.ebuild 537 BLAKE2B e490d6d41e27d98eb5b8a5f94bf8c54aa63a2189622e0587cdcc7a5259870f4d30343d5e6fa5eca133888efd4bf28984868d0cd52d7be596d07d36ab2ac48a14 SHA512 de9cbd218952362a79b705d6afd672925c03905ec3cd421435cf67e143b6f2f98ef46cc1df9d3c37926c872606942d9320c0af1e60a4eb88bd5ced052646046e
+EBUILD emact-2.58.0.ebuild 535 BLAKE2B aad06c8aa38848e686baf904753ad0c69dc845bba57ef6d14c879994c304e066c022c4efe8cd62a2bef2ddc52ac627e21a66f7f3d0bbb90dab2c6a4f486d62a4 SHA512 2825597c48b337f3a1a22c8f085203018f288805006177f054d94339394b0af1370129fb6e7aa31775e60b29032f52374541ae0d6bf5420fec5e4e0572687a15
 MISC metadata.xml 1356 BLAKE2B 6038a2811fe4103bcba606fe464c1ca1ddf0765f064507d84aaeaf92f92de0c51ca4d75a88a32576a50631f694ad2e84d842602c50f03a2e9ac9ee4b8a0a12e4 SHA512 f376c46dc531f259dda9842b817c5eb040c4c2f9ee811e728770b660e4af1b8d588081e34bd3149c88fbbfbb976cc6cdb3013a8c8a5ae488a198a9c3ac10d75d
diff --git a/app-editors/emact/emact-2.58.0.ebuild b/app-editors/emact/emact-2.58.0.ebuild
index b2f3b4a4d8ff..6e0ffca331b0 100644
--- a/app-editors/emact/emact-2.58.0.ebuild
+++ b/app-editors/emact/emact-2.58.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 344160d63769..11910bc8b030 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -6,5 +6,5 @@ DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a91
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
 EBUILD jasspa-microemacs-20091011-r2.ebuild 2115 BLAKE2B 007a275b88257cc808c872a7e659851f13fbc0916d4b8c1789e0e83fcf849b9bc317819de2e9785e240412bd967f6eeaf2f7d403399b28f102f07cbd2c6bd17c SHA512 ae515ed70c9b13b891de1cb703323555df57a7002a5aa69815b7f50aaf6f4e11bb155aaeb52d4cd60295a4d27e2cb50f5b0d8a3c61e99aa33bf01bb13986576c
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2322 BLAKE2B c0f6dfda03b15f0a1b308b4e0a78ac18b2384fe4b12f751444319c8285dae66b53ef2290e0c0b1e37f29cdc60757db295f0480502fcc33477eb869a0bebe16f3 SHA512 2e9575d8093c8208ad41ecc199fca54cff4ebaf7c603fb3aea615d9f5fec0366ea9d4faa263f5a94a3c24c5fbd8414ad0939b1edbdb29f01767df127ff93e416
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2320 BLAKE2B 84f10a15f19a4b975bc1e7f00434d1ffd32584880e6ac6af6d10630a91428a59d2492e4029131fd7f632dab82631e4dd4eeefe7851b194b19c88728c9c267f56 SHA512 02ddac3732dfbd004f260ac85de8d7aed06dbe060d030b8fc30a582a13514e7cf5793c0dd41eabecd02c1c85ba3cfae327d56afaacc55650e3c75c9cb069a878
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index 770b292dd3e7..5161fae32501 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="nanoemacs X xpm"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index a1565bdecbc4..be2c9191f3bb 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,7 +1,7 @@
 DIST ReText-7.0.0.tar.gz 203294 BLAKE2B 613004d9e2aaba52e25dec49270ecaf429f5c9dd27041cf09c8b1eefca59e2116b9904b49f260c6bc2528d65fa846a0cd11930d05297b8567e69086376d411a6 SHA512 0a2e430659e7d87d50780fecbf5f04f852f144d143ec83b90126ab9e7b8006756cbc8710c9cec192ddad2cba9f7236e684fa207e308c565388ede308da3c1a35
 DIST ReText-7.0.1.tar.gz 266582 BLAKE2B 9a2bf5ee433550b9df777fc65254bf52097730143e491fa52b2312709473905caf45fc63fe96ac04adb94bdbc9ea8e8840c4e5d65cb0da25727d3cdd198d2f97 SHA512 eb6b1f6df1e490d9058f3431c023119afff05e81917bb5402a35a100538283a157d2853d10c015a415a5d7e78aac4a2489307a0ef60004d48d8b1f9207a07567
-EBUILD retext-7.0.0-r1.ebuild 1470 BLAKE2B a0a6cdf241965410d025bb22c44a4cd3b16d3336556a31a4e6dee8295b9ef716228537dba277098bb6e4580726db8a1f70e9773371e11ed3124943bfb6264493 SHA512 f8ac87729d3d365d25558b4a76d310f9da289860cc96c18a7edb1849df919fe7d51ee38c3bff63d8b2eaba4f98e79c19107569780479349a8e42b729903756b1
+EBUILD retext-7.0.0-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
 EBUILD retext-7.0.0.ebuild 1369 BLAKE2B c5d82c6765b7b5d66d44ab3a71221b764be3694207256ee922a08911c34eb6d2ab8e6648ee483da73c171ea66c91c9e8677ce83421a7bdc7361136d5c6bae37c SHA512 6c5bed210a70800b32ae1ae9e57e36c47a622982b505ec195e4120e2dfc5f08863bc6e070c8a3f1978430f3473d2a9ed7f54fed474c6caac50ede0141df8afc4
-EBUILD retext-7.0.1-r1.ebuild 1470 BLAKE2B a0a6cdf241965410d025bb22c44a4cd3b16d3336556a31a4e6dee8295b9ef716228537dba277098bb6e4580726db8a1f70e9773371e11ed3124943bfb6264493 SHA512 f8ac87729d3d365d25558b4a76d310f9da289860cc96c18a7edb1849df919fe7d51ee38c3bff63d8b2eaba4f98e79c19107569780479349a8e42b729903756b1
-EBUILD retext-9999.ebuild 1347 BLAKE2B 951015c52417aeeb31b45edc78b5c64158f8881b8d51f69e49141fa69a65c444017b82b3711574b056f94f1c6aca34481369b224e753188d43b131f7146471e2 SHA512 9021067fb94c42b12e9c8ce56a08df61328393e7586e9014408f73a2394b2c592845781de8f4651522c0d50ec0f338d8dbd4d7354825737057f009e585629238
+EBUILD retext-7.0.1-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
+EBUILD retext-9999.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.0.0-r1.ebuild b/app-editors/retext/retext-7.0.0-r2.ebuild
index 00f57b4e518e..b69ab5bac2a4 100644
--- a/app-editors/retext/retext-7.0.0-r1.ebuild
+++ b/app-editors/retext/retext-7.0.0-r2.ebuild
@@ -7,18 +7,26 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
 
-inherit distutils-r1 virtualx l10n eutils
+inherit distutils-r1 virtualx l10n xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
 
 DESCRIPTION="Simple editor for Markdown and reStructuredText"
 HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]
+	then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+	else
+		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~x86"
+		S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+spell"
 
 RDEPEND="
@@ -31,8 +39,6 @@ RDEPEND="
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
-S="${WORKDIR}"/${MY_P}
-
 remove_locale() {
 	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
 }
@@ -44,12 +50,7 @@ python_test() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
 	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
 }
 
 pkg_postinst() {
diff --git a/app-editors/retext/retext-7.0.1-r1.ebuild b/app-editors/retext/retext-7.0.1-r2.ebuild
index 00f57b4e518e..b69ab5bac2a4 100644
--- a/app-editors/retext/retext-7.0.1-r1.ebuild
+++ b/app-editors/retext/retext-7.0.1-r2.ebuild
@@ -7,18 +7,26 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
 
-inherit distutils-r1 virtualx l10n eutils
+inherit distutils-r1 virtualx l10n xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
 
 DESCRIPTION="Simple editor for Markdown and reStructuredText"
 HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]
+	then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+	else
+		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~x86"
+		S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+spell"
 
 RDEPEND="
@@ -31,8 +39,6 @@ RDEPEND="
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
-S="${WORKDIR}"/${MY_P}
-
 remove_locale() {
 	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
 }
@@ -44,12 +50,7 @@ python_test() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
 	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
 }
 
 pkg_postinst() {
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 68382ad9fb77..b69ab5bac2a4 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
 
-inherit distutils-r1 virtualx git-r3 l10n
+inherit distutils-r1 virtualx l10n xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
 
 DESCRIPTION="Simple editor for Markdown and reStructuredText"
 HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+
+if [[ ${PV} == *9999 ]]
+	then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+	else
+		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~x86"
+		S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="+spell"
 
 RDEPEND="
@@ -28,7 +35,7 @@ RDEPEND="
 	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
@@ -43,10 +50,13 @@ python_test() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
 	l10n_for_each_disabled_locale_do remove_locale
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
 
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+pkg_postrm() {
+	xdg_desktop_database_update
 }