gentoo resync : 30.04.2018

2 files changed, 0 insertions, 57 deletions

diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 6e31491ff54d..ea3e8a6bf121 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,3 @@
-AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
 DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
 EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
 EBUILD slop-9999.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
diff --git a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
deleted file mode 100644
index 2ca92f9d2ac8..000000000000
--- a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,16 +1,13 @@
- cmake_minimum_required(VERSION 3.1.3)
- 
-+include(GNUInstallDirs)
-+
- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)")
--if ( NOT CMAKE_INSTALL_PREFIX )
--    set(CMAKE_INSTALL_PREFIX "/usr")
--endif()
- 
--project(slop)
-+project(slop VERSION 6.3.46 LANGUAGES CXX)
- 
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
- 
--set( CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where man pages reside. (/usr/share/man, /usr/local/share/man, etc.)" )
--
- set( CMAKE_COMPRESS_MAN TRUE CACHE BOOL "Whether or not to compress the man pages for install." )
- 
- if ( CMAKE_COMPRESS_MAN )
-@@ -21,7 +18,7 @@
- 
- include_directories("${PROJECT_BINARY_DIR}")
- 
--add_definitions(-DSLOP_VERSION="v6.3.46")
-+add_definitions(-DSLOP_VERSION="v${PROJECT_VERSION}")
- 
- # The names have to be unique unfortunately.
- set(EXECUTABLE_NAME "slop")
-@@ -43,11 +40,13 @@
- 
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
-+set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF)
- 
- add_executable(${EXECUTABLE_NAME} src/main.cpp)
- 
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11)
-+set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF)
- 
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
- 
-@@ -83,7 +82,7 @@
-     target_link_libraries(${EXECUTABLE_NAME} ${ICU_UC_LIBRARIES} )
- endif()
- 
--install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
--install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
--install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" COMPONENT development )
-+install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" )
-+install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
-+install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT development )
- install( FILES "${CMAKE_SOURCE_DIR}/${MANTARGET}" DESTINATION  "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc )