commit:     1691d8bbd0809fd029d2a24939a85daf9ae3c659
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 12:44:57 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 13:11:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1691d8bb

app-admin/passwordsafe: remove old versions

Closes: https://bugs.gentoo.org/744355
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-admin/passwordsafe/Manifest                    |   2 -
 app-admin/passwordsafe/metadata.xml                |   2 -
 .../passwordsafe/passwordsafe-1.08_beta.ebuild     | 100 ---------------------
 app-admin/passwordsafe/passwordsafe-1.11.0.ebuild  |  93 -------------------
 4 files changed, 197 deletions(-)

diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index c0ee560d575..93cf11d9d43 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,3 +1 @@
-DIST passwordsafe-1.08_beta.tar.gz 14409047 BLAKE2B 
029568b435d4cc19f3a95364355546afb99c13bbee0e83c248d57f47e472da714b95be00658ec2bba161b8eab6f0d94bf2856a2198d29673987e5c0cddf69aaf
 SHA512 
7c37a91c71c1a79ea2cac87ec310d08df7491affd02c073d674bbedbabf25c1a1fb807376dae378dc4395b2146f6eaae059a0b14e0d1ba369cfa91a2d29060a4
-DIST passwordsafe-1.11.0.tar.gz 14538095 BLAKE2B 
c37e965968b7e2e694dfa9a9a9193dc9bb10f5b67446ce5db070be864c211f4af06e9c412fa1489f15151741fd1a1ec01d07d3dca4633effa284541e5d081268
 SHA512 
b6ac36911e24a89f51c8f2efaa381af516e826137a5b131a0258c00d9ff3be07b818ca23b3d49e8dee9913aa8fc73faedf2a70494c72c3b22cc518a9c215e5c5
 DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 
523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2
 SHA512 
c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a

diff --git a/app-admin/passwordsafe/metadata.xml 
b/app-admin/passwordsafe/metadata.xml
index 24e655194eb..ef0e2e070d7 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -10,11 +10,9 @@
                <name>Proxy Maintainers</name>
        </maintainer>
        <use>
-               <flag name="minimal">Avoid collision with 
<pkg>app-misc/pwsafe</pkg></flag>
                <flag name="qr">Enable QR code password display</flag>
                <flag name="yubikey">Enable support for Yubikey</flag>
                <flag name="xml">Enable XML import support</flag>
-               <flag name="xvkbd">Install <pkg>x11-misc/xvkbd</pkg> on-screen 
keyboard</flag>
        </use>
        <upstream>
                <remote-id type="github">pwsafe/pwsafe</remote-id>

diff --git a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild 
b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
deleted file mode 100644
index fe48f7cee17..00000000000
--- a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit desktop flag-o-matic wxwidgets cmake-utils
-
-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"
-IUSE="libressl minimal test qr yubikey +xml xvkbd"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="xml? ( dev-libs/xerces-c )
-       qr? ( media-gfx/qrencode )
-       net-misc/curl
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       sys-apps/util-linux
-       x11-libs/libXt
-       x11-libs/libXtst
-       x11-libs/wxGTK:${WX_GTK_VER}[X]
-       !minimal? ( !!app-misc/pwsafe )
-       yubikey? ( sys-auth/ykpers )"
-RDEPEND="${COMMON_DEPEND}
-       xvkbd? ( x11-misc/xvkbd )"
-DEPEND="${COMMON_DEPEND}
-       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_prepare() {
-       cmake-utils_src_prepare
-
-       # binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
-       # instead. Perform required changes in linking files
-       sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
-       sed -i docs/pwsafe.1 \
-               -e 's/PWSAFE/PASSWORDSAFE/' \
-               -e "s/^.B pwsafe/.B ${PN}/" || die
-}
-
-src_configure() {
-       need-wxwidgets unicode
-
-       local mycmakeargs=(
-               -DNO_QR=$(usex !qr)
-               -DNO_GTEST=$(usex !test)
-               -DSYSTEM_GTEST=ON
-               -DXML_XERCESC=$(usex xml)
-               -DNO_YUBI=$(usex !yubikey)
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       pushd "${BUILD_DIR}" || die
-       if use minimal; then
-               newbin pwsafe ${PN}
-       else
-               dobin pwsafe
-               dosym pwsafe /usr/bin/${PN}
-       fi
-       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.* docs/{ReleaseNotes.txt,ChangeLog.txt}
-
-       insinto /usr/share/${PN}
-       doins -r xml
-
-       newicon install/graphics/pwsafe.png ${PN}.png
-       newmenu install/desktop/pwsafe.desktop ${PN}.desktop
-}

diff --git a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild 
b/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
deleted file mode 100644
index a8f86f8a1e5..00000000000
--- a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2020 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"
-IUSE="libressl qr test +xml yubikey"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       net-misc/curl
-       sys-apps/file
-       sys-apps/util-linux
-       x11-libs/libXt
-       x11-libs/libXtst
-       x11-libs/wxGTK:${WX_GTK_VER}[X]
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       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
-
-       newicon install/graphics/pwsafe.png ${PN}.png
-       newmenu install/desktop/pwsafe.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-       optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
-}

Reply via email to