gentoo resync : 25.01.2018

3 files changed, 98 insertions, 1 deletions

diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index b9b22d5d60c1..4db6022f3fcc 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,3 +1,5 @@
 DIST passwordsafe-1.02.1_beta.tar.gz 14068085 BLAKE2B 7a1bff0f2db798e08377436020473a8c6c46f9e64fa85629b6545f70954a3ad05735ee101bea021308589d523724f70fce24447837ee25cf1b897a7703873757 SHA512 c83a0c757f9f74906ffaebf650fd3f422a29f838c7f5430b3d3e32852b35dd92dc413a1c920320af9812d7960f0648e8df8a9d145828f8669e824e9972038067
+DIST passwordsafe-1.04_beta.tar.gz 14329263 BLAKE2B 17f4b0cd0b34f8907530a7da43dfbceab56c9aefd65f2d0ba0356b5a1820e8b4273c68655229a07947693fd6d320bc654065f790c86daff31679b565a57145fe SHA512 5f2d0634be3d3932991f77e96b7b40fee3984407ec8620d82caea089bba49df69444cdf8d2cf431aace43636c5034892a672c338ee98df06473d2569953bdab3
 EBUILD passwordsafe-1.02.1_beta.ebuild 2276 BLAKE2B 51d55af680ca670d0747b809b5db84aafc85eab319e6f902dcad0a30962b9289639037739df54154818d91a242e9093752b478e5fa802c97d576430e1c489d0c SHA512 6ac4ec9137b7e246237d12714d1700a0e0d877c8f4d1ff0556349ef8d2fb384a72d270715e80e32ac82e077adc3e520b3e8edabf4bfd9a512970118cf8f38039
-MISC metadata.xml 664 BLAKE2B 3a1f7900f12f0d1262724755129809a67b02e64be1129a411bde6d12d1a522c0c819ec1e9aa5c64594a47210edc8cb8c282f1699ab9fc7881ca3d27aab7d10d0 SHA512 af244a427e45d97e9e6ab5484e6827afb0f9346d69fed5660925e5d3aa4fb2d2cff4383b8bd92cefc8d0a544d288bdea402b4de9311d647d86e7844b91d67b43
+EBUILD passwordsafe-1.04_beta.ebuild 2238 BLAKE2B 8488518028d38ecfabbf6a67c420bbe9454e6214a11743fb0e0739980b457ef7c87f963bf50875f11d8d1871a62efa924efef303f58d3331b90e01a3e7ba63cb SHA512 4c0e09150fe4f24dc49e2955c3bb790f7ab61a4143c3cff9ddc7b9266f48d6b1f0b574bf83ccef84c7c2b9b62d0dd1d582bea82e67965135bb8b0035e80d7ab1
+MISC metadata.xml 778 BLAKE2B 5387ae1a60b8de35a2a845146c8016d8677e2b7381d9f1f2f7eb8c18b794969f2d1448b591885b978c7641a7b9ebf751c660fffe8780fbcd5089111c88918674 SHA512 29e765d326b3c165c0a649da8ba5e6be57a0dfdaa12a5b25ba8bac44c868638a24a6a9c8bbb27638d7f215841548577658e139d9abee0f3c61d1e96c3dffdacf
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index 36988d4359d5..cd092820b048 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -11,10 +11,12 @@
 	</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>
 	</use>
 	<upstream>
 		<remote-id type="github">pwsafe/pwsafe</remote-id>
+		<remote-id type="sourceforge">passwordsafe</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
new file mode 100644
index 000000000000..14da0d36f2c9
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit eutils 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="minimal test qr yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+	qr? ( media-gfx/qrencode )
+	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}
+	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_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)
+		-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/*
+
+	# 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.md README.LINUX.* 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
+}