gentoo resync : 25.04.2020

4 files changed, 29 insertions, 80 deletions

diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 5a0831b9e7c7..0ed71c5c6a1f 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,5 +1,3 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
-DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
-EBUILD pwman3-0.10.0.ebuild 899 BLAKE2B 9debf824f3144a676c64cc5e7ea4dcc22d4e4449494465defb346dd3d5ecbbddb32cef448e4727a7a2645f6f8fc20d1dfa36799b68ef9f2ac70720b6ebf86bc7 SHA512 08feba0e96c222094319d65d48e20944c661cefdb13e16b14c7a082416e6f2a66b5c4bcb75e264e737225be767140ac74b75db155f7d2ce228685b8e247bcc63
-EBUILD pwman3-0.9.11.ebuild 896 BLAKE2B 2a0669a32e3e700f6dcb8290d5dea66acb37c9582c9a6a545c43da930206fff0ea8018b8a0b00c9badeb1ca616e7f6497069b333baef715e1d6c1b6d2032366d SHA512 f2ec6bf95e389c3e627d328a0a7b4ce7d604a7a7304dd49a2fe3e73b97c5200fe90dc9b211f8ce39308ef521fc80ae44f00fa1810fa5336f4851319dfde6c80b
-MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
+EBUILD pwman3-0.10.0-r1.ebuild 885 BLAKE2B 655432295d431222968c3053b5431106ae3b561b7035b77c0af414bb2178ca02410197b65d96f112feb96902f7bd75ab821e2d41cb94f4a0968b6de5bddebe30 SHA512 5da4a911cc179eba8f02682ba401942e020b0e2744c352da2a1a60c84426cfde0a8631359c05dbc2914f68d6c453df142ecedbe281e1db1078ca109499758382
+MISC metadata.xml 913 BLAKE2B e7a041ce4293eb3bab14c466486960eb3d3268c77cadfc88612844fb0c5a599dd6fac5464a42f2e417cd0e56210020ce9002f35eaf5c2350c0a39158b01b8e84 SHA512 bb1aa91fc1f1e02865cc8de32cfadde8374dae91dd75f060289b0f2e5754ab20e9929f541467d5b369cdb4daf83b25235f1f613e89d1871413f619012701327f
diff --git a/app-admin/pwman3/metadata.xml b/app-admin/pwman3/metadata.xml
index 9bb7c2866116..9b3b7313abcd 100644
--- a/app-admin/pwman3/metadata.xml
+++ b/app-admin/pwman3/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Oz Tiram</name>
-	<email>oz.tiram@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<use>
-	<flag name="mongodb">Add support for MongoDB</flag>
-</use>
-<longdescription lang="en">
+	<maintainer type="person">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
 	A lightweight command line password manager, which can use different
 	databases to store your passwords (currently, SQLite, MySQL, Postgresql
 	and MongoDB are supported). Pwman3 can also copy passwords to the
@@ -20,8 +17,8 @@
 	Pwman3 can also generate passwords using different algorithms.
 	Per default pwman3 uses a strong AES encryption algorithm to store the
 	data.
-</longdescription>
-<upstream>
-	<remote-id type="github">pwman3/pwman3</remote-id>
-</upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pwman3/pwman3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
index bbacc08b8c4c..d86b04e68b18 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -1,39 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils
 
 DESCRIPTION="A lightweight password-manager with multiple database backends"
 HOMEPAGE="https://pwman3.github.io/pwman3/"
 SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="mongodb mysql postgres +sqlite test"
 RESTRICT="!test? ( test )"
 
-COMMON="
+RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
-	"
-
-DEPEND="
-	${COMMON}
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
-	"
+"
+BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
 
-RDEPEND="
-	${COMMON}
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-	"
+distutils_enable_tests setup.py
 
-python_test() {
-	esetup.py test
+pkg_postinst() {
+	optfeature "Support for mongodb" dev-python/pymongo
+	optfeature "Support for postgresql" dev-python/psycopg
+	optfeature "Support for mysql" dev-python/pymysql
 }
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
deleted file mode 100644
index f10173d499f0..000000000000
--- a/app-admin/pwman3/pwman3-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
-
-DESCRIPTION="A lightweight password-manager with multiple database backends"
-HOMEPAGE="https://pwman3.github.io/pwman3/"
-SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mongodb mysql postgres +sqlite test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
-	"
-
-DEPEND="
-	${CDEPEND}
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="
-	${CDEPEND}
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	esetup.py test
-}