gentoo resync : 03.01.2018

7 files changed, 18 insertions, 120 deletions

diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 41ec7096ecde..1e20d0a974db 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,9 +1,6 @@
-AUX argon2-20160821-makefile-install-target.patch 1170 BLAKE2B 982fa117ba37f579ad10226d0f9c4aae4bb1ffcd4fb6358f7ea2ceb36573bdd54df4da84031d8f219f3cc42885341c4d5ff558ffc9131c5bae115d4bb6e5a078 SHA512 33650ebcda89330aaaff917fcc699f3192c1a59fcd1b639f20fced6dc18d8286f83488e88aa11ebdf0dc0b7405dbfb36081951b5b9d946d15c895895036c0187
-AUX argon2-20160821-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
 AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
-EBUILD argon2-20160821.ebuild 1000 BLAKE2B 8f2f5ad5ab64772f42f89eb0b4a03316e28a9b5e1abc9e7b40b45cd3d750f7809a0e1f54e3cf6672a33fe41eb3e920436d04f0d8384f8bbd25def92dff3f9ad8 SHA512 31d61e573417378f1b913c107c32c1951f4aae0a876c249bd615a1c6d2cb6ebe3943347cf4d2a2b86e61959d43bbbbb74012e518ce662b35d1c561953873d4bc
-EBUILD argon2-20161029-r1.ebuild 1057 BLAKE2B 6b3a84ed9851f12c28814115ab06ec9b6d9c20c3a0a91c6e44f52f544cf4d8b1ee21a13f8f68945da6538ab5635b443892b5066b8f11c39407340c75625c2270 SHA512 adc2295e0d61355a451ba0bc330b11379448af73e5702090bb16ef765396438080477b3e5e56d63752a32e139ceda45050a8e58481ee966d3bfb73724ade554e
-EBUILD argon2-20161029.ebuild 950 BLAKE2B 0a0ad624228a086c8b8b3f020a831d04c48d865691d3b423f9c24d760cff67d0d1ce82f74f7db282443fc75e82f22b78b470f50c7165ffbda0f3a311b797cbf7 SHA512 02bc9f738cb35cc7df1a69cdc3549b4429d5c3b0d612924856ab0e409665aa81a061fba23559ab304713a5e7377ddb3994e7e0ba8d2267384fc2b66365b33153
-MISC metadata.xml 589 BLAKE2B f12ccc184378df6249ad590fcc0b8cff3a384f9bed308b30e2fb8892c2cf736265af5f5ab71d65b1a25665fd7598e34790aaadc43494c88f8da2ccfe91c99104 SHA512 929d78d8436196e717c57041b83fd01e48619a74e740c75148f8c347902aa154cfb350df5c294866c8e125363808b1b125731865a9f702b9a1e611cccb310d16
+DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
+EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
+EBUILD argon2-20171227.ebuild 869 BLAKE2B 54a9530e4dcc946160b058c6252cdd9f4ab6b1ed321b817e08d8fd93fe0729f66269d4acecc153dd2735159630881a1ee05cba59853097c5cca070936a3db5d9 SHA512 4595e3d98fcfe017c655de638496df4cee7b9b44805a653f23d40b33a2fc54a8363e699298004be52b8163e126832055f14f85613e67e8f19a5eafa2c97af912
+MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
deleted file mode 100644
index b407a8dd9f52..000000000000
--- a/app-crypt/argon2/argon2-20160821.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-install-target.patch"
-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-	)
-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 //' Makefile || die "sed failed"
-	sed -i -e 's/-g //' Makefile || die "sed failed"
-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}
diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
index 7bc3ecb38fcd..1af92a371835 100644
--- a/app-crypt/argon2/argon2-20161029-r1.ebuild
+++ b/app-crypt/argon2/argon2-20161029-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+SLOT="0/0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"
 
diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index ca5a7d99ac39..053764e3b4b3 100644
--- a/app-crypt/argon2/argon2-20161029.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,21 +8,20 @@ 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"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-	)
+
 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 //' Makefile || die "sed failed"
-	sed -i -e 's/-g //' Makefile || die "sed failed"
-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+	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="${D}" LIBRARY_REL="$(get_libdir)" install || die
 }
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
deleted file mode 100644
index bcd8562a21c4..000000000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e9d27c8..90c1818 100644
---- a/Makefile
-+++ b/Makefile
-@@ -80,11 +80,25 @@ endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
- LIB_ST := lib$(LIB_NAME).a
-+LIBRARIES = $(LIB_SH) $(LIB_ST)
-+HEADERS = include/argon2.h
- 
--.PHONY: clean dist format $(GENKAT)
-+INSTALL = install
-+
-+DESTDIR =
-+PREFIX = /usr
-+INCLUDE_REL = include
-+LIBRARY_REL = lib
-+BINARY_REL = bin
-+
-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
-+
-+.PHONY: clean dist format $(GENKAT) all install
- 
- all: clean $(RUN) libs 
--libs: $(LIB_SH) $(LIB_ST)
-+libs: $(LIBRARIES)
- 
- $(RUN):	        $(SRC) $(SRC_RUN)
- 		$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-@@ -129,3 +143,11 @@ testci:   $(SRC) src/test.c
- format:
- 		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
-+
-+install: $(RUN) libs
-+	$(INSTALL) -d $(INST_INCLUDE)
-+	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
-+	$(INSTALL) -d $(INST_LIBRARY)
-+	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) -d $(INST_BINARY)
-+	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
deleted file mode 100644
index 11892de11158..000000000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1838c13..85aa710 100644
---- a/Makefile
-+++ b/Makefile
-@@ -87,8 +87,10 @@ endif
- endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
-+LIB_SH_VERSION := $(LIB_SH).0
- LIB_ST := lib$(LIB_NAME).a
- LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
- 
- INSTALL = install
-@@ -153,9 +155,11 @@ format:
- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
- 
- install: $(RUN) libs
-+	mv $(LIB_SH) $(LIB_SH_VERSION)
-+	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
- 	$(INSTALL) -d $(INST_INCLUDE)
- 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
- 	$(INSTALL) -d $(INST_LIBRARY)
--	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
- 	$(INSTALL) -d $(INST_BINARY)
- 	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index d4ab4191e921..b877484ca660 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -10,6 +10,9 @@
 		<name>Proxy Maintainers</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>
+	</slots>
 	<upstream>
 		<remote-id type="github">P-H-C/phc-winner-argon2</remote-id>
 	</upstream>