Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 110 insertions, 9 deletions

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
index bc10475290d4..325070ccd738 100644
--- a/media-libs/libsfml/ChangeLog
+++ b/media-libs/libsfml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsfml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.14 2014/08/04 16:58:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.15 2014/12/11 18:31:44 radhermit Exp $
+
+*libsfml-2.2 (11 Dec 2014)
+
+  11 Dec 2014; Tim Harder <radhermit@gentoo.org> +libsfml-2.2.ebuild,
+  +files/libsfml-2.2-no-docs.patch, +files/libsfml-2.2-shared-glew.patch:
+  Version bump.
 
 *libsfml-2.1 (04 Aug 2014)
 
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index d38e0e8d9fa5..82ab9ce745f5 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -8,22 +8,26 @@ AUX libsfml-1.6-gcc47.patch 283 SHA256 292f2fb0afb3fed73ce066021a2dfb5d007a5c595
 AUX libsfml-1.6-libpng15.patch 566 SHA256 caaa919fb601f2c83a3403695f6974955149f430904a7b9861389d9dc3e59fab SHA512 9dfafe5c97bd102c40cd74ebb7dfa4c0e1a3c264c93b4968de31612b96283872d54654670b1b0768186fe3fb2b97d9e8175adf4b9f93ef78e1b0470752636573 WHIRLPOOL 9d031df76910f1e2f3d9a7836e114ed5659c6354dc02b6c8bb592686d1a572da69dd3d3451c4cef1381b49083e943edf00ecdf55d0ad5a17360dde8e34466a56
 AUX libsfml-2.0_pre20121126-no-docs.patch 481 SHA256 6cd7d7d8e41fea4090acf81b89b1a2422b314c226e57e85d228062c43b4478f3 SHA512 a798d94bff096c0cffb4d532c5aec16e76a9bec46ef9ef48ecd81c2bdccd505058d0f13676ec573024553d06c251b0d2d762c2183c81c79320054ce5508bb4f9 WHIRLPOOL f4ec37c84a09c788406d58da97427dfc14e417fb2113fb5a6f9c2a9556812c222d43313fec1669d884ede3b473b16bc26036ae7635d24e42d47021eb9e1dc1e2
 AUX libsfml-2.0_pre20121126-shared-glew.patch 429 SHA256 c6dd068621dc74795410e374311d9b124c1db47b004647729a93a49759b6e34b SHA512 2bf0d80becd4ed9e4e5311406ed78eddc5af52f7045b9070618be1799e9d2e784a0867dbd2dd804740e91e5bec5a596bced59866845383a930dadea668142205 WHIRLPOOL b65cb7dcd69badf623e5cb457ddc85056e7b4e67c9815545f8edae956dc2d767af842c39452d4b38dc28d81d7c6c2fc71764259a36c789bc046ebae305496094
+AUX libsfml-2.2-no-docs.patch 432 SHA256 7e31edbe092460b564c04882af42a6e7173dc01f5a21ba1ac9fe0c6b31892b59 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807 WHIRLPOOL 0d2320ea49558e2270603ba13c39d56bb0a50d8a9da4ed0d087b6ef5d485b8fab775ab38648cf07970160fff18602dc2c47f25941972a751b3e300aae17ca02a
+AUX libsfml-2.2-shared-glew.patch 388 SHA256 cd789d01cb500f681964f6d436faa8893a98ceceb7dba7b668bf41f885ef88e9 SHA512 c07c47e5adffc6c32668469e7ac5934d80865ad39e9503a896ad6d809eafcad6c8261a34677bb7da540fb6c803a1707168f4cf8e3630de50e30374e32471da51 WHIRLPOOL 1ef3d3c7fd83d125c4aaf560f3d53f360d853b3298a124bb4b2eb83b05b109972f61db6f3c5630917e94f741c5cf1ed57b485cd05051f87ffad10192e810f7e4
 DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512 518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a WHIRLPOOL fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e
 DIST libsfml-2.0.tar.gz 9730206 SHA256 389e705d0ed02de1c04ed2e77fb4510072169c5dd4056e260439ac9f1cbcdd04 SHA512 ba624b8ad20e9a6869458e6300a94be314032e95569860b6d315ab84e89963439d665a31c2d886475ffcea419bfc939c93d1d2ca7e33f2ecea679a1bf6acec95 WHIRLPOOL 11da0652174a59c0f62f14dada870635eee4658e2037f249254bf2bf91222d528f440a0d4f1da014784280c2df905f80f9f4680f37b06e280539e81c5eed1bfc
 DIST libsfml-2.1.tar.gz 9436816 SHA256 4849e2b1bd362949e25a7c4f3fc58001f09a1a2e2999ef7c6c7a69a168518727 SHA512 5a06b34ebaeae15126aa8b8d4a84776cda75482d67161d8d0a2e5d292cc2590e2f3543f98713b3b139a4bd77518b42b3ad8f72b9b90374fac8c2370bf3619b27 WHIRLPOOL 4a978a11db6f9412b56c572649320a7bef47a75f16bdb411378cd4cd9845334d8321d02249551a0963feb55b1246f248d6397da062dd45b47f3ceb905e05fb27
+DIST libsfml-2.2.tar.gz 17614806 SHA256 543458923e35868c16ac70e5f4c3bf172e136af9820d7b546b52afc7f1fc77f5 SHA512 cf30d431afc19d0f0126f2879dcb4c81ff4f689ce1e7aab5c3f156e8a88cdd54574e60de6230a9a5f7793a6c41ac81d811c68a9f1971ce079dada8d281ca34a3 WHIRLPOOL 8ba9c968840839295707e92281ecbc5d88b8900bab85dac0e1a4d66a0b8521bca0d5c6b0d1d330a1191aedf073f9633c7ce8f6dcbef9f84e3fac8c61d9c7c96e
 EBUILD libsfml-1.6-r1.ebuild 1609 SHA256 4ce29a11c17ea6b9d97206f4b657a7360f36caa65b824d0808eea1f6a6ad660c SHA512 341fadcda3f9bde2e9859af47b69d90aafd924ed459ca4185699d6671bfca6cfd4e8a84a563c53ad566d68b61896d304ba8a4a61d620acac65b47763942e5c07 WHIRLPOOL 7d6263e4531d204ec69be8633c13a75c4a31a644d2454bcb7ac9e9d189025b27bedb035e492717a0b930bd77f9a2fc0cb85f26b1aa75d594d6bc03538b07c5cf
 EBUILD libsfml-2.0.ebuild 1407 SHA256 781194a158591568633876b9fb69a24af9dd4cf7eadee9c79bd782be624e554c SHA512 8d64c9d12203df82b9427b3b7cde828ecf479b42349a8ee63c811e4cc7da82ec571dc1f4a34c4954fd4b7671926e910cfad197de637b5987b855d6612c2658d8 WHIRLPOOL 8e7818f012149e502f51bd4d35a9d56bf75ae729a1e389b7b8a4dd4a5ba20b57a9022c6449f12a8d19d0d9fb4807aa893144972e70245846e39ed8e4450340ca
 EBUILD libsfml-2.1.ebuild 1407 SHA256 7cfaf0963dde583b82baed45fe636d1305f7a3ff52453afb7364e426dfd895bc SHA512 afd22b8dde2655c152e6005c1866797ba7eb154ca5249310f1a626cac39a483778e46a72a9889dd682c0ddea0690b397c6bd9a35ed871d5aa78db4937467d0b7 WHIRLPOOL 432c2a955f89133fd892fa5b0f5ea3c6cae887f54d8fa8da5d8850f59322fd1dbeb52018a7a9ebf364245872cd0f904eb8214cb87a81c3514b937c17011eda48
-MISC ChangeLog 2533 SHA256 ced65e49b641ef80b1135c28cb9448c38c9b121667c1875acd32d7c0e1bad067 SHA512 f264d6d1a1c30d39cbd473a9c05af62b35080fc4e21879d53e3dc3f62525a2af7861e3042aee981b1251c28879d76524b77cacf9006f4ba55f6341e6077a73a2 WHIRLPOOL f33a202aed3ee1c3999e1c0e9d4a0bc7ad5408a042e0af7f4dae404f6a54eda8df7ed76c974cc773ff1175e186b49ec15825616d5d9980ff78732f56c2b0bd30
+EBUILD libsfml-2.2.ebuild 1474 SHA256 99471aef3c404b596a61cd968ab46defb451acbd2781fcb78dfc4be097025738 SHA512 30613d9735881c6ad7451930220ef95f8fc33ea5c667b3f91276bea2ee0ce1d7b3f42ed079cad6b1d93e8393224248cde0adc7baeefa55ea5c4b9109ad0aa18a WHIRLPOOL fc47115e16c8e8242fe28c436d59a0bd2596ad36f258b3ce2e954d099770bab869095e4e23a0686d43002d569326eb864d67ad8d789d3d75ffcc1f2c7e3fd757
+MISC ChangeLog 2722 SHA256 da6e336846af152d148694dd87cc4a394700979f89036ed7f3dc533c8f811bbc SHA512 04605f0b5136816a0803ae5a62de3a8fe605ed7441a94e34d1003b00b198c3db3d1c990295d2a7184851885cca02197f3a987938c262b4b3aa0754b1c291bbc7 WHIRLPOOL b56e8f9b20e3ae4e0c41e229ba24feda2e7c243c358ab5e711db0782eb5e6aaab7c9bfdaeeb5b25e80ec6965f93ee6a58b858bb93367a6090c1c59ab1dd6b5bc
 MISC metadata.xml 678 SHA256 56befeaa2bad0d2139834c1a193f107392c208448fdeafd55c65c32a02d620b6 SHA512 f61667e935bd59b88f89fd986584c4b6cf493d1d51dff142b8accedde539599ee65f1bc845e442d62a58bddbf507aaf4bd722146f076ff14e5dadbe333dbe2c0 WHIRLPOOL aaac8afa58426ce082da3b6ec23a10c36a9c650b8bb975d0ca330905c28d1dd91d45f2e11bb218c319a165fc824d9a61a143f6fa3741ff2f8ce1055b1f8d32ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT37vFAAoJEEqz6FtPBkyj2L4IAKYrF/ioqq5SjRFftdAx3msp
-oNbXyovsFaK9mwCdVjLMgJwkix4O9mbE4ZjPAAhaQRvVNrbYBdYkOefaM9Ugdt+a
-6YYud575xV4XnvprTbAtXZhz9TUoXsVCuW52DQAzUVuCg2f/jOhHcGs1CbDFlvfu
-4vcvxFglUIm3xcKtyu4t0aSGgwB0/4UWSHeKAtq8UPu37YuPXfvPuCvrmbSaAqXX
-mxocsxdK6FWZjp+fzVZfb0lbIyMwdi+yi3RbM5jhAiNhdT4SqiqUCf0Xb5O+YXG5
-wh8L6prXu8owlBuW+1qtFb56VGbXKGGLx4arabxm4Lj0ktB5bmuv6DPhcy/Afnw=
-=g2nW
+iQEcBAEBCAAGBQJUieMdAAoJEEqz6FtPBkyjBsYH/jSV7ulqIVNzd8IVCTsWOlq4
+0M6eMiRoEJ/2RqypHgpyPqdEGMMAkHhzRfdNMX4kX99urGNm5UqGKTgLLnZrnJtu
+ID4WG0Rgtw5QcOa/lndA03l3TkcZ/w3Lmekjs6SNuHl7PgvSQXA+N9dUhvLU1S38
+tNVDExFqSaFZWkABmBUWNgtnirsX+uhF2ilCmGnNQuePmDv4iv1PBI9gWtecXOyY
+8TW3TXJMYYqTyzenv9OVUX3u8Pm6V34rxcr8FrOlIweOw16TrtErD7S5l5ctAZia
++LTCn6n6dWdJAiq2pOfrrdYz72HW8zf+ujc75+IqY0iaK3AiAuD2DMAs4bYllXc=
+=OLc0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
new file mode 100644
index 000000000000..ef69107c56f4
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
@@ -0,0 +1,15 @@
+--- SFML-2.2/CMakeLists.txt
++++ SFML-2.2/CMakeLists.txt
+@@ -239,12 +239,6 @@
+             COMPONENT devel)
+ endif()
+ 
+-install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
+-install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})
+-if(NOT SFML_OS_ANDROID)
+-    install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules)
+-endif()
+-
+ # install 3rd-party libraries and tools
+ if(SFML_OS_WINDOWS)
+ 
diff --git a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
new file mode 100644
index 000000000000..42c701e751cb
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
@@ -0,0 +1,12 @@
+--- SFML-2.2/src/SFML/Graphics/CMakeLists.txt
++++ SFML-2.2/src/SFML/Graphics/CMakeLists.txt
+@@ -150,9 +150,6 @@
+ list(APPEND GRAPHICS_EXT_LIBS ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
+ 
+ # add preprocessor symbols
+-if(NOT SFML_OPENGL_ES)
+-    add_definitions(-DGLEW_STATIC)
+-endif()
+ add_definitions(-DSTBI_FAILURE_USERMSG)
+ 
+ # ImageLoader.cpp must be compiled with the -fno-strict-aliasing
diff --git a/media-libs/libsfml/libsfml-2.2.ebuild b/media-libs/libsfml/libsfml-2.2.ebuild
new file mode 100644
index 000000000000..31874294ce54
--- /dev/null
+++ b/media-libs/libsfml/libsfml-2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-2.2.ebuild,v 1.1 2014/12/11 18:31:44 radhermit Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+MY_P=SFML-${PV}
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="http://sfml.sourceforge.net/ https://github.com/LaurentGomila/SFML"
+SRC_URI="https://github.com/LaurentGomila/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/glew:=
+	media-libs/libpng:0=
+	media-libs/libsndfile
+	media-libs/mesa
+	media-libs/openal
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS="changelog.txt readme.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-docs.patch
+	epatch "${FILESDIR}"/${P}-shared-glew.patch
+
+	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+		doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use doc SFML_BUILD_DOC)
+	)
+	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
+}