gentoo resync : 12.03.2021

5 files changed, 0 insertions, 161 deletions

diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index a816a3a9619d..b93929fca720 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,11 +1,6 @@
-AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
-AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
-AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 DIST libprojectm-3.1.11.tar.gz 52831435 BLAKE2B 286cbe5d7c497b0955da38d3ccfd4a5c97d80bc102a4bb739f98ee6c39afb1420d780c989997c16be9d2e7d54718a498769f98e15e2443bc7ac8ad850ecbb2df SHA512 da2c34ce5798205d31906c401d98ad2f16a45b6123975a291657c892db41c86d05d38edee34b52f2415c4442d8302c8c0dc5bb89e5932a057df17f7ccac7db22
 DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
-DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
 EBUILD libprojectm-3.1.11.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.12.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.8-r1.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
deleted file mode 100644
index e3e156620935..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Properly call namespaced std::isnan and use implicit
-conversion operators, such that they work in C++98 and C++14.
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=582866
-https://sourceforge.net/p/projectm/code/ci/92226e25192a69839b9ae3b66ea7173732c639b3
-
---- libprojectM/Common.hpp
-+++ libprojectM/Common.hpp
-@@ -63,7 +63,7 @@
- 
- #ifdef LINUX
- #include <cstdlib>
--#define projectM_isnan isnan
-+#define projectM_isnan std::isnan
- 
- #endif
- 
---- libprojectM/MilkdropPresetFactory/Parser.cpp
-+++ libprojectM/MilkdropPresetFactory/Parser.cpp
-@@ -1406,7 +1406,7 @@
-   PerFrameEqn * per_frame_eqn;
-   GenExpr * gen_expr;
- 
--  if (fs == NULL)
-+  if (fs.fail())
-     return NULL;
-   if (param_string == NULL)
-     return NULL;
-@@ -1561,7 +1561,7 @@
- 
-   if (preset == NULL)
-     return NULL;
--  if (fs == NULL)
-+  if (fs.fail())
-     return NULL;
- 
-   if ((token = parseToken(fs, name)) != tEq)
-@@ -1875,7 +1875,7 @@
-   /* Null argument checks */
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (token == NULL)
-     return PROJECTM_FAILURE;
-@@ -2166,7 +2166,7 @@
- 
-   if (token == NULL)
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
-@@ -2348,7 +2348,7 @@
-   if (token == NULL)
- 
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
deleted file mode 100644
index aceee30e6278..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libprojectM/CMakeLists.txt
-+++ libprojectM/CMakeLists.txt
-@@ -35,7 +35,7 @@
- 
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
- 
--SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
-+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
-   FORCE)
- 
-@@ -234,7 +234,7 @@
- FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
- INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
- INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
--INSTALL(TARGETS projectM DESTINATION lib)
-+INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
deleted file mode 100644
index bb780e8943ad..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
-===================================================================
---- libprojectM/CMakeLists.txt
-+++ libprojectM/CMakeLists.txt
-@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0)
- set(PROJECTM_ABI_LEVEL 2)
- #
- 
--ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-+ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
- 
- SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
deleted file mode 100644
index 7795ea42bbf1..000000000000
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-MY_P=${PN/m/M}-complete-${PV}-Source
-MY_P=${MY_P/lib}
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86"
-IUSE="debug openmp video_cards_nvidia"
-
-RDEPEND="media-fonts/dejavu
-	>=media-libs/ftgl-2.1.3_rc5
-	media-libs/freetype:2
-	media-libs/mesa[X(+)]
-	media-libs/glew:=
-	sys-libs/zlib
-	video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}/src/libprojectM
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-path.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-src_configure() {
-	if use video_cards_nvidia; then
-		append-ldflags -L/opt/nvidia-cg-toolkit/$(get_libdir)
-		append-ldflags -L/opt/nvidia-cg-toolkit/lib
-		append-cppflags -I/opt/nvidia-cg-toolkit/include
-	fi
-
-	local mycmakeargs=(
-		-DUSE_CG=$(usex video_cards_nvidia)
-		-DprojectM_FONT_MENU="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSans.ttf"
-		-DprojectM_FONT_TITLE="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSansMono.ttf"
-	)
-
-	if use openmp && tc-has-openmp; then
-		mycmakeargs+=( -DUSE_OPENMP=ON )
-	else
-		mycmakeargs+=( -DUSE_OPENMP=OFF )
-	fi
-
-	cmake-utils_src_configure
-}