gentoo resync : 28.04.2019

4 files changed, 2 insertions, 232 deletions

diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 0388b6947904..4f43397266dd 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,6 +1,3 @@
-AUX j4-dmenu-desktop-2.16_system_catch.patch 5533 BLAKE2B 69745ebc955550ab3c02d31b455e8d36210aa845c09e3c1a5f61a829c0dfc779e093d818c977f98b1c5089f0a43662bd0b75d99bebeb83f9ada85175987134ad SHA512 dedb23a4b946a31778fdc1451ad2841d78bb6bfa00661e6e496fbd329f1c7fa6a3a3fcf52b35e1c02b049c1b2e614c9eeae6717851f56b6e89719cf017807c83
 DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
-DIST j4-dmenu-desktop-r2.16.tar.gz 32553 BLAKE2B c1c7f0f2a59421b2e244a8f65251b296ad44ae37c10cbffb62bdefb168b6104e3d89c0a43b74feaf0afcc52ac78c8d46204ed397f131e526c447379b066b9b88 SHA512 d5bb0902d4bdc474fa20bc9d8f79de90a92bb4941f0d325dfcfaa1347ea3ad355b87da8194bc3f654970e9ab8848e6ecb5093f3c75fbaa8dbc40199fe6ea2837
-EBUILD j4-dmenu-desktop-2.16.ebuild 904 BLAKE2B eaa5872c1fdde74a767910a477271343d01f7426248c9178f0d14d6b4cededc765d117d4870e683533fdb7aaf3c487a013da42f394872558c5d733ec9e7f0e56 SHA512 08b252636cd5a7186c1a739abb44b331302e0ea87566ad26c6baba152969838ea82d93d5df43c71cd2f71f49381ae94003f7ff94b51192d44b238145cee43eee
-EBUILD j4-dmenu-desktop-2.17.ebuild 808 BLAKE2B 7a5664e935bc33dcb765ecc9db16d3e05e8dacc2a605259cc76ad444d8f4e569fbc15a9021d2af4e11858ab94c68589c45a42ed53cbe432ef06fd0d7122565d2 SHA512 6334119b64677c378ed8b1ed1ec20a4a597faca4987fc3fbbb8df17ecddbfd16323181e29564160eebc743babf83d33005dbde9ea18dc04a5bf832b7e26fdaf2
+EBUILD j4-dmenu-desktop-2.17.ebuild 807 BLAKE2B 0bcdf7380a4b4305327d066cf8c10ad069e8e9e1c25177742f42fa2b04aacc13c6350d1b5c2c42f714e262004e5fd52dfd7de7e9ec1827b30be63578d2ae693c SHA512 d7a413ff8a273f80fa24cce11c5d3d867709bff55fee9d7a8345c17986c35d6f398a47ae794de0bce58fe3f146d7f8e0d093e72adbaa35cda0096186edeeb55c
 MISC metadata.xml 818 BLAKE2B b7c476e13a8de66b8f828895f478988d2f7381ff2ca823d7e0a74bb931f1b5288dd4d574cc8e4e5d2f5d4c7b1cb24c9d4fd9bb8cd1a9710d43ba2e6db90430cb SHA512 4444201bda84c9fc9eaffca6904df20fd06bcdf772a09a16d20d08015fea6672edb9e17435b35933b9ce71552831560b361732147c510ab1d79cea43073de8e1
diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
deleted file mode 100644
index 7becf7d3f75a..000000000000
--- a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 210926d23d0f40277b549ca490f876f93c3ffb6d Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 16:44:03 +0000
-Subject: [PATCH 1/3] CMake: simplify GCC version check
-
----
- CMakeLists.txt | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 392db54..78a71c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,21 +2,9 @@ cmake_minimum_required(VERSION 2.8)
- 
- project(j4-dmenu)
- 
--exec_program(
--  ${CMAKE_CXX_COMPILER}
--  ARGS --version
--  OUTPUT_VARIABLE _compiler_output
--  )
--string(REGEX REPLACE "(\n.*$)" "" cxx_compiler_version "${_compiler_output}")
--string(REGEX REPLACE "([^0-9.])|([0-9.][^0-9.])" "" cxx_compiler_version "${cxx_compiler_version}")
--
--if(CMAKE_COMPILER_IS_GNUCXX)
--  if(${cxx_compiler_version} VERSION_LESS "4.7.0")
--    set(CXX_OPT "-std=c++0x")
--  else()
--    set(CXX_OPT "-std=c++11")
--  endif()
--elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-+if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
-+  set(CXX_OPT "-std=c++0x")
-+else()
-   set(CXX_OPT "-std=c++11")
- endif()
- 
-
-From e6e05d0170554246118c2dffe5395a982e1af250 Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 16:53:39 +0000
-Subject: [PATCH 2/3] CMake: clean up and reorder CMAKE_CXX_FLAGS
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78a71c0..1b3f2b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ else()
-   set(CXX_OPT "-std=c++11")
- endif()
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} ${CXX_OPT} -Wall -pedantic -Wextra -O2")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(NOT DEFINED NO_TESTS)
-
-From 7be5116d0d6d80522517a58bb6e45ca1cdcd9612 Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 17:51:28 +0000
-Subject: [PATCH 3/3] CMake: add option to disable downloading Catch
-
----
- CMakeLists.txt | 90 ++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 47 insertions(+), 43 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b3f2b0..17605e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8)
- 
- project(j4-dmenu)
- 
-+option(WITH_TESTS "Build and run tests" ON)
-+option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
-+
- if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
-   set(CXX_OPT "-std=c++0x")
- else()
-@@ -11,53 +14,54 @@ endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
--if(NOT DEFINED NO_TESTS)
--  include(ExternalProject)
--
--  ExternalProject_Add(
--    catch
--    PREFIX ${CMAKE_BINARY_DIR}/catch
--    GIT_TAG Catch1.x
--    GIT_REPOSITORY https://github.com/catchorg/Catch2
--    TIMEOUT 10
--    UPDATE_COMMAND git pull
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND ""
--    LOG_DOWNLOAD ON
--    )
--
--  # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
--  ExternalProject_Get_Property(catch source_dir)
--  set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
--
--  # Includes Catch in the project:
--  #add_subdirectory(${EXT_PROJECTS_DIR}/catch)
--  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
--
--  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
--
-+if(WITH_TESTS)
-   enable_testing(true)
--
-   add_test(
--    NAME j4-dmenu-tests
--    COMMAND j4-dmenu-tests
--    )
--
-+          NAME j4-dmenu-tests
-+          COMMAND j4-dmenu-tests
-+  )
-   add_executable(
--    j4-dmenu-tests
--    src/Test.cc
--    src/TestApplication.cc
--    src/TestApplicationRunner.cc
--    src/TestSearchPath.cc
--    src/TestLocaleSuffixes.cc
--    src/TestFileFinder.cc
--    src/TestFormatters.cc
--    )
--
--  add_dependencies(j4-dmenu-tests catch)
--endif(NOT DEFINED NO_TESTS)
-+          j4-dmenu-tests
-+          src/Test.cc
-+          src/TestApplication.cc
-+          src/TestApplicationRunner.cc
-+          src/TestSearchPath.cc
-+          src/TestLocaleSuffixes.cc
-+          src/TestFileFinder.cc
-+          src/TestFormatters.cc
-+  )
-+  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
- 
-+  if(WITH_GIT_CATCH)
-+    include(ExternalProject)
-+    ExternalProject_Add(
-+      catch
-+      PREFIX ${CMAKE_BINARY_DIR}/catch
-+      GIT_TAG Catch1.x
-+      GIT_REPOSITORY https://github.com/catchorg/Catch2
-+      TIMEOUT 10
-+      UPDATE_COMMAND git pull
-+      CONFIGURE_COMMAND ""
-+      BUILD_COMMAND ""
-+      INSTALL_COMMAND ""
-+      LOG_DOWNLOAD ON
-+    )
-+    add_dependencies(j4-dmenu-tests catch)
-+
-+    # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
-+    ExternalProject_Get_Property(catch source_dir)
-+    set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
-+  else()
-+    # Use system-installed version of Catch
-+    find_path(CATCH_INCLUDE_DIR catch.hpp PATH_SUFFIXES catch)
-+    if(NOT CATCH_INCLUDE_DIR)
-+      message(FATAL_ERROR "Catch include directory not found")
-+    endif()
-+  endif(WITH_GIT_CATCH)
-+
-+  # Include Catch in the project
-+  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
-+endif(WITH_TESTS)
- 
- add_executable(
-     j4-dmenu-desktop
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
deleted file mode 100644
index 4770b776eb0f..000000000000
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PV="r${PV}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A fast desktop menu"
-HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-SRC_URI="https://github.com/enkore/j4-dmenu-desktop/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/catch:1 )"
-RDEPEND="x11-misc/dmenu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Merged upstream; remove in next version bump
-PATCHES=( "${FILESDIR}/${P}_system_catch.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_TESTS=$(usex test)
-		-DWITH_GIT_CATCH=no
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman "j4-dmenu-desktop.1"
-}
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
index 8017519a1386..c94e1d9cbba9 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-cpp/catch:1 )"