gentoo resync : 31.12.2017 (final resync this year)

9 files changed, 65 insertions, 199 deletions

diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 6227c5b0c13a..b8bcd40cfe88 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,9 +1,4 @@
-AUX slop-4.3.21-no-cppcheck.patch 790 BLAKE2B 3511eaa3b4b81619a6350bc3d54e6e57b8ac5a3c3339cd44ea7775df721e4095a00ebb190964e076604cadbc27aa8beeb53c1402d321d88a03368e03548cfc80 SHA512 0cfef93fdad5c9b739032388698e2a2fb997774f95590573f7a1807a219435282b9d0e4daddf6ea79547c54cdfcd76b7545eb5009d1dc4b06ab81636beed29a5
-AUX slop-4.3.21-no-gengetopt.patch 2109 BLAKE2B 3d2ed3a09f2040d327fda945e85e71198ea56ec18091ea3cf2bcd7665981188271fa27b6683b2d04d2223fb52d18b20795ac021202550e29704738f41b118b69 SHA512 f345eaa42463dce37da6368b6f2e0d343c0af8a639e59a031f95f66cf3d4c99b6af3c4ed09b38408268b327334bf835e2e6207e8fdd12dbf106ca67552a545f7
-AUX slop-4.3.21-no-librt.patch 1099 BLAKE2B 92b4a02454e62f364d2ffa03bf1713ed22d5a90e1d4a90dbefa1463bf19f947dd223beb834b2d03cb0f9ab911b5e6137d6df6c5381dd55ec080f7e0b1abda449 SHA512 aca2ee7b8ceab74e7add153692884ee29ec787f3b0df5627a825a1c090be59406df7f9ed2fed1301a2ef28d15d0f9cbdf4fa221f5a4734e7582868f02fe65c2b
-AUX slop-4.3.21-no-opengl.patch 1201 BLAKE2B eaafe762eb7c1b518f5d11ac7e3cd414554221840fab4d7861da995ac045b3d2978d215bcbdd9a8f25aa4a371c9eddbb0a4f0e852eedcdd21cad7a76c7928cbe SHA512 df03f77d1a812e02070c4a44ad74c373ce0cf739a847a2ddd2dbab591488bd31da21544db0d6818f456a0b0c2cc0f092a055b1d1f869868b6f12418c02cfdcb5
-DIST slop-4.3.21.tar.gz 488238 BLAKE2B dc99c690984b616b28f93c3dd26ebd4264dcba7d66c5929f3732c88d3a423f19a3ab94d6673091735bd0d6dc4cec1bc41fc8e3f7bc666e9a8459acb717405e4d SHA512 4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68
+AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
 DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558
-EBUILD slop-4.3.21.ebuild 998 BLAKE2B 70597f35b452127d3a978965ca3e4ca72bcec5e16789ffd073b51db3825c9d3b76afa16498311a00ab56cba9e064cda29e36db39c57707a397e44d2d3eaf3877 SHA512 6885b852092d53097338ecb21e5c15c022afa203513f0699de9bfae3268a5414773f3511435ea7d410115792ec080d17fecf4d4df889f334abaee67414030ad4
-EBUILD slop-6.3.46.ebuild 538 BLAKE2B 28aa2fbab1f6806f7b9af9fe06149f3024846cc271a51db6ef11a4386b628320fe3dc70ae8ea0ada6d97fb70186dd16448e588fd4fbef9e3d07686a003258f4a SHA512 d912f801f8d79024246bcb564171aeb268bd82ddeff2039ba215693690a731a872c73c5b7737fa9954f2f0be25f993c22b81e8eaa5a757438706d5c25ecf0d44
-MISC metadata.xml 834 BLAKE2B 424b01ed5fcac7f55fdbffca1fa5f028251bacffa5889c61e46d1b21d9f4c2880f939d80567ed9509115f5456e8ba31daa592172d6f84c1adedd9b9888793ae5 SHA512 d3048ec19bdb9d9cc6a0c6f47d751ae29718a754b3c2ea90cb015787c491d536857b50eaa8b98c17fce83738e15200a96909d7fee48186a9cfd7267e1f6b5277
+EBUILD slop-6.3.46.ebuild 601 BLAKE2B 769a13a66a24a8067fdafbb6d3cce48090d4193fb40a14a98cd56d1d4d331e642ec50e601b8944e7276037e07cd52b27c0cb0b79295820c1305f63c8601f3051 SHA512 e96b0e0d8f2562f40a8770980dd46b0f7bbce5588b4fb1cb7d62c88a10fa9ae5880d40918db178f5f4ac5ce6c46957a685af528f795009c8094375738308fce4
+MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch b/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch
deleted file mode 100644
index f92c57f977df..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 361f930..0982647 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,6 @@ else()
-     message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." )
- endif()
- 
--# Add a check target for our makefile.
--find_program( CPPCHECK_EXECUTABLE cppcheck
--              DOC "A tool for static C/C++ code analysis." )
--if (CPPCHECK_EXECUTABLE)
--    add_custom_target( "check"
--                       COMMAND "${CPPCHECK_EXECUTABLE}" "--enable=all" "*"
--                       WORKING_DIRECTORY src VERBATIM )
--endif()
--
- # Here we generate some of our code if we can. I package it pre-generated
- # so nobody has to go find and install gengetopt if they don't want to.
- find_program( GENGETOPT_EXECUTABLE gengetopt
diff --git a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch b/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch
deleted file mode 100644
index 13f79eef2110..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,29 +33,6 @@ else()
-     message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." )
- endif()
- 
--# Here we generate some of our code if we can. I package it pre-generated
--# so nobody has to go find and install gengetopt if they don't want to.
--find_program( GENGETOPT_EXECUTABLE gengetopt
--              DOC "A tool to generate code to grab command line options." )
--find_program( SED_EXECUTABLE sed )
--if ( GENGETOPT_EXECUTABLE AND SED_EXECUTABLE )
--    message( "-- Regenerating cmdline.in" )
--    # gengetopt generates cmdline.h, then we move it to cmdline.in.
--    execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.in" )
--    # Due to a bug in gengetopt, we have to manually insert some code.
--    # Replace the first instance of REPLACEME with some text.
--    # Eight backslashes = two in the code because of how many instances of escaping is happening.
--    execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "0,/REPLACEME/{s/REPLACEME/X=%x\\\\\\\\nY=%y\\\\\\\\nW=%w\\\\\\\\nH=%h\\\\\\\\nG=%g\\\\\\\\nID=%i\\\\\\\\nCancel=%c\\\\\\\\n/}" "cmdline.c"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    # Then replace remaining instances.
--    execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "s/REPLACEME/X=%x\\\\nY=%y\\\\nW=%w\\\\nH=%h\\\\nG=%g\\\\nID=%i\\\\nCancel=%c\\\\n/" "cmdline.c"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--else()
--    message( "Warning: Command gengetopt or sed not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" )
--endif()
--
- # By default our src/options.ggo has our cmake versions variables for
- # the 'version ""' line. We replace them here.
- # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic.
diff --git a/x11-misc/slop/files/slop-4.3.21-no-librt.patch b/x11-misc/slop/files/slop-4.3.21-no-librt.patch
deleted file mode 100644
index 0b95b833ffda..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-librt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,10 +75,6 @@ find_package( GLX       REQUIRED )
- find_package( XRender   REQUIRED )
- find_package( XRandr    REQUIRED )
- find_package( GLEW      REQUIRED )
--# This library is needed only for Ubuntu it seems, some platforms don't even
--# ship with it. I couldn't find a way to do a test compile to check if librt
--# was needed, so instead I just didn't mark it as REQUIRED.
--find_package( RT )
- 
- set( CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" )
-@@ -96,10 +92,6 @@ include_directories( "${IMLIB2_INCLUDE_DIR}"
-                      ${XRENDER_INCLUDE_DIRS} )
- endif()
- 
--if ( RT_INCLUDE_DIR )
--    include_directories( ${RT_INCLUDE_DIR} )
--endif()
--
- # Executable
- add_executable( "${BIN_TARGET}" ${source} )
- 
-@@ -119,11 +111,6 @@ if ( CMAKE_OPENGL_SUPPORT )
- endif()
- 
- 
--if ( RT_LIBRARY )
--    target_link_libraries( "${BIN_TARGET}"
--                           "${RT_LIBRARY}" )
--endif()
--
- install( TARGETS ${BIN_TARGET}
-          DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
- 
diff --git a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch b/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
deleted file mode 100644
index 2f596b65e992..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 62cc1a6..f5d66e5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,14 +71,8 @@ endif()
- 
- # Obtain library paths and make sure they exist.
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmakemodules" )
--find_package( Imlib2    REQUIRED )
- find_package( X11       REQUIRED )
- find_package( XExt      REQUIRED )
--find_package( OpenGL    REQUIRED )
--find_package( GLX       REQUIRED )
--find_package( XRender   REQUIRED )
--find_package( XRandr    REQUIRED )
--find_package( GLEW      REQUIRED )
- 
- set( CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" )
-diff --git a/src/x.hpp b/src/x.hpp
-index 2478414..f35e722 100644
---- a/src/x.hpp
-+++ b/src/x.hpp
-@@ -26,7 +26,6 @@
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
- #include <X11/extensions/shape.h>
--#include <X11/extensions/Xrandr.h>
- 
- #include <stdlib.h>
- #include <cstring>
-@@ -97,7 +96,6 @@ public:
-     std::vector<bool>   m_mouse;
-     bool                mouseDown( unsigned int button );
-     bool                m_keypressed;
--    XRRScreenResources* m_res;
- private:
-     slop::CursorType    m_currentCursor;
-     bool                m_good;
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
new file mode 100644
index 000000000000..2ca92f9d2ac8
--- /dev/null
+++ b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
@@ -0,0 +1,56 @@
+--- 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 )
diff --git a/x11-misc/slop/metadata.xml b/x11-misc/slop/metadata.xml
index d1c681a60ce8..34017c588f44 100644
--- a/x11-misc/slop/metadata.xml
+++ b/x11-misc/slop/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>palipalo9@googlemail.com</email>
-		<name>Ingolf Wagner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 		slop (Select Operation) is an application that queries for a selection
 		from the user and prints the region to stdout. It grabs the mouse and
diff --git a/x11-misc/slop/slop-4.3.21.ebuild b/x11-misc/slop/slop-4.3.21.ebuild
deleted file mode 100644
index 20411872e466..000000000000
--- a/x11-misc/slop/slop-4.3.21.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An application that queries the user for a selection for printing"
-HOMEPAGE="https://github.com/naelstrof/slop"
-SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	opengl? (
-		media-libs/glew:0=
-		media-libs/imlib2
-		virtual/opengl
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)"
-DEPEND="
-	${RDEPEND}
-	opengl? (
-		media-libs/glm
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.21-no-cppcheck.patch"
-	"${FILESDIR}/${PN}-4.3.21-no-gengetopt.patch"
-	"${FILESDIR}/${PN}-4.3.21-no-librt.patch"
-)
-
-src_prepare() {
-	use opengl || PATCHES+=( "${FILESDIR}/${PN}-4.3.21-no-opengl.patch"  )
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_OPENGL_SUPPORT=$(usex opengl)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/slop/slop-6.3.46.ebuild b/x11-misc/slop/slop-6.3.46.ebuild
index d8334f019a4a..796bb1f9b9dc 100644
--- a/x11-misc/slop/slop-6.3.46.ebuild
+++ b/x11-misc/slop/slop-6.3.46.ebuild
@@ -15,13 +15,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-libs/icu
+	dev-libs/icu:=
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender
-"
+	x11-libs/libXrender"
 DEPEND="
 	${RDEPEND}
-	media-libs/glm
-"
+	media-libs/glm"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.3.46-fix-build-system.patch )