gentoo resync : 10.09.2021

4 files changed, 2 insertions, 119 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index e29d74ec7bf5..9fca852fe9f7 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,10 +1,6 @@
 AUX shared-mime-info-2.0-pkgconfig_install_path.patch 623 BLAKE2B 3ee4845d1c8c7c0b8d63e2b4948fa8bab96b33addd2d4b2ed7dd86bed73b1e14bc4d2cab80308a7fffe56f49f6d14503bcbdf62ec695512d3d1fae5dc3ff3d9f SHA512 b1472ad604b7c5770272dba0a41fcf5e828218db84106327b7b04b3c947e80aa667c4fbcffeeb3b6922eea0f8c929278beef811604978bf6d3bb028239790266
-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
 DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
 DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
-EBUILD shared-mime-info-1.10-r1.ebuild 1743 BLAKE2B 454800b6e2359ee8f1a678d0497baea36b92335848e58925d8e06eacebe96f15df98d5a9353f2d86edbae7d73d53827ae2bf25c482bd8efe4f2ff434cabf1c05 SHA512 0ed8d32a7f7a52ffc25890a29ccdd8af40f0918615470f8601bdc6168ba0742dd93580add2474a89b85a37f22e1fbb26033b6d8123b8d75ef830955e041e2bee
-EBUILD shared-mime-info-1.15.ebuild 1251 BLAKE2B f440b95e59aa1a35728b77c6403dea957e667989faf8b7170cea87ed9a0f50f192f1117c5b55619338c54f38123f1ee187ad7ef70bd7c5175d20e94e3a0e5a3e SHA512 ff77cd50dcc6d3759c8f4a7ac251edd56e6dc6dd63d39a54a546f92806c2025e274b3b989b3859c0cdf236266ec4caa056f1fc3bff5366197ada1bb90502fd62
 EBUILD shared-mime-info-2.0-r2.ebuild 1342 BLAKE2B c4cacac538e5344cf145a411f21f1a71c6b1c9b94a6e49bd698e9589a4375dd2cc2db88a53dffba02f690bb1ee4d19297d57d570c121ebb1b34667065f605191 SHA512 49f91beb5326b84b4f88ddbb4766c1f0ed9e01e3a232777c92a3f611a1d03ab2a789cb7f61e2fc8d97d880fdd92a8bbc2ca0c4e14f908c4894dd08e68272dee4
-EBUILD shared-mime-info-2.1.ebuild 1280 BLAKE2B f8d118b1046a921f456dd30bafa685c2c9de5c46436401830d344c566b48d18e05e484dc3a31cbbd6ec2984cd8fa6ecad5a128201a075c7ff689d708e9988322 SHA512 076c5d4efd8967bfa37dc79c5b9d5e03641fa730ad54816d0de11766e5ca217215050cad6f767c371a47e38e8cb0aaa46ccc24bc77f976ca02bceceb72a94ee8
+EBUILD shared-mime-info-2.1.ebuild 1273 BLAKE2B 5046f5b56b990c48391f96c813060e8e03b2083550022a2f0991b256e36a58f17624e2915edd4969838bafacc5f8f6c8031999dd6bdba4675232f5351957f33c SHA512 3d30ac8c336509c8aaff2c7bca200f6eaf9730940493a394254b1dbda887d1d6a3fe7963408ca48c7e4029295efa176f9b41382755f5c136d1044f23b874e4ca
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
deleted file mode 100644
index 30f6230d919a..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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
-
-	if [[ ${PV} == 1.10 ]]; then
-		# https://bugs.gentoo.org/684884
-		append-lfs-flags
-	else
-		eerror "LFS support merged upstream."
-		eerror "https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/20"
-		die "Please remove LFS workaround."
-	fi
-
-	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
deleted file mode 100644
index 5af6d1e9416d..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-HASH=b27eb88e4155d8fccb8bb3cd12025d5b # don't forget to update on version bumps
-inherit xdg-utils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
-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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog HACKING NEWS README )
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-	econf --disable-update-mimedb
-}
-
-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-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
index c525af2e6711..34eafa820dcc 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.1.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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # requires installed xdgmime binary
 RESTRICT="test"