Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/, media-libs/libsfml/files/
Date: Tue, 01 Dec 2015 05:00:11
Message-Id: 1448945985.e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf.mr_bones_@gentoo
1 commit: e0f2aec8ea3a586a9d42ad16f612df8f3a2312cf
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 1 04:59:16 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 04:59:45 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f2aec8
7
8 clean old
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/libsfml/Manifest | 2 -
13 .../libsfml/files/libsfml-2.2-shared-glew.patch | 12 ----
14 media-libs/libsfml/libsfml-2.2.ebuild | 65 ----------------------
15 media-libs/libsfml/libsfml-2.3.1.ebuild | 65 ----------------------
16 4 files changed, 144 deletions(-)
17
18 diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
19 index 10781c0..5542da5 100644
20 --- a/media-libs/libsfml/Manifest
21 +++ b/media-libs/libsfml/Manifest
22 @@ -1,4 +1,2 @@
23 DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 SHA512 518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a WHIRLPOOL fee6692123c394b4d67d1937756315daf7386bf8d0292bbeb94ba7db53552010e8f92187496ce9b72f6aad4922e5ea5da191ddaf9baf0f96a7b741a1d1d17f2e
24 -DIST libsfml-2.2.tar.gz 17614806 SHA256 543458923e35868c16ac70e5f4c3bf172e136af9820d7b546b52afc7f1fc77f5 SHA512 cf30d431afc19d0f0126f2879dcb4c81ff4f689ce1e7aab5c3f156e8a88cdd54574e60de6230a9a5f7793a6c41ac81d811c68a9f1971ce079dada8d281ca34a3 WHIRLPOOL 8ba9c968840839295707e92281ecbc5d88b8900bab85dac0e1a4d66a0b8521bca0d5c6b0d1d330a1191aedf073f9633c7ce8f6dcbef9f84e3fac8c61d9c7c96e
25 -DIST libsfml-2.3.1.tar.gz 22209471 SHA256 59d7fd6b6c1194393ccac4cb7da3c41adbad973ab2116421ad6fcfe823221d6f SHA512 8a4d61be38cfae7b00f0c9669aed8d3e2cafd0e69aa840a155f3d6adfd9cf0cd37e6f69e4d52828f96f32b03a3c9bddb0f06366ab5e171775a036823164dcbe6 WHIRLPOOL 95c7c534915afb63e38d37ec712433267673aa22597ee3052df5f62becb6723d364440aa1e922e4012e043302c2ad70eb52fedaa4bfa6ee8a4ad3f4b0649141b
26 DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
27
28 diff --git a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
29 deleted file mode 100644
30 index 42c701e..0000000
31 --- a/media-libs/libsfml/files/libsfml-2.2-shared-glew.patch
32 +++ /dev/null
33 @@ -1,12 +0,0 @@
34 ---- SFML-2.2/src/SFML/Graphics/CMakeLists.txt
35 -+++ SFML-2.2/src/SFML/Graphics/CMakeLists.txt
36 -@@ -150,9 +150,6 @@
37 - list(APPEND GRAPHICS_EXT_LIBS ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
38 -
39 - # add preprocessor symbols
40 --if(NOT SFML_OPENGL_ES)
41 -- add_definitions(-DGLEW_STATIC)
42 --endif()
43 - add_definitions(-DSTBI_FAILURE_USERMSG)
44 -
45 - # ImageLoader.cpp must be compiled with the -fno-strict-aliasing
46
47 diff --git a/media-libs/libsfml/libsfml-2.2.ebuild b/media-libs/libsfml/libsfml-2.2.ebuild
48 deleted file mode 100644
49 index efc8506..0000000
50 --- a/media-libs/libsfml/libsfml-2.2.ebuild
51 +++ /dev/null
52 @@ -1,65 +0,0 @@
53 -# Copyright 1999-2015 Gentoo Foundation
54 -# Distributed under the terms of the GNU General Public License v2
55 -# $Id$
56 -
57 -EAPI=5
58 -
59 -inherit cmake-utils eutils
60 -
61 -MY_P=SFML-${PV}
62 -
63 -DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
64 -HOMEPAGE="http://www.sfml-dev.org/ https://github.com/LaurentGomila/SFML"
65 -SRC_URI="https://github.com/LaurentGomila/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
66 -
67 -LICENSE="ZLIB"
68 -SLOT="0"
69 -KEYWORDS="~amd64 ~x86"
70 -IUSE="debug doc examples"
71 -
72 -RDEPEND="media-libs/freetype:2
73 - media-libs/glew:=
74 - media-libs/libpng:0=
75 - media-libs/libsndfile
76 - media-libs/mesa
77 - media-libs/openal
78 - sys-libs/zlib
79 - virtual/jpeg
80 - virtual/udev
81 - x11-libs/libX11
82 - x11-libs/libXrandr"
83 -DEPEND="${RDEPEND}
84 - doc? ( app-doc/doxygen )"
85 -
86 -DOCS="changelog.txt readme.txt"
87 -
88 -S=${WORKDIR}/${MY_P}
89 -
90 -src_prepare() {
91 - epatch "${FILESDIR}"/${P}-no-docs.patch
92 - epatch "${FILESDIR}"/${P}-shared-glew.patch
93 -
94 - sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
95 - doc/CMakeLists.txt || die
96 -}
97 -
98 -src_configure() {
99 - local mycmakeargs=(
100 - $(cmake-utils_use doc SFML_BUILD_DOC)
101 - -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
102 - )
103 - cmake-utils_src_configure
104 -}
105 -
106 -src_install() {
107 - cmake-utils_src_install
108 -
109 - insinto /usr/share/cmake/Modules
110 - doins cmake/Modules/FindSFML.cmake
111 -
112 - if use examples ; then
113 - docompress -x /usr/share/doc/${PF}/examples
114 - dodoc -r examples
115 - find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
116 - fi
117 -}
118
119 diff --git a/media-libs/libsfml/libsfml-2.3.1.ebuild b/media-libs/libsfml/libsfml-2.3.1.ebuild
120 deleted file mode 100644
121 index 572bbad..0000000
122 --- a/media-libs/libsfml/libsfml-2.3.1.ebuild
123 +++ /dev/null
124 @@ -1,65 +0,0 @@
125 -# Copyright 1999-2015 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -EAPI=5
130 -
131 -inherit cmake-utils eutils
132 -
133 -MY_P=SFML-${PV}
134 -
135 -DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
136 -HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
137 -SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
138 -
139 -LICENSE="ZLIB"
140 -SLOT="0"
141 -KEYWORDS="~amd64 ~x86"
142 -IUSE="debug doc examples"
143 -
144 -RDEPEND="media-libs/freetype:2
145 - media-libs/libpng:0=
146 - media-libs/mesa
147 - media-libs/flac
148 - media-libs/libogg
149 - media-libs/libvorbis
150 - media-libs/openal
151 - sys-libs/zlib
152 - virtual/jpeg:0
153 - virtual/udev
154 - x11-libs/libX11
155 - x11-libs/libXrandr"
156 -DEPEND="${RDEPEND}
157 - doc? ( app-doc/doxygen )"
158 -
159 -DOCS="changelog.txt readme.txt"
160 -
161 -S=${WORKDIR}/${MY_P}
162 -
163 -src_prepare() {
164 - epatch "${FILESDIR}"/${PN}-2.2-no-docs.patch
165 -
166 - sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
167 - doc/CMakeLists.txt || die
168 -}
169 -
170 -src_configure() {
171 - local mycmakeargs=(
172 - $(cmake-utils_use doc SFML_BUILD_DOC)
173 - -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
174 - )
175 - cmake-utils_src_configure
176 -}
177 -
178 -src_install() {
179 - cmake-utils_src_install
180 -
181 - insinto /usr/share/cmake/Modules
182 - doins cmake/Modules/FindSFML.cmake
183 -
184 - if use examples ; then
185 - docompress -x /usr/share/doc/${PF}/examples
186 - dodoc -r examples
187 - find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
188 - fi
189 -}