From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1072667-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7B1CD138335
for <garchives@archives.gentoo.org>; Sat, 16 Feb 2019 08:55:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AB0FFE08EB;
Sat, 16 Feb 2019 08:55:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5F30DE08EB
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 08:55:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BC774335CF3
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 08:55:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 19F3C53F
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Feb 2019 08:55:52 +0000 (UTC)
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1550307327.2d5bbeddf2d0e2c65f21f05dd54cd97d76ee0c7d.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/files/, media-libs/libsfml/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libsfml/Manifest media-libs/libsfml/files/libsfml-2.2-no-docs.patch media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch media-libs/libsfml/libsfml-2.4.2-r2.ebuild media-libs/libsfml/libsfml-2.4.2.ebuild
X-VCS-Directories: media-libs/libsfml/ media-libs/libsfml/files/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: 2d5bbeddf2d0e2c65f21f05dd54cd97d76ee0c7d
X-VCS-Branch: master
Date: Sat, 16 Feb 2019 08:55:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 657a76d2-266b-4b75-b11b-4773de8b0a3f
X-Archives-Hash: 3299dddd16b6800daef204d909798a54
commit: 2d5bbeddf2d0e2c65f21f05dd54cd97d76ee0c7d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 08:37:16 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 08:55:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5bbedd
media-libs/libsfml: Drop old
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-libs/libsfml/Manifest | 1 -
media-libs/libsfml/files/libsfml-2.2-no-docs.patch | 15 --
.../libsfml-2.4.2-no-install-extlibs-mingw.patch | 74 -------
.../libsfml/files/libsfml-2.4.2-pkg-config.patch | 217 ---------------------
media-libs/libsfml/libsfml-2.4.2-r2.ebuild | 84 --------
media-libs/libsfml/libsfml-2.4.2.ebuild | 73 -------
6 files changed, 464 deletions(-)
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 8c9c8f9e102..cbcca3da50d 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,2 +1 @@
-DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972
DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
diff --git a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
deleted file mode 100644
index ef69107c56f..00000000000
--- a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.4.2-no-install-extlibs-mingw.patch b/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch
deleted file mode 100644
index b45063160e7..00000000000
--- a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- SFML-2.4.2/CMakeLists.txt 2017-02-08 05:29:16.000000000 -0600
-+++ SFML-2.4.2.new/CMakeLists.txt 2017-06-05 22:12:39.166300154 -0500
-@@ -305,24 +305,26 @@
- # install 3rd-party libraries and tools
- if(SFML_OS_WINDOWS)
-
-- # install the binaries of SFML dependencies
-- if(ARCH_32BITS)
-- install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
-- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-- install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
-- elseif(SFML_COMPILER_MSVC)
-- install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
-- else()
-- install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
-- endif()
-- elseif(ARCH_64BITS)
-- install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
-- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-- install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
-- elseif(SFML_COMPILER_MSVC)
-- install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
-- else()
-- install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
-+ if(NOT SFML_USE_SYSTEM_DEPS)
-+ # install the binaries of SFML dependencies
-+ if(ARCH_32BITS)
-+ install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
-+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-+ install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
-+ elseif(SFML_COMPILER_MSVC)
-+ install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
-+ else()
-+ install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
-+ endif()
-+ elseif(ARCH_64BITS)
-+ install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
-+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-+ install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
-+ elseif(SFML_COMPILER_MSVC)
-+ install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
-+ else()
-+ install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
-+ endif()
- endif()
- endif()
-
-@@ -379,9 +381,11 @@
- install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX})
- endif()
-
-- # since the iOS libraries are built as static, we must install the SFML dependencies
-- # too so that the end user can easily link them to its final application
-- install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
-+ if(NOT SFML_USE_SYSTEM_DEPS)
-+ # since the iOS libraries are built as static, we must install the SFML dependencies
-+ # too so that the end user can easily link them to its final application
-+ install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
-+ endif()
-
- elseif(SFML_OS_ANDROID)
-
-@@ -389,7 +393,9 @@
- install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib)
- install(FILES extlibs/Android.mk DESTINATION extlibs)
-
-- # install Android.mk so the NDK knows how to set up SFML
-- install(FILES src/SFML/Android.mk DESTINATION .)
-+ if(NOT SFML_USE_SYSTEM_DEPS)
-+ # install Android.mk so the NDK knows how to set up SFML
-+ install(FILES src/SFML/Android.mk DESTINATION .)
-+ endif()
-
- endif()
diff --git a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
deleted file mode 100644
index a281d46c9ba..00000000000
--- a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-commit 5fe5e5d6d7792e37685a437551ffa8ed5161fcc1
-Author: Rafael Kitover <rkitover@gmail.com>
-Date: Mon Dec 19 13:16:07 2016 -0800
-
- packaging support improvements
-
- This grew out of my work creating an sfml port for macports, but should
- be helpful for package maintainers of various distributions:
-
- * add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/
- except for headers/stb_image, and use the system versions
-
- * install pkg-config files if a pkg-config program is found
- and either lib/pkgconfig or libdata/pkgconfig exists under the
- INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set
- explicitly
-
- * install pkg-config files for static libs too, add the necessary
- Requires.private and Libs.private entries to the .pc files to support
- static linking
-
- * on OS X, honor all INSTALL_NAME and RPATH related cmake variables and
- only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this
- preserves the default behavior of using @rpath but also allows
- overriding by the usual cmake mechanisms
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7914ac9..419d56d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug
- # Suppress Cygwin legacy warning
- set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-
-+# Suppress Mac OS X RPATH warnings and adopt new related behaviors
-+cmake_policy(SET CMP0042 NEW)
-+
- # set Android specific options
-
- # define the minimum API level to be used
-@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS)
- add_definitions(-DSFML_STATIC)
- endif()
-
-+# allow not using bundled dependencies with a switch
-+# (except for stb_image)
-+# yes this is horrible, but GLOB_RECURSE sucks
-+sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.")
-+if(SFML_USE_SYSTEM_DEPS)
-+ if(SFML_INSTALL_XCODE_TEMPLATES)
-+ message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)")
-+ endif()
-+
-+ file(GLOB_RECURSE DEP_LIBS "${CMAKE_SOURCE_DIR}/extlibs/libs*/*")
-+ file(GLOB_RECURSE DEP_BINS "${CMAKE_SOURCE_DIR}/extlibs/bin*/*")
-+ file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*")
-+
-+ foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS})
-+ get_filename_component(DEP_DIR ${DEP_FILE} PATH)
-+
-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR})
-+ endif()
-+
-+ get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH)
-+ while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs")
-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR})
-+ endif()
-+
-+ get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH)
-+ endwhile()
-+ endforeach()
-+
-+ list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH)
-+endif()
-+
- # Visual C++: remove warnings regarding SL security and algorithms on pointers
- if(SFML_COMPILER_MSVC)
- # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible)
-@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX)
- set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
- endif()
-
--if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
-- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
-- if(SFML_OS_FREEBSD)
-- set(PKGCONFIG_DIR libdata/pkgconfig)
-- endif()
-- if(BUILD_SHARED_LIBS)
-- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
-- if(SFML_INSTALL_PKGCONFIG_FILES)
-- foreach(sfml_module IN ITEMS all system window graphics audio network)
-- CONFIGURE_FILE(
-- "tools/pkg-config/sfml-${sfml_module}.pc.in"
-- "tools/pkg-config/sfml-${sfml_module}.pc"
-- @ONLY)
-- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}")
-- endforeach()
-- endif()
-- else()
-- if(SFML_INSTALL_PKGCONFIG_FILES)
-- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).")
-- endif()
-- endif()
--endif()
--
- # enable project folders
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
-@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC)
- add_subdirectory(doc)
- endif()
-
-+sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
-+
-+if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES)
-+ foreach(sfml_module IN ITEMS all system window graphics audio network)
-+ CONFIGURE_FILE(
-+ "tools/pkg-config/sfml-${sfml_module}.pc.in"
-+ "tools/pkg-config/sfml-${sfml_module}.pc"
-+ @ONLY)
-+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}")
-+ endforeach()
-+endif()
-+
- # setup the install rules
- if(NOT SFML_BUILD_FRAMEWORKS)
- install(DIRECTORY include
-diff --git a/cmake/Config.cmake b/cmake/Config.cmake
-index cff54d00..c447113a 100644
---- a/cmake/Config.cmake
-+++ b/cmake/Config.cmake
-@@ -73,6 +73,19 @@ else()
- return()
- endif()
-
-+# check if OS or package system supports pkg-config
-+# this could be e.g. macports on mac or msys2 on windows etc.
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_EXECUTABLE)
-+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-+ set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
-+ elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-+ set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
-+ endif()
-+endif()
-+
- # detect the compiler and its version
- # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
- # even when CLANG is used, therefore the Clang test is done first
-diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
-index cd2ca8fc..0f316034 100644
---- a/cmake/Macros.cmake
-+++ b/cmake/Macros.cmake
-@@ -105,9 +105,17 @@ macro(sfml_add_library target)
- endif()
-
- # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
-- set_target_properties(${target} PROPERTIES
-- BUILD_WITH_INSTALL_RPATH 1
-- INSTALL_NAME_DIR "@rpath")
-+ # but only if cmake rpath options aren't set
-+ if(NOT CMAKE_SKIP_RPATH AND NOT CMAKE_SKIP_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH AND NOT CMAKE_INSTALL_NAME_DIR)
-+ if(CMAKE_SKIP_BUILD_RPATH)
-+ set_target_properties(${target} PROPERTIES
-+ INSTALL_NAME_DIR "@rpath")
-+ else()
-+ set_target_properties(${target} PROPERTIES
-+ BUILD_WITH_INSTALL_RPATH 1
-+ INSTALL_NAME_DIR "@rpath")
-+ endif()
-+ endif()
- endif()
-
- # enable automatic reference counting on iOS
-diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in
-index 7456daaa..0d7a3ce1 100644
---- a/tools/pkg-config/sfml-audio.pc.in
-+++ b/tools/pkg-config/sfml-audio.pc.in
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module.
- URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-system
-+Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac
- Libs: -L${libdir} -lsfml-audio
-+# openal may be a system framework
-+Libs.private: @OPENAL_LIBRARY@
- Cflags: -I${includedir}
-diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in
-index d0a88a13..a96b72c9 100644
---- a/tools/pkg-config/sfml-graphics.pc.in
-+++ b/tools/pkg-config/sfml-graphics.pc.in
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module.
- URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-window
-+Requires.private: sfml-system, freetype2
- Libs: -L${libdir} -lsfml-graphics
-+# gl and jpeg may not be in pkg-config
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@
- Cflags: -I${includedir}
-diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in
-index b0266e67..93bf344c 100644
---- a/tools/pkg-config/sfml-window.pc.in
-+++ b/tools/pkg-config/sfml-window.pc.in
-@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-system
- Libs: -L${libdir} -lsfml-window
-+# gl may not be in pkg-config
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
- Cflags: -I${includedir}
diff --git a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
deleted file mode 100644
index dda2accf7c6..00000000000
--- a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 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="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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="
- media-libs/flac
- media-libs/freetype:2
- media-libs/libpng:0=
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- sys-libs/zlib
- virtual/jpeg:0
- kernel_linux? (
- virtual/libudev:0
- )
- virtual/opengl
- !kernel_Winnt? (
- 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 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-no-docs.patch
- "${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch
- "${FILESDIR}"/${PN}-2.4.2-pkg-config.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
- doc/CMakeLists.txt || die
-
- find examples -name CMakeLists.txt -delete || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSFML_BUILD_DOC=$(usex doc)
- -DSFML_INSTALL_PKGCONFIG_FILES=TRUE
- )
-
- if use kernel_Winnt; then
- mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
- fi
- 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
- fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild
deleted file mode 100644
index cced9bb41be..00000000000
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild
+++ /dev/null
@@ -1,73 +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/flac
- media-libs/freetype:2
- media-libs/libpng:0=
- media-libs/libogg
- media-libs/libvorbis
- media-libs/mesa
- 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 )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- 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
-}