gentoo resync : 16.06.2018

3 files changed, 4 insertions, 84 deletions

diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 7e2904ed068c..a1b7a792014c 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,8 +1,6 @@
 AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475cf156ed5952d2995243086f276aa3dace6382ba55a47cc83bf4b06da60d1363ef5fa4b815adf159b682629cb87dc4030211fae2 SHA512 a9c1def45928026cbc460527862c73e78074e924fdf088c20afeda74c64103c42f9c551123bee3e627f0d41be632c4f4d250722719a33de20c88085d1d712b4d
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
-DIST xdg-utils-1.1.2.tar.gz 296735 BLAKE2B 0d68fee2581075ca4b6beb0f7db77eee76d30afe8e8a3da904451f3c8e1a123f2fa2dc68aa15f7697f2ed532ffc14122cae308776b559c628751514e063ba11e SHA512 1927506065788b5f8bba8b0617a8ee585265342fa40c4b73000d320acd5909036daef94d49495b00982dbb67b7706b2f1ed949cb4cc519dfa534be2c1c8f74db
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 EBUILD xdg-utils-1.1.1-r1.ebuild 2222 BLAKE2B 5074042cf9a2538fb9183366831424808342ee66d5211dd1fee1a52f366d119ad78d689d748dc9642feec470ae7352c75d084e5e1e4bf325dad9eafe4372cf8e SHA512 4bacdde96a5be5a1c4265c83ac17ad0342021fb14e7e4fd2ee9009614836891bff4b14571f497fa1f8c1b39e6d2476065a44e5dda337360aa092b91a0756764f
-EBUILD xdg-utils-1.1.2-r1.ebuild 2217 BLAKE2B 5ce80e46b49b70c79a5eb172737f31b592c674824c250ae865deba7b52e166a5b94148328ef89825f9fe4fb2032b1e5d29b7d23d45434087eacd30f2d929dfa7 SHA512 9d7be6be2ba5d7edf823f4ebddf3d922b92e813e9ddd18cc5c43bf298e75a828ea82352cdd50c5290250dc281b97369bea95e464f989e55f6f761ccc4ee1efb8
 EBUILD xdg-utils-1.1.3.ebuild 2223 BLAKE2B 9153c33784772b40796b5c35abe03dc93a7b025c812ff5fbb26636dfb70d3b227f448e8e672f187b18dd6651c7ffcf4abb7965fff576cce9f545e43f6afd0b5f SHA512 1aee4d905c11ea039569bf330d44a33889acf84e6a88688f24ac31d27e93c143b94dd5129f4cf6fe07db2c2f7c91cbfe8ec70e23131704b674462f8b161a087f
-MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
+MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index fb76b944f2da..95e86c12108a 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild
deleted file mode 100644
index 9856867b8fb8..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-#	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dev-perl/Net-DBus
-	dev-perl/X11-Protocol
-	sys-apps/dbus
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	if [[ -d "${WORKDIR}/patch" ]]; then
-		eapply patch
-	fi
-	eautoreconf
-
-	if pushd scripts &>/dev/null ; then
-		make scripts-clean
-		popd &>/dev/null
-	fi
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
-}