From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D861138334 for ; Mon, 18 Mar 2019 18:12:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A19EE08D0; Mon, 18 Mar 2019 18:12:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A4CDE08D0 for ; Mon, 18 Mar 2019 18:12:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 548AD335D67 for ; Mon, 18 Mar 2019 18:12:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 513AD570 for ; Mon, 18 Mar 2019 18:12:08 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1552932699.4ecb44abefa303798a215efa56caf32e4674ff44.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/openmittsu/Manifest net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch net-im/openmittsu/openmittsu-0.9.9.48.ebuild X-VCS-Directories: net-im/openmittsu/files/ net-im/openmittsu/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 4ecb44abefa303798a215efa56caf32e4674ff44 X-VCS-Branch: master Date: Mon, 18 Mar 2019 18:12:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 134d2561-a788-422b-a93e-b1e927697bf2 X-Archives-Hash: 91cc2a9710f0b4c23731629f95117b7c commit: 4ecb44abefa303798a215efa56caf32e4674ff44 Author: Ulrich Müller gentoo org> AuthorDate: Mon Mar 18 18:11:08 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Mar 18 18:11:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecb44ab net-im/openmittsu: Remove old. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Ulrich Müller gentoo.org> net-im/openmittsu/Manifest | 1 - .../openmittsu-0.9.9.48-disable-googletest.patch | 79 ---------------------- net-im/openmittsu/openmittsu-0.9.9.48.ebuild | 53 --------------- 3 files changed, 133 deletions(-) diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest index b2ec10b9ce7..ec17a980fa3 100644 --- a/net-im/openmittsu/Manifest +++ b/net-im/openmittsu/Manifest @@ -1,3 +1,2 @@ DIST openmittsu-0.9.11.0.tar.xz 1408088 BLAKE2B 6c16ea2c35c0a4e02b2735d292516e22c238ca6d3f32f2869be8fec265f099761a5afef0303b2bd84c8f2e5383d7fff6dd18b2e57fc0d12da30a8d8a1637242b SHA512 534a589aa7bf4aa1be4e7d887ef1d4b025eeb1f82d8503cb048a7802ad4380c78224acae4a5f41a56be838a5a43af78f496bd0336034232208bc4de49a71b4d5 DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f -DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443 diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch deleted file mode 100644 index ceb162d5e6b..00000000000 --- a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch +++ /dev/null @@ -1,79 +0,0 @@ -Disable googletest for now, in order to avoid accessing the network -at configure time. - ---- openmittsu-0.9.9.48-orig/CMakeLists.txt -+++ openmittsu-0.9.9.48/CMakeLists.txt -@@ -212,28 +212,6 @@ - # Add the binary dir include directory - include_directories("${PROJECT_BINARY_DIR}/include") - --########################################################## --# --# Google Testing Framework --# --########################################################## --# Download and unpack googletest at configure time --configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt) --execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" ) --execute_process(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" ) -- --# Prevent GoogleTest from overriding our compiler/linker options --# when building with Visual Studio --set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- --# Add googletest directly to our build. This adds --# the following targets: gtest, gtest_main, gmock --# and gmock_main --add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src" -- "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL) -- - - # Main Sources - file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h) -@@ -399,24 +377,17 @@ - - add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED}) - --add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES} -- ${OPENMITTSU_RESOURCESOURCES} --) -- - if (MSVC) - set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") - endif(MSVC) - - # Add target link dependencies --target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest) -+target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES}) - target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY}) - --add_dependencies(openMittsuTests gtest) -- - # Use the required modules from Qt 5. - target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql) - target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql) --target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql) - target_link_libraries(openMittsuVersionInfo Qt5::Core) - - # Link against libc++abi if requested. -@@ -424,7 +395,6 @@ - target_link_libraries(openMittsu "c++abi") - target_link_libraries(openMittsuCore "c++abi") - target_link_libraries(openMittsuVersionInfo "c++abi") -- target_link_libraries(openMittsuTests "c++abi") - endif(OPENMITTSU_LINK_LIBCXXABI) - - # Targets, CPACK... -@@ -438,10 +408,6 @@ - RUNTIME - DESTINATION bin - COMPONENT installComponent) --install(TARGETS openMittsuTests -- RUNTIME -- DESTINATION bin -- COMPONENT installComponent) - - if (MSVC) - set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe") diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild deleted file mode 100644 index 241dd833295..00000000000 --- a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop - -DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks" -HOMEPAGE="https://www.openmittsu.de/" -# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-db/qt5-sqlcipher - >=dev-libs/libsodium-1.0.11:= - >=dev-qt/qtcore-5.7.1:5= - >=dev-qt/qtgui-5.7.1:5= - >=dev-qt/qtmultimedia-5.7.1:5= - >=dev-qt/qtnetwork-5.7.1:5=[ssl] - >=dev-qt/qtsql-5.7.1:5=[sqlite] - >=dev-qt/qtwidgets-5.7.1:5= - >=media-gfx/qrencode-3.4.4-r1:=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-disable-googletest.patch -) - -DOCS=( - README.md - Example-client-configuration-file.ini - Example-contacts-file.txt -) - -src_configure() { - local mycmakeargs=( - # set version manually, since autodetection works only with git - "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000" - "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON" - ) - cmake-utils_src_configure -} - -src_install() { - local my_pn="openMittsu" - cmake-utils_src_install - newicon resources/icon.png ${my_pn}.png - make_desktop_entry ${my_pn} ${my_pn} ${my_pn} - rm "${ED}"/usr/bin/${my_pn}VersionInfo || die -}