[gentoo-commits] dev/mrueg:master commit in: app-admin/passwordsafe/, app-admin/passwordsafe/files/

[Manuel Rüger]

commit:     315ee9f0a2a4d1089913190623cafae3c23c0dab
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 18:52:06 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 18:52:06 2016 +0000
URL:        https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=315ee9f0

app-admin/passwordsafe: Version bump. Remove old

Package-Manager: portage-2.2.27

 app-admin/passwordsafe/Manifest                    |  2 +-
 .../passwordsafe-0.98_beta-fix-noyubikey.patch     | 37 +++++++++++++++
 .../files/passwordsafe-0.98_beta-fix-yubikey.patch | 23 ++++++++++
 app-admin/passwordsafe/metadata.xml                |  1 +
 ...7_beta.ebuild => passwordsafe-0.98_beta.ebuild} | 53 +++++++++-------------
 5 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 8d1437c..38029bd 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1 +1 @@
-DIST passwordsafe-0.97_beta.tar.gz 13732972 SHA256 c19a7fff668d0459f304d83e6ddb75f52760d10ad2d015e5bb3446a920d88bd9 SHA512 f507fb3a3b3646c707be589a89442e58da47cc11f3675b6cedb6f57d40178ff5eb3ec9ba6443be6aec708ebbfbfb412fa7b641436c0b42d2e42b4238b3fbcae0 WHIRLPOOL dd344efca6625cc5cb8c0df1396ccfa1610c77c6636d459ad50088b749badba48fd67d688ca150a6f8e102542a01939a6514acd75ebaa3cec987bb2bd178bcf3
+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
new file mode 100644
index 0000000..0cd407c
--- /dev/null
+++ b/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-noyubikey.patch
@@ -0,0 +1,37 @@
+From e12b2f64717efa18589784f78894303ebaedf2a5 Mon Sep 17 00:00:00 2001
+From: Vladimir Timofeev <vovkasm@×××××.com>
+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
new file mode 100644
index 0000000..4b1e70b
--- /dev/null
+++ b/app-admin/passwordsafe/files/passwordsafe-0.98_beta-fix-yubikey.patch
@@ -0,0 +1,23 @@
+From 747a241892b1deb8ba12216ac23656dea8b4400d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu>
+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/metadata.xml b/app-admin/passwordsafe/metadata.xml
index a0ac2db..015554e 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="minimal">Avoid collision with app-misc/pwsafe</flag>
 		<flag name="yubikey">Enable support for Yubikey</flag>
+		<flag name="xml">Enable XML import support</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/passwordsafe/passwordsafe-0.97_beta.ebuild b/app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild
similarity index 69%
rename from app-admin/passwordsafe/passwordsafe-0.97_beta.ebuild
rename to app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild
index e6f730d..dac9adf 100644
--- a/app-admin/passwordsafe/passwordsafe-0.97_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-0.98_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 WX_GTK_VER="3.0"
 
-inherit eutils flag-o-matic wxwidgets
+inherit eutils flag-o-matic wxwidgets cmake-utils
 
 MY_PV="${PV/_beta/BETA}"
 DESCRIPTION="Password manager with wxGTK based frontend"
@@ -16,9 +16,9 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="minimal yubikey"
+IUSE="minimal yubikey +xml"
 
-RDEPEND="dev-libs/xerces-c
+RDEPEND="xml? ( dev-libs/xerces-c )
 	sys-apps/util-linux
 	sys-devel/gettext
 	x11-libs/libXt
@@ -36,53 +36,33 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	# remove hard coded compilers and compiler flags
-	sed -e '/^export CXXFLAGS/d' -i Makefile.linux || die
-	sed -i src/core/Makefile src/os/linux/Makefile src/ui/wxWidgets/Makefile \
-		-e 's/-O[0-3]\?//g' -e 's/-g(gdb)\?//g' \
-		-e '/^CC=/d' -e '/^CXX=/d' || die
-
-	# generator for the version.h only adds \r breaking the c file
-	cp src/ui/wxWidgets/version.in src/ui/wxWidgets/version.h || die
-
 	# 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
+	epatch "${FILESDIR}"/${P}-fix-noyubikey.patch\
+		"${FILESDIR}"/${P}-fix-yubikey.patch
 }
 
 src_configure() {
-	if ! use yubikey ; then
-		export NO_YUBI=1
-	fi
-
 	need-wxwidgets unicode
 
-	strip-flags
-	append-cxxflags -std=c++11
-}
+	local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON')
+		$(usex xml '' '-DNO_XML=ON') )
 
-src_compile() {
-	emake unicoderelease help I18N
+	cmake-utils_src_configure
 }
 
 src_install() {
+	pushd "${BUILD_DIR}" || die
 	if use minimal; then
-		newbin src/ui/wxWidgets/GCCUnicodeRelease/pwsafe ${PN}
+		newbin pwsafe ${PN}
 	else
-		dobin src/ui/wxWidgets/GCCUnicodeRelease/pwsafe
+		dobin pwsafe
 		dosym pwsafe /usr/bin/${PN}
 	fi
-
-	newman docs/pwsafe.1 ${PN}.1
-
-	dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt}
-
-	insinto /usr/share/pwsafe/xml
-	doins xml/*
-
 	insinto /usr/share/locale
 	doins -r src/ui/wxWidgets/I18N/mos/*
 
@@ -93,6 +73,15 @@ src_install() {
 	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
 }