gentoo resync : 03.11.2019

5 files changed, 62 insertions, 31 deletions

diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 05dd91235063..ae68c4d3952d 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,4 +1,5 @@
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-EBUILD argon2-20171227-r1.ebuild 1187 BLAKE2B 32ac04d66e6d05e60f956db9d69448edfde245a908bb76576122949212cbb61808f14cb3ec29090d0660345bb80887b577b262b5c86ef12093b3a5dfd3b5ae84 SHA512 45076957bf043d9182dc8e7c36340461b5d8da9396aecfc51a724acd2fda956ffbfb3e5a772666fa33ecf52afb6b01c959adac665035cb82bc774783d29668ac
-EBUILD argon2-20171227.ebuild 920 BLAKE2B 9c4b2ea28975cb9f1338e9cc89606c4391a0ae407d75f6a4d14681602de2fae401d98006dd2257ca38cecb0b465afbeab21693cc2de77963faf59e4af68ed790 SHA512 eb226c4e7944ff088365edfda085327621d76c0f45e87cf975a1b05c2963204911368c0286500710d981046287fe3a4f9697f2f58e89db3657aa19669f5e0e72
-MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
+DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
+EBUILD argon2-20171227-r1.ebuild 1186 BLAKE2B de0c9acbbf3986e142d2e03b0d6e2d17e21b2ecc72fe1c8f43c668be1cff4b181c68a3fada4edda6e4baf7ed08aa36577ecebd23785ef68e290bc5ba9f1c309b SHA512 78ee07656fd711ff23ba7e7bd141f4d2a07101d43430df57aecb9a040df1c74b86389280b215d5aef54e83412f87a5ff67184c2746849b9499647828fcd429f0
+EBUILD argon2-20190702.ebuild 1154 BLAKE2B 342493283673d2556387288087d4e47406043449ed87896270e2544dfd9f1b84f519aef8782307b646a52161ccaf29d42d42acc027f9ab6819bfe741c0181ea1 SHA512 9f6c675c16982fdaab76cdf4c15de7c029bfad070651c069d51cf50c352b5dc5e607c97f0d2234099d56af17ccf32c06fa6b0248a9d25d21d5e39ef909a2c2f9
+MISC metadata.xml 768 BLAKE2B 294ef62768a6e09f38479670b9ee12f056822d43fa7de681e7243d676a037c77e1724777c20a13d564ad364dba84f55089734b3546d593bb4f362f7a0cba3475 SHA512 bd066d4ad7d717ec6316a9ce307b38fd35be60149619c82ab4d636d4ae7e17c3dd22c328f9a5b6e9b3e54f15bfb5d11fd57b4e73e3f5399f3042a08611500553
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
index 53602bc12911..e8a9219e21b1 100644
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
deleted file mode 100644
index 8ce2715a64d2..000000000000
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-	fi
-	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install || die
-}
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
new file mode 100644
index 000000000000..b3827b006351
--- /dev/null
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 CC0-1.0 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+
+DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
+
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i -e '/LIBRARIES =/s/\$(LIB_ST)//' Makefile || die
+	fi
+	sed -i \
+		-e 's/-O3//' \
+		-e 's/-g//' \
+		-e 's/-march=\$(OPTTARGET)//' \
+		Makefile || die
+
+	tc-export CC
+
+	if use amd64 || use x86; then
+		OPTTEST=0
+	else
+		OPTTEST=1
+	fi
+}
+
+src_compile() {
+	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)"
+}
+
+src_test() {
+	emake OPTTEST="${OPTTEST}" test
+}
+
+src_install() {
+	emake OPTTEST="${OPTTEST}" DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
+	einstalldocs
+	doman man/argon2.1
+}
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index b877484ca660..c70ce0ef68ab 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<longdescription>Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)</longdescription>
 	<slots>
 		<subslots>Reflect ABI of libargon2.so.</subslots>