gentoo resync : 15.12.2019

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 4e2b563a579f..8c1714aa1971 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,6 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
-DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.23.ebuild 1278 BLAKE2B 339f003d86658d055d84eea90216795c233a52709e11fa39441ffb6e635c8c3312395d4781a13e38b2d692f21e491481b249af542f6d5c0c8d893c9d168cd966 SHA512 c49bf596a2e77d4b7c1aba127834bcd8e73300d49478ecf5fcbaabee51b20b5c9b5711b8940b599526b50159cd15df1551307a559c55a4143de2cf52ca2c6ce1
-EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B e1913f2ef8fb7c69f949aa9d58edbc3038d1b9804f2dcadd245c7f74625e3eb1f98fb58d693c4cd87e7f59f5541c3fe84d3a57a2de16fa8f8f96683962c0018e SHA512 328e2ed90d83b6bd92c52701fdf469b5f8be5e4b7fef967cd5e203a36acc4ee2c9ff5e22d391cf68caa999978a37629a26f3b7b6cb2abc57be378d28a382da58
+EBUILD desktop-file-utils-0.24.ebuild 1276 BLAKE2B 323c5af708bd9e409c5505db430232f2038db06dcd55dcf066f20518eaa994158c4618dcba7c908342e83139befb9913b886836d7a8c67a47c1325747ebb9c5c SHA512 2e9cd8b796c3c63d7587b64d868663cb89abc27190b056d356b969ed9f93598c5538957d2a1bfdd3a44ad60f8f948c3a2692169dc7946fe05bc6a8e8bba2af9b
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
deleted file mode 100644
index ee934c0aec31..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common eutils
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index 709be3da1778..24dc06c97027 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2