[gentoo-commits] repo/gentoo:master commit in: sys-auth/bioapi/, sys-auth/bioapi/files/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-auth/bioapi/, sys-auth/bioapi/files/
Date:	Thu, 29 Mar 2018 19:23:08
Message-Id:	`1522351373.4792a6eaaed7cce81d758b7ca9aede259c71527d.mgorny@gentoo`

1

commit:     4792a6eaaed7cce81d758b7ca9aede259c71527d

2

Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>

3

AuthorDate: Tue Mar 27 14:11:53 2018 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Thu Mar 29 19:22:53 2018 +0000

6

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

7

8

sys-auth/bioapi: Remove old

9

10

Closes: https://github.com/gentoo/gentoo/pull/7644

11

Package-Manager: Portage-2.3.24, Repoman-2.3.6

12

13

 sys-auth/bioapi/Manifest                           |  1 -

14

 sys-auth/bioapi/bioapi-1.2.3-r2.ebuild             | 78 ----------------------

15

 sys-auth/bioapi/files/bioapi-1.2.3-build.patch     | 42 ------------

16

 .../bioapi/files/bioapi-1.2.3-enroll-ret.patch     | 16 -----

17

 sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch     | 12 ----

18

 5 files changed, 149 deletions(-)

19

20

diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest

21

index a6509f511f6..7d40b0cbe18 100644

22

--- a/sys-auth/bioapi/Manifest

23

+++ b/sys-auth/bioapi/Manifest

24

@@ -1,2 +1 @@

25

-DIST bioapi_1.2.3.tar.gz 1634237 BLAKE2B 002ac9c1543645759cc03fd7d33513b893fd3c5dcdd45cd3f92a992a0793c043ff5d41cff560c34d88c5c033fde4d54b35a66c09903ac5c5927123fa4e6e1ecd SHA512 683da884a5cf6d72b577f7c1f642930c152c43c7acad3c678a3571acf3f66e0a7e112fccde06d9a7535a186bcb56a96acfb5e1c405b1d931be9f252be1b01649

26

 DIST bioapi_1.2.4.tar.gz 953136 BLAKE2B 2ce44892f740696ea264776a1e03c170415b26326ddd4b48c73732b9556349860139a62ed0bdfad5eb6b085ed45286cfe838287aac57bca4a9767aa2a06c707d SHA512 99c67fea34b73291dcaeb1590fac88b3196d3ca65f788b92d0afd6ba85036b2d85397e3faa66b872a68bffaeb7c2bf5c731306bf02a25a435ef06cea18da746f

27

28

diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild

29

deleted file mode 100644

30

index 2d83ab6ad7c..00000000000

31

--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild

32

+++ /dev/null

33

@@ -1,78 +0,0 @@

34

-# Copyright 1999-2012 Gentoo Foundation

35

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

36

-

37

-EAPI="2"

38

-

39

-inherit eutils multilib user

40

-

41

-DESCRIPTION="Framework for biometric-based authentication"

42

-HOMEPAGE="https://github.com/mr-c/bioapi-linux"

43

-SRC_URI="https://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"

44

-

45

-LICENSE="bioapi"

46

-SLOT="0"

47

-KEYWORDS="amd64 x86"

48

-IUSE=""

49

-

50

-S=${WORKDIR}/bioapi-linux

51

-

52

-src_prepare() {

53

-	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654

54

-	epatch "${FILESDIR}"/${P}-no-delete.patch

55

-	epatch "${FILESDIR}"/${P}-gcc44.patch

56

-	epatch "${FILESDIR}"/${P}-build.patch #336107

57

-	rm -f config.{guess,sub} #337805

58

-	touch config.{guess,sub}

59

-}

60

-

61

-src_configure() {

62

-	econf --without-Qt-dir

63

-}

64

-

65

-src_install() {

66

-	emake SKIPCONFIG=true DESTDIR="${D}" install || die

67

-	dodoc README

68

-	dohtml *.htm

69

-

70

-	# rename generic binaries

71

-	mv "${D}"/usr/bin/{,BioAPI}Sample || die

72

-}

73

-

74

-pkg_config() {

75

-	mds_install -s /usr/$(get_libdir)

76

-	mod_install -fi /usr/$(get_libdir)/libbioapi100.so

77

-	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so

78

-	mod_install -fi /usr/$(get_libdir)/libpwbsp.so

79

-}

80

-

81

-pkg_preinst() {

82

-	if [[ -e ${ROOT}/var/bioapi ]] && [[ ! -e ${ROOT}/var/lib/bioapi ]] ; then

83

-		einfo "Moving /var/bioapi to /var/lib/bioapi"

84

-		dodir /var/lib

85

-		mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi

86

-	fi

87

-}

88

-

89

-pkg_postinst() {

90

-	einfo "Some generic-named programs have been renamed:"

91

-	einfo "  Sample -> BioAPISample"

92

-

93

-	if [[ ${ROOT} == "/" ]] ; then

94

-		pkg_config

95

-	else

96

-		ewarn "You will need to run 'emerge --config bioapi' before"

97

-		ewarn " you can use bioapi properly."

98

-	fi

99

-

100

-	# XXX: this can't be correct ...

101

-	enewgroup bioapi

102

-	chgrp bioapi "${ROOT}"/var/lib/bioapi -R

103

-	chmod g+w,o= "${ROOT}"/var/lib/bioapi -R

104

-	einfo "Note: users using bioapi must be in group bioapi."

105

-}

106

-

107

-pkg_prerm() {

108

-	mod_install -fu libbioapi100.so

109

-	mod_install -fu libbioapi_dummy100.so

110

-	mod_install -fu libpwbsp.so

111

-}

112

113

diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch b/sys-auth/bioapi/files/bioapi-1.2.3-build.patch

114

deleted file mode 100644

115

index 9d679fe8c89..00000000000

116

--- a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch

117

+++ /dev/null

118

@@ -1,42 +0,0 @@

119

-http://code.google.com/p/bioapi-linux/issues/detail?id=4

120

-

121

---- a/addins/pwbsp/Makefile.in

122

-+++ b/addins/pwbsp/Makefile.in

123

-@@ -87,7 +87,7 @@ CC = @CC@

124

- CCDEPMODE = @CCDEPMODE@

125

- CFLAGS = @CFLAGS@

126

- CPP = @CPP@

127

--CPPFLAGS = -I${top_srcdir}/include/ \

128

-+AM_CPPFLAGS = -I${top_srcdir}/include/ \

129

- 		-I${top_srcdir}/imports/cdsa/v2_0/inc/

130

-

131

- CXX = @CXX@

132

-@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@

133

- INSTALL_PROGRAM = @INSTALL_PROGRAM@

134

- INSTALL_SCRIPT = @INSTALL_SCRIPT@

135

- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

136

--LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver

137

-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver

138

- LEX = @LEX@

139

- LEXLIB = @LEXLIB@

140

- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@

141

---- a/addins/qtpwbsp/Makefile.in

142

-+++ b/addins/qtpwbsp/Makefile.in

143

-@@ -96,7 +96,7 @@ CC = @CC@

144

- CCDEPMODE = @CCDEPMODE@

145

- CFLAGS = @CFLAGS@

146

- CPP = @CPP@

147

--CPPFLAGS = -I${top_srcdir}/include \

148

-+AM_CPPFLAGS = -I${top_srcdir}/include \

149

- 		-I${top_srcdir}/imports/cdsa/v2_0/inc \

150

- 		${QT_CXXFLAGS}

151

-

152

-@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@

153

- INSTALL_PROGRAM = @INSTALL_PROGRAM@

154

- INSTALL_SCRIPT = @INSTALL_SCRIPT@

155

- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

156

--LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \

157

-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \

158

- 		${QT_LIBS}

159

-

160

- LEX = @LEX@

161

162

diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch b/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch

163

deleted file mode 100644

164

index e077c135d63..00000000000

165

--- a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch

166

+++ /dev/null

167

@@ -1,16 +0,0 @@

168

-http://bugs.gentoo.org/236654

169

-

170

-make sure we return 0 when things work

171

-

172

-patch by kouyu

173

-

174

---- bioapi-linux/apps/NonGUI_Sample/main.c

175

-+++ bioapi-linux/apps/NonGUI_Sample/main.c

176

-@@ -234,6 +234,7 @@

177

-     }

178

-

179

-     OutputToFile(userName, EnrolledTemplate);

180

-+    return 0;

181

-   }

182

- }

183

-

184

185

diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch b/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch

186

deleted file mode 100644

187

index 1f81298066d..00000000000

188

--- a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch

189

+++ /dev/null

190

@@ -1,12 +0,0 @@

191

-diff -ur bioapi-linux.orig/framework/mds_util_api/mds_app_util.c bioapi-linux/framework/mds_util_api/mds_app_util.c

192

---- bioapi-linux.orig/framework/mds_util_api/mds_app_util.c	2007-07-14 08:06:14.000000000 +0300

193

-+++ bioapi-linux/framework/mds_util_api/mds_app_util.c	2009-07-25 23:26:55.000000000 +0300

194

-@@ -28,7 +28,7 @@

195

-  	/* Linux-Port: added "const" keyword for Linux version */

196

- #if defined (UNIX)

197

-  	const BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

198

--#elif

199

-+#else

200

- 	BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

201

- #endif

202

-

1	commit: 4792a6eaaed7cce81d758b7ca9aede259c71527d
2	Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3	AuthorDate: Tue Mar 27 14:11:53 2018 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Thu Mar 29 19:22:53 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4792a6ea
7
8	sys-auth/bioapi: Remove old
9
10	Closes: https://github.com/gentoo/gentoo/pull/7644
11	Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13	sys-auth/bioapi/Manifest \| 1 -
14	sys-auth/bioapi/bioapi-1.2.3-r2.ebuild \| 78 ----------------------
15	sys-auth/bioapi/files/bioapi-1.2.3-build.patch \| 42 ------------
16	.../bioapi/files/bioapi-1.2.3-enroll-ret.patch \| 16 -----
17	sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch \| 12 ----
18	5 files changed, 149 deletions(-)
19
20	diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
21	index a6509f511f6..7d40b0cbe18 100644
22	--- a/sys-auth/bioapi/Manifest
23	+++ b/sys-auth/bioapi/Manifest
24	@@ -1,2 +1 @@
25	-DIST bioapi_1.2.3.tar.gz 1634237 BLAKE2B 002ac9c1543645759cc03fd7d33513b893fd3c5dcdd45cd3f92a992a0793c043ff5d41cff560c34d88c5c033fde4d54b35a66c09903ac5c5927123fa4e6e1ecd SHA512 683da884a5cf6d72b577f7c1f642930c152c43c7acad3c678a3571acf3f66e0a7e112fccde06d9a7535a186bcb56a96acfb5e1c405b1d931be9f252be1b01649
26	DIST bioapi_1.2.4.tar.gz 953136 BLAKE2B 2ce44892f740696ea264776a1e03c170415b26326ddd4b48c73732b9556349860139a62ed0bdfad5eb6b085ed45286cfe838287aac57bca4a9767aa2a06c707d SHA512 99c67fea34b73291dcaeb1590fac88b3196d3ca65f788b92d0afd6ba85036b2d85397e3faa66b872a68bffaeb7c2bf5c731306bf02a25a435ef06cea18da746f
27
28	diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
29	deleted file mode 100644
30	index 2d83ab6ad7c..00000000000
31	--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
32	+++ /dev/null
33	@@ -1,78 +0,0 @@
34	-# Copyright 1999-2012 Gentoo Foundation
35	-# Distributed under the terms of the GNU General Public License v2
36	-
37	-EAPI="2"
38	-
39	-inherit eutils multilib user
40	-
41	-DESCRIPTION="Framework for biometric-based authentication"
42	-HOMEPAGE="https://github.com/mr-c/bioapi-linux"
43	-SRC_URI="https://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
44	-
45	-LICENSE="bioapi"
46	-SLOT="0"
47	-KEYWORDS="amd64 x86"
48	-IUSE=""
49	-
50	-S=${WORKDIR}/bioapi-linux
51	-
52	-src_prepare() {
53	- epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
54	- epatch "${FILESDIR}"/${P}-no-delete.patch
55	- epatch "${FILESDIR}"/${P}-gcc44.patch
56	- epatch "${FILESDIR}"/${P}-build.patch #336107
57	- rm -f config.{guess,sub} #337805
58	- touch config.{guess,sub}
59	-}
60	-
61	-src_configure() {
62	- econf --without-Qt-dir
63	-}
64	-
65	-src_install() {
66	- emake SKIPCONFIG=true DESTDIR="${D}" install \|\| die
67	- dodoc README
68	- dohtml *.htm
69	-
70	- # rename generic binaries
71	- mv "${D}"/usr/bin/{,BioAPI}Sample \|\| die
72	-}
73	-
74	-pkg_config() {
75	- mds_install -s /usr/$(get_libdir)
76	- mod_install -fi /usr/$(get_libdir)/libbioapi100.so
77	- mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
78	- mod_install -fi /usr/$(get_libdir)/libpwbsp.so
79	-}
80	-
81	-pkg_preinst() {
82	- if [[ -e ${ROOT}/var/bioapi ]] && [[ ! -e ${ROOT}/var/lib/bioapi ]] ; then
83	- einfo "Moving /var/bioapi to /var/lib/bioapi"
84	- dodir /var/lib
85	- mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi
86	- fi
87	-}
88	-
89	-pkg_postinst() {
90	- einfo "Some generic-named programs have been renamed:"
91	- einfo " Sample -> BioAPISample"
92	-
93	- if [[ ${ROOT} == "/" ]] ; then
94	- pkg_config
95	- else
96	- ewarn "You will need to run 'emerge --config bioapi' before"
97	- ewarn " you can use bioapi properly."
98	- fi
99	-
100	- # XXX: this can't be correct ...
101	- enewgroup bioapi
102	- chgrp bioapi "${ROOT}"/var/lib/bioapi -R
103	- chmod g+w,o= "${ROOT}"/var/lib/bioapi -R
104	- einfo "Note: users using bioapi must be in group bioapi."
105	-}
106	-
107	-pkg_prerm() {
108	- mod_install -fu libbioapi100.so
109	- mod_install -fu libbioapi_dummy100.so
110	- mod_install -fu libpwbsp.so
111	-}
112
113	diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch b/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
114	deleted file mode 100644
115	index 9d679fe8c89..00000000000
116	--- a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
117	+++ /dev/null
118	@@ -1,42 +0,0 @@
119	-http://code.google.com/p/bioapi-linux/issues/detail?id=4
120	-
121	---- a/addins/pwbsp/Makefile.in
122	-+++ b/addins/pwbsp/Makefile.in
123	-@@ -87,7 +87,7 @@ CC = @CC@
124	- CCDEPMODE = @CCDEPMODE@
125	- CFLAGS = @CFLAGS@
126	- CPP = @CPP@
127	--CPPFLAGS = -I${top_srcdir}/include/ \
128	-+AM_CPPFLAGS = -I${top_srcdir}/include/ \
129	- -I${top_srcdir}/imports/cdsa/v2_0/inc/
130	-
131	- CXX = @CXX@
132	-@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
133	- INSTALL_PROGRAM = @INSTALL_PROGRAM@
134	- INSTALL_SCRIPT = @INSTALL_SCRIPT@
135	- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
136	--LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
137	-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
138	- LEX = @LEX@
139	- LEXLIB = @LEXLIB@
140	- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
141	---- a/addins/qtpwbsp/Makefile.in
142	-+++ b/addins/qtpwbsp/Makefile.in
143	-@@ -96,7 +96,7 @@ CC = @CC@
144	- CCDEPMODE = @CCDEPMODE@
145	- CFLAGS = @CFLAGS@
146	- CPP = @CPP@
147	--CPPFLAGS = -I${top_srcdir}/include \
148	-+AM_CPPFLAGS = -I${top_srcdir}/include \
149	- -I${top_srcdir}/imports/cdsa/v2_0/inc \
150	- ${QT_CXXFLAGS}
151	-
152	-@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
153	- INSTALL_PROGRAM = @INSTALL_PROGRAM@
154	- INSTALL_SCRIPT = @INSTALL_SCRIPT@
155	- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
156	--LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
157	-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
158	- ${QT_LIBS}
159	-
160	- LEX = @LEX@
161
162	diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch b/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
163	deleted file mode 100644
164	index e077c135d63..00000000000
165	--- a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
166	+++ /dev/null
167	@@ -1,16 +0,0 @@
168	-http://bugs.gentoo.org/236654
169	-
170	-make sure we return 0 when things work
171	-
172	-patch by kouyu
173	-
174	---- bioapi-linux/apps/NonGUI_Sample/main.c
175	-+++ bioapi-linux/apps/NonGUI_Sample/main.c
176	-@@ -234,6 +234,7 @@
177	- }
178	-
179	- OutputToFile(userName, EnrolledTemplate);
180	-+ return 0;
181	- }
182	- }
183	-
184
185	diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch b/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
186	deleted file mode 100644
187	index 1f81298066d..00000000000
188	--- a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
189	+++ /dev/null
190	@@ -1,12 +0,0 @@
191	-diff -ur bioapi-linux.orig/framework/mds_util_api/mds_app_util.c bioapi-linux/framework/mds_util_api/mds_app_util.c
192	---- bioapi-linux.orig/framework/mds_util_api/mds_app_util.c 2007-07-14 08:06:14.000000000 +0300
193	-+++ bioapi-linux/framework/mds_util_api/mds_app_util.c 2009-07-25 23:26:55.000000000 +0300
194	-@@ -28,7 +28,7 @@
195	- /* Linux-Port: added "const" keyword for Linux version */
196	- #if defined (UNIX)
197	- const BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;
198	--#elif
199	-+#else
200	- BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;
201	- #endif
202	-

Gentoo Archives: gentoo-commits