commit: e17a3a60231adfa4235f0164547a625b1e9f61e3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 18 12:29:17 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 18 15:49:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17a3a60
app-admin/passwordsafe: drop 1.13.0, 1.14.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-admin/passwordsafe/Manifest | 2 - .../passwordsafe-1.06_beta-system-gtest.patch | 69 ---------------- app-admin/passwordsafe/passwordsafe-1.13.0.ebuild | 92 ---------------------- .../passwordsafe/passwordsafe-1.14.0-r1.ebuild | 90 --------------------- 4 files changed, 253 deletions(-) diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest index 334320ca6a62..4cb3c9dc2d2b 100644 --- a/app-admin/passwordsafe/Manifest +++ b/app-admin/passwordsafe/Manifest @@ -1,3 +1 @@ -DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8 -DIST passwordsafe-1.14.0.tar.gz 15303935 BLAKE2B 977386e5c469772753173bd46f608e9fb77e462706fbe6bf80a18cf8e5f3b89cc7300f92298b2b45885dafbef323a0ba59d67ddcea20c229f4f9520a54800653 SHA512 958ab87ac6a9066a0359890facd509c1085646eddcefc33f89b934a9375df51bcbc78213298d165d354c64618c8fb753c2588e386e886fa4c1c478e0a27d3d27 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738 diff --git a/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch b/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch deleted file mode 100644 index b17385bdcd83..000000000000 --- a/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/CMakeLists.txt 2018-08-11 09:54:05.000000000 +0200 -+++ b/CMakeLists.txt 2018-08-22 10:48:06.422755215 +0200 -@@ -91,6 +91,7 @@ - # Configurable options: - option (NO_YUBI "Set ON to disable YubiKey support" OFF) - option (NO_GTEST "Set ON to disable gtest unit testing" OFF) -+option (SYSTEM_GTEST "Set ON to use gtest provided by the system" OFF) - - if (WIN32) - option (WX_WINDOWS "Build wxWidget under Windows" OFF) -@@ -256,31 +257,36 @@ - endif (MSVC) - - if (NOT NO_GTEST) -- # Download and unpack googletest at configure time -- # See https://crascit.com/2015/07/25/cmake-gtest/ -- configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt) -- execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -+ if (NOT SYSTEM_GTEST) -+ # Download and unpack googletest at configure time -+ # See https://crascit.com/2015/07/25/cmake-gtest/ -+ configure_file(Misc/CMakeLists.gtest.txt.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 . -+ 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) -+ # Set some other gtest configurations: -+ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE) -+ set(BUILD_GTEST ON CACHE BOOL "" FORCE) -+ set(INSTALL_GTEST OFF 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") -+ -+ include_directories("${gtest_SOURCE_DIR}/include" -+# "${gmock_SOURCE_DIR}/include" -+ ) -+ else (NOT SYSTEM_GTEST) -+ find_package(GTest REQUIRED) -+ set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES}) -+ endif(NOT SYSTEM_GTEST) - -- # Prevent GoogleTest from overriding our compiler/linker options -- # when building with Visual Studio -- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- # Set some other gtest configurations: -- set(BUILD_GMOCK OFF CACHE BOOL "" FORCE) -- set(BUILD_GTEST ON CACHE BOOL "" FORCE) -- set(INSTALL_GTEST OFF 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") -- -- include_directories("${gtest_SOURCE_DIR}/include" --# "${gmock_SOURCE_DIR}/include" -- ) - endif(NOT NO_GTEST) - - if (WIN32 AND NOT WX_WINDOWS) diff --git a/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild deleted file mode 100644 index 68384c419018..000000000000 --- a/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit cmake desktop flag-o-matic optfeature wxwidgets - -MY_PV="${PV/_beta/BETA}" -DESCRIPTION="Password manager with wxGTK based frontend" -HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"; -SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="qr test +xml yubikey" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/openssl:0= - net-misc/curl - sys-apps/file - sys-apps/util-linux - x11-libs/libXt - x11-libs/libXtst - x11-libs/wxGTK:${WX_GTK_VER}[X] - qr? ( media-gfx/qrencode ) - xml? ( dev-libs/xerces-c ) - yubikey? ( sys-auth/ykpers )" -RDEPEND="${DEPEND}" -BDEPEND=" - app-arch/zip - sys-devel/gettext - test? ( dev-cpp/gtest )" - -S="${WORKDIR}/pwsafe-${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-1.06_beta-system-gtest.patch" -) - -pkg_pretend() { - einfo "Checking for -std=c++11 support in compiler" - test-flags-CXX -std=c++11 > /dev/null || die -} - -src_configure() { - setup-wxwidgets - - local mycmakeargs=( - -DNO_QR=$(usex !qr) - -DNO_GTEST=$(usex !test) - -DSYSTEM_GTEST=ON - -DXML_XERCESC=$(usex xml) - -DNO_YUBI=$(usex !yubikey) - ) - - cmake_src_configure -} - -src_install() { - pushd "${BUILD_DIR}" || die - - dobin pwsafe - dobin cli/pwsafe-cli - dosym pwsafe /usr/bin/${PN} - dosym pwsafe-cli /usr/bin/${PN}-cli - - insinto /usr/share/locale - doins -r src/ui/wxWidgets/I18N/mos/* - - insinto /usr/share/${PN}/help - doins help/*.zip - - popd || die - - newman docs/pwsafe.1 ${PN}.1 - - dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt} - - insinto /usr/share/${PN} - doins -r xml - - doicon install/graphics/pwsafe.png - newmenu install/desktop/pwsafe.desktop ${PN}.desktop -} - -pkg_postinst() { - optfeature "on-screen keyboard for password entry" x11-misc/xvkbd -} diff --git a/app-admin/passwordsafe/passwordsafe-1.14.0-r1.ebuild b/app-admin/passwordsafe/passwordsafe-1.14.0-r1.ebuild deleted file mode 100644 index ccbfccc0f6e5..000000000000 --- a/app-admin/passwordsafe/passwordsafe-1.14.0-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" - -inherit cmake desktop flag-o-matic optfeature wxwidgets xdg - -MY_PV="${PV/_beta/BETA}" -DESCRIPTION="Password manager with wxGTK based frontend" -HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"; -SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="qr test +xml yubikey" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/openssl:0= - net-misc/curl - sys-apps/file - sys-apps/util-linux - x11-libs/libXt - x11-libs/libXtst - x11-libs/wxGTK:${WX_GTK_VER}[X] - qr? ( media-gfx/qrencode ) - xml? ( dev-libs/xerces-c ) - yubikey? ( sys-auth/ykpers )" -RDEPEND="${DEPEND}" -BDEPEND=" - app-arch/zip - sys-devel/gettext - test? ( dev-cpp/gtest )" - -S="${WORKDIR}/pwsafe-${MY_PV}" - -pkg_pretend() { - einfo "Checking for -std=c++11 support in compiler" - test-flags-CXX -std=c++11 > /dev/null || die -} - -src_configure() { - setup-wxwidgets - - local mycmakeargs=( - -DNO_QR=$(usex !qr) - -DNO_GTEST=$(usex !test) - -DGTEST_BUILD=OFF - -DXML_XERCESC=$(usex xml) - -DNO_YUBI=$(usex !yubikey) - ) - - cmake_src_configure -} - -src_install() { - pushd "${BUILD_DIR}" || die - - dobin pwsafe - dobin cli/pwsafe-cli - dosym pwsafe /usr/bin/${PN} - dosym pwsafe-cli /usr/bin/${PN}-cli - - insinto /usr/share/locale - doins -r src/ui/wxWidgets/I18N/mos/* - - insinto /usr/share/${PN}/help - doins help/*.zip - - popd || die - - newman docs/pwsafe.1 ${PN}.1 - - dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt} - - insinto /usr/share/${PN} - doins -r xml - - doicon -s 48 install/graphics/pwsafe.png - newmenu install/desktop/pwsafe.desktop ${PN}.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - optfeature "on-screen keyboard for password entry" x11-misc/xvkbd -}
