gentoo resync : 18.03.2018

4 files changed, 2 insertions, 116 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index ff5b4a9e16ab..f7faee994609 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,7 +1,3 @@
-DIST shared-mime-info-1.4.tar.xz 537916 BLAKE2B f5d3d31717892134ee09d655f9c699a56c2f5abb09163a7ddaf6a31d2a2f4f70c5e72c24d5fe2cce1dbfadb323c7476b5e2e1abc954bfa8105a415ca2af98db9 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582
-DIST shared-mime-info-1.8.tar.xz 589444 BLAKE2B 35770d4c888188caf746d6fc40dc2bae66ce86d7620dfc94089f7f9a5bd9f1a1a278fb73c2c6e8e6ad6aeb380351649a64ff15ef9488f5313c1c19ff5faccdb1 SHA512 e3fd57898ca85033a29f17d075b9a18a6ebee14db5f996183fd1183a6c6382c3d10c74cd1863563cd031359937ab95c886909ba6f9d7ecc8f2056464673b5fff
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.4.ebuild 1456 BLAKE2B 120be0b566cd28cb5ed2bf3686008240589c070733a9a49443f0aaa27788fd7ebfb68cab1d608da70747fc13b750a77c7f0aa5bf58721469bc2b417956a8563b SHA512 67fba704d60ff0cb1a4e69be76e6d71075a920ea0823f25df8c90c8a90ffdfbd13e9158031dcaff7d03771c61a017d07cc123391847c95e4d089d34f4c202834
-EBUILD shared-mime-info-1.8.ebuild 1505 BLAKE2B 2630731362a57f0ccf546a12b7928b4c282ca6894afdf067cdc497571ad6b44d53e9ace3113c08985ab7f98c1eb713046e2276353cb56bc651d815247848f438 SHA512 b34cd63e350ce9ac08c79f3ef487e768580747c04c225fe3ec01c43ebe722221a21cf4c8ee9e044be825d93039f4ef2f273b6533645cde240b781907cf011775
-EBUILD shared-mime-info-1.9.ebuild 1474 BLAKE2B ef61b32980b2404bce0875c473a24c1d935f83427934ffcde48398b2c763fe1fa11cd8db6df18895c79a7b18fb56d5251cc3291c01a4a0fc82923d32ac091ca8 SHA512 46060e969f8a482e91d192fc34ad07dc441c79c7ebe39c632f37fb1ca661c5c345dbc7d5d50074ad887e3a200e947d91d4c6501823592bdf491356e1a7caf97b
+EBUILD shared-mime-info-1.9.ebuild 1473 BLAKE2B 754525d50ebbcdfc61cd7388d1c810b5525694488d3c2e0bbeb211786cf84a277930b6c5523e70cd1271f4dd3b1cfb4ee02e0c028fea203838dc84e700a87f6f SHA512 552060d701dddc62301e9def4e2c18b14a3ea7cb3137103d1a1884e7df4708c8938a3135d3fd0483e1298f63a233d8d0086a9feeabff985d7ff31cc01e90ac60
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
deleted file mode 100644
index 21f9b12cdba5..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fdo-mime
-
-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 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="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
-
-	econf \
-		$(use_enable test default-make-check) \
-		--disable-update-mimedb
-}
-
-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
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild
deleted file mode 100644
index b6f816edb722..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fdo-mime
-
-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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="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_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-
-	econf \
-		$(use_enable test default-make-check) \
-		--disable-update-mimedb
-}
-
-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
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index a0663875b504..45d4ab96953c 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ 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 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2