commit: e3f5626fc90cc7b53338c64b5f3020aff82f6fb3 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Sun Mar 6 15:02:07 2016 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sun Mar 6 15:02:07 2016 +0000 URL: https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=e3f5626f
app-admin/passwordsafe: Remove old Package-Manager: portage-2.2.27 app-admin/passwordsafe/Manifest | 1 - .../passwordsafe-0.98_beta-fix-noyubikey.patch | 37 --------- .../files/passwordsafe-0.98_beta-fix-yubikey.patch | 23 ------ .../passwordsafe/passwordsafe-0.98_beta.ebuild | 90 ---------------------- 4 files changed, 151 deletions(-) diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest index e82926c..6e8cf27 100644 --- a/app-admin/passwordsafe/Manifest +++ b/app-admin/passwordsafe/Manifest @@ -1,2 +1 @@ DIST passwordsafe-0.98.1_beta.tar.gz 13836527 SHA256 d44bd032ac92503b118e59c19d6d8cccae85e4abe3561f72a4ae58bffd33e2a5 SHA512 42eecb9d2f3ccfaab2dff3b4dedee3fcb97645632f7596c724dc0eeacef55d88fad7438b863990cb2964b3fdf6272aec2bb53be53bb185d9fe593eb351a459ab WHIRLPOOL 0303c5c7d092290143925ba8edf6972dfc901e27bdb6f02f2e14a3e234b8dd47eeb131be015356a2378254d6ea76ae2020c04149a9b9c65139b16c48ff78429f -DIST passwordsafe-0.98_beta.tar.gz 13833262 SHA256 a15afcd6a6b3a13ba9651cd488d7268044fbb9db3bc002972cc845c5ba85ec56 SHA512 dc15906638e71c9feceb68c6e1bf9c2682e26dba8e35e7fc4b64ccb997b8b3d8e97af7938cc224ea9ed7e3910b657f4f7900d3768c6d25ffd26c65e3fd3c9cf9 WHIRLPOOL bdc016a2c0cdda1ba0a96e6118d2e9c28c6cd3ae521377ebed04c7e00cd590059a900b6999d0d30729a45b157c1bc37e3734b08a38a7ee4acc46582b16452c41 diff --git a/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-noyubikey.patch b/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-noyubikey.patch deleted file mode 100644 index 0cd407c..0000000 --- a/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-noyubikey.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e12b2f64717efa18589784f78894303ebaedf2a5 Mon Sep 17 00:00:00 2001 -From: Vladimir Timofeev <[email protected]> -Date: Fri, 29 Jan 2016 02:44:12 +0300 -Subject: [PATCH] Fix cmake build on Linux without yubikey lib (NO_YUBI option) - ---- - src/os/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt -index dfdcd6a..652bd47 100644 ---- a/src/os/CMakeLists.txt -+++ b/src/os/CMakeLists.txt -@@ -46,7 +46,6 @@ if (WIN32) - elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set (OS_SRCS - linux/KeySend.cpp -- linux/PWYubi.cpp - linux/UUID.cpp - linux/debug.cpp - linux/dir.cpp -@@ -65,10 +64,15 @@ if (WIN32) - linux/utf8conv.cpp - linux/xsendstring.cpp - ) -+ set (OS_YUBI_SRC linux/PWYubi.cpp) - else() - message (FATAL_ERROR "Unsupported OS " - ${CMAKE_SYSTEM_NAME} - " - can't build OS library") - endif() - -+if(HAVE_YKPERS_H) -+ list(APPEND OS_SRC ${OS_YUBI_SRC}) -+endif() -+ - add_library(os ${OS_SRCS}) diff --git a/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-yubikey.patch b/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-yubikey.patch deleted file mode 100644 index 4b1e70b..0000000 --- a/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-yubikey.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 747a241892b1deb8ba12216ac23656dea8b4400d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Manuel=20R=C3=BCger?= <[email protected]> -Date: Tue, 2 Feb 2016 19:42:07 +0100 -Subject: [PATCH] Fix cmake build on Linux with yubikey lib - -Commit e12b2f64717efa18589784f78894303ebaedf2a5 included a typo that resulted in a failing build of pwsafe with Yubikey support on Linux. ---- - src/os/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt -index 652bd47..a5597b0 100644 ---- a/src/os/CMakeLists.txt -+++ b/src/os/CMakeLists.txt -@@ -72,7 +72,7 @@ else() - endif() - - if(HAVE_YKPERS_H) -- list(APPEND OS_SRC ${OS_YUBI_SRC}) -+ list(APPEND OS_SRCS ${OS_YUBI_SRC}) - endif() - - add_library(os ${OS_SRCS}) diff --git a/app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild b/app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild deleted file mode 100644 index 51be156..0000000 --- a/app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WX_GTK_VER="3.0" - -inherit eutils flag-o-matic wxwidgets cmake-utils - -MY_PV="${PV/_beta/BETA}" -DESCRIPTION="Password manager with wxGTK based frontend" -HOMEPAGE="http://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="minimal test yubikey +xml" - -RDEPEND="xml? ( dev-libs/xerces-c ) - 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 )" -DEPEND="${RDEPEND} - 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_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 - use test || sed -i -e '/find_package(GTest REQUIRED)/s/^/#/' \ - -e '/add_subdirectory (src\/test)/s/^/#/' CMakeLists.txt || die - epatch "${FILESDIR}"/${P}-fix-noyubikey.patch\ - "${FILESDIR}"/${P}-fix-yubikey.patch -} - -src_configure() { - need-wxwidgets unicode - - local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON') - $(usex xml '' '-DNO_XML=ON') ) - - 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/* - - # The upstream Makefile builds this .zip file from html source material for - # use by the package's internal help system. Must prevent - # Portage from applying additional compression. - docompress -x /usr/share/doc/${PN}/help - insinto /usr/share/doc/${PN}/help - doins help/*.zip - - popd || die - - newman docs/pwsafe.1 ${PN}.1 - - dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt} - - insinto /usr/share/pwsafe/xml - doins xml/* - - newicon install/graphics/pwsafe.png ${PN}.png - newmenu install/desktop/pwsafe.desktop ${PN}.desktop -}
