Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/argon2/, app-crypt/argon2/files/
Date: Sat, 16 Mar 2019 04:55:56
Message-Id: 1552712131.b1ca5d3f98f9bd0e5207f0e7f4cdd4140a2fd109.kensington@gentoo
1 commit: b1ca5d3f98f9bd0e5207f0e7f4cdd4140a2fd109
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 16 04:51:53 2019 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 16 04:55:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ca5d3f
7
8 app-crypt/argon2: remove 20161029-r1
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
12
13 app-crypt/argon2/Manifest | 1 -
14 app-crypt/argon2/argon2-20161029-r1.ebuild | 34 ----------------------
15 .../argon2-20161029-makefile-soname-symlinks.patch | 28 ------------------
16 3 files changed, 63 deletions(-)
17
18 diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
19 index 18945a78ec6..0b6a21ebf66 100644
20 --- a/app-crypt/argon2/Manifest
21 +++ b/app-crypt/argon2/Manifest
22 @@ -1,2 +1 @@
23 -DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
24 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
25
26 diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
27 deleted file mode 100644
28 index 1af92a37183..00000000000
29 --- a/app-crypt/argon2/argon2-20161029-r1.ebuild
30 +++ /dev/null
31 @@ -1,34 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit multilib
38 -
39 -DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
40 -HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
41 -SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
42 -
43 -LICENSE="|| ( Apache-2.0 CC0-1.0 )"
44 -SLOT="0/0"
45 -KEYWORDS="~amd64 ~arm64 ~x86"
46 -IUSE="static-libs"
47 -
48 -S="${WORKDIR}/phc-winner-${P}"
49 -PATCHES=(
50 - "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
51 - )
52 -src_prepare() {
53 - default
54 - if ! use static-libs; then
55 - sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
56 - fi
57 - sed -i -e 's/-O3 //' Makefile || die "sed failed"
58 - sed -i -e 's/-g //' Makefile || die "sed failed"
59 - sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
60 - sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
61 -}
62 -
63 -src_install() {
64 - emake DESTDIR="${D}" LIBRARY_REL=$(get_libdir) install || die
65 -}
66
67 diff --git a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
68 deleted file mode 100644
69 index 11892de1115..00000000000
70 --- a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
71 +++ /dev/null
72 @@ -1,28 +0,0 @@
73 -diff --git a/Makefile b/Makefile
74 -index 1838c13..85aa710 100644
75 ---- a/Makefile
76 -+++ b/Makefile
77 -@@ -87,8 +87,10 @@ endif
78 - endif
79 -
80 - LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
81 -+LIB_SH_VERSION := $(LIB_SH).0
82 - LIB_ST := lib$(LIB_NAME).a
83 - LIBRARIES = $(LIB_SH) $(LIB_ST)
84 -+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
85 - HEADERS = include/argon2.h
86 -
87 - INSTALL = install
88 -@@ -153,9 +155,11 @@ format:
89 - -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
90 -
91 - install: $(RUN) libs
92 -+ mv $(LIB_SH) $(LIB_SH_VERSION)
93 -+ ln -sf $(LIB_SH_VERSION) $(LIB_SH)
94 - $(INSTALL) -d $(INST_INCLUDE)
95 - $(INSTALL) $(HEADERS) $(INST_INCLUDE)
96 - $(INSTALL) -d $(INST_LIBRARY)
97 -- $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
98 -+ $(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
99 - $(INSTALL) -d $(INST_BINARY)
100 - $(INSTALL) $(RUN) $(INST_BINARY)