gentoo resync : 30.05.2020

3 files changed, 2 insertions, 59 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index cc254e45a627..0fdc557872c3 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,6 +1,5 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
-EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 7c6270263cb0089c883cdaf35c46ce99cde4b43eec2bdecf79317f52e9e191bcb5569009eeb3eddb0d94e874116c89e835d45c312dd65956c91ef0b3cc3a23ab SHA512 3faf32ae9cbb0a1551f6d1999c870ebb81fc398f76b513a52c15afe43f52976d1c15a6aec52de146ed40ebcc04bfe41aaa4557dd77b0825a09178a384001e02b
-EBUILD shared-mime-info-1.15.ebuild 1283 BLAKE2B 69ffee9deae212a9572f240f177cdb7adb7f365cb9391aeeaff29c2ffe59cd703e4161bc1ad8308e2802615e9c84306b58978b139a10b71ec7fc70ef175ab240 SHA512 d2e18b34cd0bdd9c35b66c1bbd422f84185d0fb424ac3cfdd9f01b5b812b0ebb083f81f85c6bf9d378f32b13ae8c3ddae89f3872cbd58540e812082f91d0ccb7
+EBUILD shared-mime-info-1.15.ebuild 1275 BLAKE2B 843273dca380f25bc9a10f0512acda41857d32576fe6c00fb2df0af74421f0a891a87239cbdb3dffe97cb2b2f162da37579eebeae61942812805877a244783ff SHA512 ef7eac6866dfe080d98d331dbd04ab3c967ff63509992051bf0eda894d96180cb12caa3c588d6237d44c23d7f926604e9af220da3739c9796e633dcd3f0d79c4
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
deleted file mode 100644
index 8ee394b44734..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info"
-SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog HACKING NEWS README )
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-
-	local myeconfargs=(
-		$(use_enable test default-make-check)
-		--disable-update-mimedb
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# FIXME: 0.91 fails with -j9 every second time like:
-	# update_mime_database-update-mime-database.o: file not recognized: File truncated
-	# collect2: ld returned 1 exit status
-	emake -j1
-}
-
-src_install() {
-	default
-
-	# in prefix, install an env.d entry such that prefix patch is used/added
-	if use prefix; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index 1ddca5fbe7d9..f6f8b023c364 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-util/itstool