From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9BCC61384B4 for ; Tue, 1 Dec 2015 05:00:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF1BF21C001; Tue, 1 Dec 2015 05:00:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DC4321C001 for ; Tue, 1 Dec 2015 05:00:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD24534070F for ; Tue, 1 Dec 2015 05:00:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 310D4A8E for ; Tue, 1 Dec 2015 05:00:03 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1448945985.e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libsfml/Manifest media-libs/libsfml/files/libsfml-2.2-shared-glew.patch media-libs/libsfml/libsfml-2.2.ebuild media-libs/libsfml/libsfml-2.3.1.ebuild X-VCS-Directories: media-libs/libsfml/files/ media-libs/libsfml/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf X-VCS-Branch: master Date: Tue, 1 Dec 2015 05:00:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 397f5dd7-3cee-41ae-8830-3cc1bc3d0384 X-Archives-Hash: 8d26c847660e1086626413f276998232 commit: e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf Author: Michael Sterrett gentoo org> AuthorDate: Tue Dec 1 04:59:16 2015 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Tue Dec 1 04:59:45 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f2aec8 clean old Package-Manager: portage-2.2.20.1 media-libs/libsfml/Manifest | 2 - .../libsfml/files/libsfml-2.2-shared-glew.patch | 12 ---- media-libs/libsfml/libsfml-2.2.ebuild | 65 ---------------------- media-libs/libsfml/libsfml-2.3.1.ebuild | 65 ---------------------- 4 files changed, 144 deletions(-) diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest index 10781c0..5542da5 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -1,4 +1,2 @@ DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512 518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a WHIRLPOOL fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e -DIST libsfml-2.2.tar.gz 17614806 SHA256 543458923e35868c16ac70e5f4c3bf172e136af9820d7b546b52afc7f1fc77f5 SHA512 cf30d431afc19d0f0126f2879dcb4c81ff4f689ce1e7aab5c3f156e8a88cdd54574e60de6230a9a5f7793a6c41ac81d811c68a9f1971ce079dada8d281ca34a3 WHIRLPOOL 8ba9c968840839295707e92281ecbc5d88b8900bab85dac0e1a4d66a0b8521bca0d5c6b0d1d330a1191aedf073f9633c7ce8f6dcbef9f84e3fac8c61d9c7c96e -DIST libsfml-2.3.1.tar.gz 22209471 SHA256 59d7fd6b6c1194393ccac4cb7da3c41adbad973ab2116421ad6fcfe823221d6f SHA512 8a4d61be38cfae7b00f0c9669aed8d3e2cafd0e69aa840a155f3d6adfd9cf0cd37e6f69e4d52828f96f32b03a3c9bddb0f06366ab5e171775a036823164dcbe6 WHIRLPOOL 95c7c534915afb63e38d37ec712433267673aa22597ee3052df5f62becb6723d364440aa1e922e4012e043302c2ad70eb52fedaa4bfa6ee8a4ad3f4b0649141b DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83 diff --git a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch deleted file mode 100644 index 42c701e..0000000 --- a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index efc8506..0000000 --- a/media-libs/libsfml/libsfml-2.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils eutils - -MY_P=SFML-${PV} - -DESCRIPTION="Simple and Fast Multimedia Library (SFML)" -HOMEPAGE="http://www.sfml-dev.org/ 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) - -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.3.1.ebuild b/media-libs/libsfml/libsfml-2.3.1.ebuild deleted file mode 100644 index 572bbad..0000000 --- a/media-libs/libsfml/libsfml-2.3.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils eutils - -MY_P=SFML-${PV} - -DESCRIPTION="Simple and Fast Multimedia Library (SFML)" -HOMEPAGE="http://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/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}"/${PN}-2.2-no-docs.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) - -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 -}