From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-sound/csound/files/csound-6.05-python.patch | 19 ------------------ .../csound/files/csound-6.09.1-python.patch | 23 ---------------------- 2 files changed, 42 deletions(-) delete mode 100644 media-sound/csound/files/csound-6.05-python.patch delete mode 100644 media-sound/csound/files/csound-6.09.1-python.patch (limited to 'media-sound/csound/files') diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch deleted file mode 100644 index 3e9ee857fe98..000000000000 --- a/media-sound/csound/files/csound-6.05-python.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- csound-6.05.0.orig/CMakeLists.txt 2015-04-26 03:06:22.941646148 +0800 -+++ csound-6.05.0/CMakeLists.txt 2015-07-08 22:31:16.637995822 +0800 -@@ -41,15 +41,9 @@ - set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - endif() - -- --execute_process ( -- COMMAND python -c -- "import site, sys; sys.stdout.write(site.getusersitepackages())" -- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR -- ) -- - set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) - set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) -+set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME}) - set(LOCALE_INSTALL_DIR "share/locale") - set(HEADER_INSTALL_DIR "include/csound") - diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch deleted file mode 100644 index 47461e48aaf4..000000000000 --- a/media-sound/csound/files/csound-6.09.1-python.patch +++ /dev/null @@ -1,23 +0,0 @@ -Respect externally set PYTHON_MODULE_INSTALL_DIR. - ---- csound-6.09.1/CMakeLists.txt -+++ csound-6.09.1/CMakeLists.txt -@@ -218,11 +218,13 @@ - set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - endif() - --execute_process ( -- COMMAND python -c -- "import site, sys; sys.stdout.write(site.getusersitepackages())" -- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR -- ) -+if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR) -+ execute_process ( -+ COMMAND python -c -+ "import site, sys; sys.stdout.write(site.getusersitepackages())" -+ OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR -+ ) -+endif() - - set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) - set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) -- cgit v1.2.3