[gentoo-commits] repo/gentoo:master commit in: app-crypt/argon2/files/, app-crypt/argon2/ - gentoo-commits

From:	Craig Andrews <candrews@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-crypt/argon2/files/, app-crypt/argon2/
Date:	Tue, 02 Jan 2018 15:50:54
Message-Id:	`1514908240.bcbd83cd3a4958c79e9efe39940376cb32345aef.candrews@gentoo`

1

commit:     bcbd83cd3a4958c79e9efe39940376cb32345aef

2

Author:     Simon Levermann <simon <AT> slevermann <DOT> de>

3

AuthorDate: Tue Jan  2 15:38:51 2018 +0000

4

Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>

5

CommitDate: Tue Jan  2 15:50:40 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbd83cd

7

8

app-crypt/argon2: Drop old

9

10

Package-Manager: Portage-2.3.19, Repoman-2.3.6

11

12

 app-crypt/argon2/Manifest                          |  1 -

13

 app-crypt/argon2/argon2-20160821.ebuild            | 29 --------------

14

 app-crypt/argon2/argon2-20161029.ebuild            | 28 --------------

15

 .../argon2-20160821-makefile-install-target.patch  | 44 ----------------------

16

 .../argon2-20160821-makefile-soname-symlinks.patch | 28 --------------

17

 5 files changed, 130 deletions(-)

18

19

diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest

20

index 6bc6809f343..18945a78ec6 100644

21

--- a/app-crypt/argon2/Manifest

22

+++ b/app-crypt/argon2/Manifest

23

@@ -1,3 +1,2 @@

24

-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f

25

 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892

26

 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d

27

28

diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild

29

deleted file mode 100644

30

index b407a8dd9f5..00000000000

31

--- a/app-crypt/argon2/argon2-20160821.ebuild

32

+++ /dev/null

33

@@ -1,29 +0,0 @@

34

-# Copyright 1999-2017 Gentoo Foundation

35

-# Distributed under the terms of the GNU General Public License v2

36

-

37

-EAPI=6

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"

45

-KEYWORDS="~amd64 ~x86"

46

-IUSE="static-libs"

47

-

48

-S="${WORKDIR}/phc-winner-${P}"

49

-PATCHES=(

50

-	"${FILESDIR}/${P}-makefile-install-target.patch"

51

-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"

52

-	)

53

-src_prepare() {

54

-	default

55

-	if ! use static-libs; then

56

-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"

57

-	fi

58

-	sed -i -e 's/-O3 //' Makefile || die "sed failed"

59

-	sed -i -e 's/-g //' Makefile || die "sed failed"

60

-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"

61

-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"

62

-}

63

64

diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild

65

deleted file mode 100644

66

index ca5a7d99ac3..00000000000

67

--- a/app-crypt/argon2/argon2-20161029.ebuild

68

+++ /dev/null

69

@@ -1,28 +0,0 @@

70

-# Copyright 1999-2017 Gentoo Foundation

71

-# Distributed under the terms of the GNU General Public License v2

72

-

73

-EAPI=6

74

-

75

-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"

76

-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"

77

-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"

78

-

79

-LICENSE="|| ( Apache-2.0 CC0-1.0 )"

80

-SLOT="0"

81

-KEYWORDS="~amd64 ~x86"

82

-IUSE="static-libs"

83

-

84

-S="${WORKDIR}/phc-winner-${P}"

85

-PATCHES=(

86

-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"

87

-	)

88

-src_prepare() {

89

-	default

90

-	if ! use static-libs; then

91

-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"

92

-	fi

93

-	sed -i -e 's/-O3 //' Makefile || die "sed failed"

94

-	sed -i -e 's/-g //' Makefile || die "sed failed"

95

-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"

96

-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"

97

-}

98

99

diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch

100

deleted file mode 100644

101

index bcd8562a21c..00000000000

102

--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch

103

+++ /dev/null

104

@@ -1,44 +0,0 @@

105

-diff --git a/Makefile b/Makefile

106

-index e9d27c8..90c1818 100644

107

---- a/Makefile

108

-+++ b/Makefile

109

-@@ -80,11 +80,25 @@ endif

110

-

111

- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)

112

- LIB_ST := lib$(LIB_NAME).a

113

-+LIBRARIES = $(LIB_SH) $(LIB_ST)

114

-+HEADERS = include/argon2.h

115

-

116

--.PHONY: clean dist format $(GENKAT)

117

-+INSTALL = install

118

-+

119

-+DESTDIR =

120

-+PREFIX = /usr

121

-+INCLUDE_REL = include

122

-+LIBRARY_REL = lib

123

-+BINARY_REL = bin

124

-+

125

-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)

126

-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)

127

-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)

128

-+

129

-+.PHONY: clean dist format $(GENKAT) all install

130

-

131

- all: clean $(RUN) libs 

132

--libs: $(LIB_SH) $(LIB_ST)

133

-+libs: $(LIBRARIES)

134

-

135

- $(RUN):	        $(SRC) $(SRC_RUN)

136

- 		$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@

137

-@@ -129,3 +143,11 @@ testci:   $(SRC) src/test.c

138

- format:

139

- 		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \

140

- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h

141

-+

142

-+install: $(RUN) libs

143

-+	$(INSTALL) -d $(INST_INCLUDE)

144

-+	$(INSTALL) $(HEADERS) $(INST_INCLUDE)

145

-+	$(INSTALL) -d $(INST_LIBRARY)

146

-+	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)

147

-+	$(INSTALL) -d $(INST_BINARY)

148

-+	$(INSTALL) $(RUN) $(INST_BINARY)

149

150

diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch

151

deleted file mode 100644

152

index 11892de1115..00000000000

153

--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch

154

+++ /dev/null

155

@@ -1,28 +0,0 @@

156

-diff --git a/Makefile b/Makefile

157

-index 1838c13..85aa710 100644

158

---- a/Makefile

159

-+++ b/Makefile

160

-@@ -87,8 +87,10 @@ endif

161

- endif

162

-

163

- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)

164

-+LIB_SH_VERSION := $(LIB_SH).0

165

- LIB_ST := lib$(LIB_NAME).a

166

- LIBRARIES = $(LIB_SH) $(LIB_ST)

167

-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)

168

- HEADERS = include/argon2.h

169

-

170

- INSTALL = install

171

-@@ -153,9 +155,11 @@ format:

172

- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h

173

-

174

- install: $(RUN) libs

175

-+	mv $(LIB_SH) $(LIB_SH_VERSION)

176

-+	ln -sf $(LIB_SH_VERSION) $(LIB_SH)

177

- 	$(INSTALL) -d $(INST_INCLUDE)

178

- 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)

179

- 	$(INSTALL) -d $(INST_LIBRARY)

180

--	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)

181

-+	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)

182

- 	$(INSTALL) -d $(INST_BINARY)

183

- 	$(INSTALL) $(RUN) $(INST_BINARY)

1	commit: bcbd83cd3a4958c79e9efe39940376cb32345aef
2	Author: Simon Levermann <simon <AT> slevermann <DOT> de>
3	AuthorDate: Tue Jan 2 15:38:51 2018 +0000
4	Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5	CommitDate: Tue Jan 2 15:50:40 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbd83cd
7
8	app-crypt/argon2: Drop old
9
10	Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12	app-crypt/argon2/Manifest \| 1 -
13	app-crypt/argon2/argon2-20160821.ebuild \| 29 --------------
14	app-crypt/argon2/argon2-20161029.ebuild \| 28 --------------
15	.../argon2-20160821-makefile-install-target.patch \| 44 ----------------------
16	.../argon2-20160821-makefile-soname-symlinks.patch \| 28 --------------
17	5 files changed, 130 deletions(-)
18
19	diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
20	index 6bc6809f343..18945a78ec6 100644
21	--- a/app-crypt/argon2/Manifest
22	+++ b/app-crypt/argon2/Manifest
23	@@ -1,3 +1,2 @@
24	-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f
25	DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
26	DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
27
28	diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
29	deleted file mode 100644
30	index b407a8dd9f5..00000000000
31	--- a/app-crypt/argon2/argon2-20160821.ebuild
32	+++ /dev/null
33	@@ -1,29 +0,0 @@
34	-# Copyright 1999-2017 Gentoo Foundation
35	-# Distributed under the terms of the GNU General Public License v2
36	-
37	-EAPI=6
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"
45	-KEYWORDS="~amd64 ~x86"
46	-IUSE="static-libs"
47	-
48	-S="${WORKDIR}/phc-winner-${P}"
49	-PATCHES=(
50	- "${FILESDIR}/${P}-makefile-install-target.patch"
51	- "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
52	- )
53	-src_prepare() {
54	- default
55	- if ! use static-libs; then
56	- sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile \|\| die "sed failed!"
57	- fi
58	- sed -i -e 's/-O3 //' Makefile \|\| die "sed failed"
59	- sed -i -e 's/-g //' Makefile \|\| die "sed failed"
60	- sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile \|\| die "sed failed"
61	- sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile \|\| die "sed failed"
62	-}
63
64	diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild
65	deleted file mode 100644
66	index ca5a7d99ac3..00000000000
67	--- a/app-crypt/argon2/argon2-20161029.ebuild
68	+++ /dev/null
69	@@ -1,28 +0,0 @@
70	-# Copyright 1999-2017 Gentoo Foundation
71	-# Distributed under the terms of the GNU General Public License v2
72	-
73	-EAPI=6
74	-
75	-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
76	-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
77	-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
78	-
79	-LICENSE="\|\| ( Apache-2.0 CC0-1.0 )"
80	-SLOT="0"
81	-KEYWORDS="~amd64 ~x86"
82	-IUSE="static-libs"
83	-
84	-S="${WORKDIR}/phc-winner-${P}"
85	-PATCHES=(
86	- "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
87	- )
88	-src_prepare() {
89	- default
90	- if ! use static-libs; then
91	- sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile \|\| die "sed failed!"
92	- fi
93	- sed -i -e 's/-O3 //' Makefile \|\| die "sed failed"
94	- sed -i -e 's/-g //' Makefile \|\| die "sed failed"
95	- sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile \|\| die "sed failed"
96	- sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile \|\| die "sed failed"
97	-}
98
99	diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
100	deleted file mode 100644
101	index bcd8562a21c..00000000000
102	--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
103	+++ /dev/null
104	@@ -1,44 +0,0 @@
105	-diff --git a/Makefile b/Makefile
106	-index e9d27c8..90c1818 100644
107	---- a/Makefile
108	-+++ b/Makefile
109	-@@ -80,11 +80,25 @@ endif
110	-
111	- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
112	- LIB_ST := lib$(LIB_NAME).a
113	-+LIBRARIES = $(LIB_SH) $(LIB_ST)
114	-+HEADERS = include/argon2.h
115	-
116	--.PHONY: clean dist format $(GENKAT)
117	-+INSTALL = install
118	-+
119	-+DESTDIR =
120	-+PREFIX = /usr
121	-+INCLUDE_REL = include
122	-+LIBRARY_REL = lib
123	-+BINARY_REL = bin
124	-+
125	-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
126	-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
127	-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
128	-+
129	-+.PHONY: clean dist format $(GENKAT) all install
130	-
131	- all: clean $(RUN) libs
132	--libs: $(LIB_SH) $(LIB_ST)
133	-+libs: $(LIBRARIES)
134	-
135	- $(RUN): $(SRC) $(SRC_RUN)
136	- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
137	-@@ -129,3 +143,11 @@ testci: $(SRC) src/test.c
138	- format:
139	- clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
140	- -i include/.h src/.c src/.h src/blake2/.c src/blake2/*.h
141	-+
142	-+install: $(RUN) libs
143	-+ $(INSTALL) -d $(INST_INCLUDE)
144	-+ $(INSTALL) $(HEADERS) $(INST_INCLUDE)
145	-+ $(INSTALL) -d $(INST_LIBRARY)
146	-+ $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
147	-+ $(INSTALL) -d $(INST_BINARY)
148	-+ $(INSTALL) $(RUN) $(INST_BINARY)
149
150	diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
151	deleted file mode 100644
152	index 11892de1115..00000000000
153	--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
154	+++ /dev/null
155	@@ -1,28 +0,0 @@
156	-diff --git a/Makefile b/Makefile
157	-index 1838c13..85aa710 100644
158	---- a/Makefile
159	-+++ b/Makefile
160	-@@ -87,8 +87,10 @@ endif
161	- endif
162	-
163	- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
164	-+LIB_SH_VERSION := $(LIB_SH).0
165	- LIB_ST := lib$(LIB_NAME).a
166	- LIBRARIES = $(LIB_SH) $(LIB_ST)
167	-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
168	- HEADERS = include/argon2.h
169	-
170	- INSTALL = install
171	-@@ -153,9 +155,11 @@ format:
172	- -i include/.h src/.c src/.h src/blake2/.c src/blake2/*.h
173	-
174	- install: $(RUN) libs
175	-+ mv $(LIB_SH) $(LIB_SH_VERSION)
176	-+ ln -sf $(LIB_SH_VERSION) $(LIB_SH)
177	- $(INSTALL) -d $(INST_INCLUDE)
178	- $(INSTALL) $(HEADERS) $(INST_INCLUDE)
179	- $(INSTALL) -d $(INST_LIBRARY)
180	-- $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
181	-+ $(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
182	- $(INSTALL) -d $(INST_BINARY)
183	- $(INSTALL) $(RUN) $(INST_BINARY)

Gentoo Archives: gentoo-commits