gentoo resync : 19.11.2017

4 files changed, 2 insertions, 144 deletions

diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index c429fc112156..9db0c1d6a26d 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,10 +1,6 @@
 AUX libsfml-2.2-no-docs.patch 432 SHA256 7e31edbe092460b564c04882af42a6e7173dc01f5a21ba1ac9fe0c6b31892b59 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807 WHIRLPOOL 0d2320ea49558e2270603ba13c39d56bb0a50d8a9da4ed0d087b6ef5d485b8fab775ab38648cf07970160fff18602dc2c47f25941972a751b3e300aae17ca02a
-DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
-DIST libsfml-2.4.1.tar.gz 24573418 SHA256 f9d1191b02e2df1cbe296601eee20bdf56d98fb69d49fde27c6ca789eb57398e SHA512 50b2bdd914faccb9e44409f7a3b20909efef034be15e298c34710eafc52b36494272e4f5f9c882516fa1312c2e2ff3ebff0dd5246f193724ea6bc5be9ef8530f WHIRLPOOL 2528c1906c085f9b574414476f3f5ec5a85bc358c57dc47b91fe4c8a5398a771893825a6ad1671f8fb144a6f13634bfa5f186a2b34b58e1e405eac25677b71ca
 DIST libsfml-2.4.2.tar.gz 24576150 SHA256 cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 WHIRLPOOL 6ea18fae58ab90235158abffc1492eccbdd8f8173a6c5ea3a55b447a47d75ecc53a4615996fff16f9e826e417a7d0028cf9366aed6913aec5fbc5d9c592054de
-EBUILD libsfml-2.3.2-r1.ebuild 1445 SHA256 90dfb8fd1771900fd54849a80a88bda15def4296750229588819b5648c9d155b SHA512 17fd32d0bfe2cd4e4a1c6d835a15b9551dfcc867d43923457f4388802d4eab818c2aed2a99c8183dde507532f6da47ae6e062859677569e1a0c23a57c2a46862 WHIRLPOOL 203684b942931bf37eeb20748662f57c739217f8b22c067a541e4e4b2364c09363a48ea8ef81a3061f4ad1c0ade5a978587247e7f3832d6226ad0f4c8424b607
-EBUILD libsfml-2.4.1.ebuild 1485 SHA256 7042f4dbb4db273ea43b43a474bc2cdc0375124f19602f9a5bdfe1df3ee22ff5 SHA512 a9085fb18cd0f8e6b96068a0b402cac838246b30b7850bc91ded4edfb6ec94daee75c67a706ff39f342c2b6b1ff2a24c1a7ceb381cc990c1342254560d83826e WHIRLPOOL 397398f60a796667267d2a5eb252cef538e09c83173d3e0ab1515feda28cf21d76cbb72fe051e9a472b672379f8951339b53a20570f53246c132a4ffda6453c0
-EBUILD libsfml-2.4.2.ebuild 1489 SHA256 3704a0883042d6c36fb41a235c7bb180c6764984c65d2e2dc1d2d178d971bcfc SHA512 86ce3db45ab46bc886fc1ac888746f08c1c1db05ef8a69d5f9a11f77a8ff9a114b921aeaac409db990c3ee6e2c4832dce70bd1dc5835a148b30cd766c33319bf WHIRLPOOL 14e3a38421b7135bd58b541f12729f09255f2e274d81e5ddd3db9f869bff3a786070196d2507372f6f41cde0ffeec7cc22608f29bc87bb3449124ea1656af689
+EBUILD libsfml-2.4.2.ebuild 1488 SHA256 c553c443317d2643cb7a38b4ecc87aa491915273bb9b6e5b5713e50b8074279d SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea WHIRLPOOL db2c540667b47c2575c7abd106f2801380cc2a590292a93b5f3e6b7ddd5b0c60e789bd7fcb09a31c5b42064d4ee510273a675d4fb6019488ea70333b9daf32c6
 MISC ChangeLog 4688 SHA256 5dfe3f7a8cd794c3821da216582fee277ebf5bbebdabd9594c2c38368efc46ee SHA512 64a0589b8e8c839e1a7ef6562fa754207008e5bbce9effe1f193d2277b523848128a8e6d1e56f5d07d05188d290f082376a6dd85b6b8953255d44baa643c0392 WHIRLPOOL 1869c0ad431c2ee5694fb1603a0af383bdce9313557fa6229d9e5528342772f69e7e5e333b583cc6cf6b227a59fdf93468663ffeb8180528883e3d945ef946ff
 MISC ChangeLog-2015 3190 SHA256 0965333a651fad50fad3ea065db1e28310b9ba047cc20a795ebdbb73afcf8f2e SHA512 cc1260188ec705124f5cb941b0f5d97f8a17a2ab3703b42ca14c8d513a413f5b9760839912c5314539c6412e05f3aa763540df6cb7f37e68d184706287217cb6 WHIRLPOOL 4a5388bd46f88b2ee6ba441ceaac80e09622d37148036cf9a87ca9a5d8d7766513aee78d36e74a8dc9db391073d3489ebcf246576dd5eb14b4c8a6d19defec5a
 MISC metadata.xml 732 SHA256 f883cb17a205bee93220040a2bfb7ffde8dddaddac7331744317c841fd41fdd9 SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2 WHIRLPOOL 0413c6b22a359df2f315f4113bcde335e067ebb22ec2a223479ff9a3d5239e3fc7cabb1bbf80c52ca3b62152b6c14469e2e23010f1102a7f347c27fe28fc0d5d
diff --git a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild b/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
deleted file mode 100644
index ab1db567cd3c..000000000000
--- a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/mesa
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libudev:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util-image"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use doc SFML_BUILD_DOC)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.1.ebuild b/media-libs/libsfml/libsfml-2.4.1.ebuild
deleted file mode 100644
index 01bb090a4a65..000000000000
--- a/media-libs/libsfml/libsfml-2.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/mesa
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libudev:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util-image"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild
index b27433df7bd9..cced9bb41bee 100644
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild
+++ b/media-libs/libsfml/libsfml-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="