[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/
Date:	Tue, 29 Nov 2016 09:16:56
Message-Id:	`1480411004.c678c2cc9429618640fe2168493aae6b7061869d.polynomial-c@gentoo`

1

commit:     c678c2cc9429618640fe2168493aae6b7061869d

2

Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

3

AuthorDate: Tue Nov 29 09:16:44 2016 +0000

4

Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

5

CommitDate: Tue Nov 29 09:16:44 2016 +0000

6

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

7

8

dev-db/sqlite: Prefer eapply over epatch in EAPI-6 ebuilds.

9

10

Package-Manager: portage-2.3.2

11

12

 dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch  | 4 ++--

13

 dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch     | 8 ++++----

14

 dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch     | 8 ++++----

15

 dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch | 8 ++++----

16

 dev-db/sqlite/sqlite-3.14.1.ebuild                             | 4 ++--

17

 dev-db/sqlite/sqlite-3.14.2.ebuild                             | 4 ++--

18

 dev-db/sqlite/sqlite-3.15.1.ebuild                             | 6 +++---

19

 7 files changed, 21 insertions(+), 21 deletions(-)

20

21

diff --git a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch

22

index fe9f70a..0308964 100644

23

--- a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch

24

+++ b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch

25

@@ -1,7 +1,7 @@

26

 Fix building with dlopen() not available.

27

28

---- configure.ac

29

-+++ configure.ac

30

+--- a/configure.ac

31

++++ b/configure.ac

32

 @@ -89,6 +89,9 @@

33

    [], [enable_dynamic_extensions=yes])

34

  if test x"$enable_dynamic_extensions" != "xno"; then

35

36

diff --git a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch

37

index c2f9762..32e2902 100644

38

--- a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch

39

+++ b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch

40

@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.

41

 Increase timeout for fuzzcheck.

42

 Fix building with dlopen() not available.

43

44

---- Makefile.in

45

-+++ Makefile.in

46

+--- a/Makefile.in

47

++++ b/Makefile.in

48

 @@ -555,7 +555,7 @@

49

  # Extra compiler options for various shell tools

50

#

51

@@ -123,8 +123,8 @@ Fix building with dlopen() not available.

52

53

  loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la

54

  	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)

55

---- configure.ac

56

-+++ configure.ac

57

+--- a/configure.ac

58

++++ b/configure.ac

59

 @@ -570,6 +570,9 @@

60

  if test "${use_loadextension}" = "yes" ; then

61

    OPT_FEATURE_FLAGS=""

62

63

diff --git a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch

64

index 7ddb613..e2b8889 100644

65

--- a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch

66

+++ b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch

67

@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.

68

 Increase timeout for fuzzcheck.

69

 Fix building with dlopen() not available.

70

71

---- Makefile.in

72

-+++ Makefile.in

73

+--- a/Makefile.in

74

++++ b/Makefile.in

75

 @@ -559,6 +559,7 @@

76

#

77

  SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4

78

@@ -133,8 +133,8 @@ Fix building with dlopen() not available.

79

80

  loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la

81

  	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)

82

---- configure.ac

83

-+++ configure.ac

84

+--- a/configure.ac

85

++++ b/configure.ac

86

 @@ -584,6 +584,9 @@

87

  if test "${use_loadextension}" = "yes" ; then

88

    OPT_FEATURE_FLAGS=""

89

90

diff --git a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch

91

index 7a979ae..15fb51e 100644

92

--- a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch

93

+++ b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch

94

@@ -1,7 +1,7 @@

95

 https://www.sqlite.org/src/info/afbbb6c66a85ff3f

96

97

---- ext/icu/icu.c

98

-+++ ext/icu/icu.c

99

+--- a/ext/icu/icu.c

100

++++ b/ext/icu/icu.c

101

 @@ -500,20 +500,20 @@

102

      void *pContext;                           /* sqlite3_user_data() context */

103

      void (*xFunc)(sqlite3_context*,int,sqlite3_value**);

104

@@ -34,8 +34,8 @@ https://www.sqlite.org/src/info/afbbb6c66a85ff3f

105

106

      {"icu_load_collation",  2, SQLITE_UTF8, (void*)db, icuLoadCollation},

107

};

108

---- test/cursorhint2.test

109

-+++ test/cursorhint2.test

110

+--- a/test/cursorhint2.test

111

++++ b/test/cursorhint2.test

112

 @@ -164,17 +164,19 @@

113

    x2 {AND(EQ(c1,ADD(32,32)),EQ(c0,r[2]))}

114

}

115

116

diff --git a/dev-db/sqlite/sqlite-3.14.1.ebuild b/dev-db/sqlite/sqlite-3.14.1.ebuild

117

index 9a00cfb..e6ce8ce 100644

118

--- a/dev-db/sqlite/sqlite-3.14.1.ebuild

119

+++ b/dev-db/sqlite/sqlite-3.14.1.ebuild

120

@@ -50,7 +50,7 @@ pkg_setup() {

121

122

 src_prepare() {

123

 	if full_tarball; then

124

-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

125

+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

126

127

 		eapply_user

128

129

@@ -58,7 +58,7 @@ src_prepare() {

130

 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html

131

 		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"

132

 	else

133

-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

134

+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

135

136

 		eapply_user

137

138

139

diff --git a/dev-db/sqlite/sqlite-3.14.2.ebuild b/dev-db/sqlite/sqlite-3.14.2.ebuild

140

index 9a00cfb..e6ce8ce 100644

141

--- a/dev-db/sqlite/sqlite-3.14.2.ebuild

142

+++ b/dev-db/sqlite/sqlite-3.14.2.ebuild

143

@@ -50,7 +50,7 @@ pkg_setup() {

144

145

 src_prepare() {

146

 	if full_tarball; then

147

-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

148

+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

149

150

 		eapply_user

151

152

@@ -58,7 +58,7 @@ src_prepare() {

153

 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html

154

 		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"

155

 	else

156

-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

157

+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

158

159

 		eapply_user

160

161

162

diff --git a/dev-db/sqlite/sqlite-3.15.1.ebuild b/dev-db/sqlite/sqlite-3.15.1.ebuild

163

index a38cdb2..1ba3490 100644

164

--- a/dev-db/sqlite/sqlite-3.15.1.ebuild

165

+++ b/dev-db/sqlite/sqlite-3.15.1.ebuild

166

@@ -50,8 +50,8 @@ pkg_setup() {

167

168

 src_prepare() {

169

 	if full_tarball; then

170

-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

171

-		epatch "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"

172

+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"

173

+		eapply "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"

174

175

 		eapply_user

176

177

@@ -59,7 +59,7 @@ src_prepare() {

178

 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html

179

 		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"

180

 	else

181

-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

182

+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"

183

184

 		eapply_user

1	commit: c678c2cc9429618640fe2168493aae6b7061869d
2	Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3	AuthorDate: Tue Nov 29 09:16:44 2016 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Tue Nov 29 09:16:44 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c678c2cc
7
8	dev-db/sqlite: Prefer eapply over epatch in EAPI-6 ebuilds.
9
10	Package-Manager: portage-2.3.2
11
12	dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch \| 4 ++--
13	dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch \| 8 ++++----
14	dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch \| 8 ++++----
15	dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch \| 8 ++++----
16	dev-db/sqlite/sqlite-3.14.1.ebuild \| 4 ++--
17	dev-db/sqlite/sqlite-3.14.2.ebuild \| 4 ++--
18	dev-db/sqlite/sqlite-3.15.1.ebuild \| 6 +++---
19	7 files changed, 21 insertions(+), 21 deletions(-)
20
21	diff --git a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch
22	index fe9f70a..0308964 100644
23	--- a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch
24	+++ b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch
25	@@ -1,7 +1,7 @@
26	Fix building with dlopen() not available.
27
28	---- configure.ac
29	-+++ configure.ac
30	+--- a/configure.ac
31	++++ b/configure.ac
32	@@ -89,6 +89,9 @@
33	[], [enable_dynamic_extensions=yes])
34	if test x"$enable_dynamic_extensions" != "xno"; then
35
36	diff --git a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
37	index c2f9762..32e2902 100644
38	--- a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
39	+++ b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
40	@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.
41	Increase timeout for fuzzcheck.
42	Fix building with dlopen() not available.
43
44	---- Makefile.in
45	-+++ Makefile.in
46	+--- a/Makefile.in
47	++++ b/Makefile.in
48	@@ -555,7 +555,7 @@
49	# Extra compiler options for various shell tools
50	#
51	@@ -123,8 +123,8 @@ Fix building with dlopen() not available.
52
53	loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
54	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
55	---- configure.ac
56	-+++ configure.ac
57	+--- a/configure.ac
58	++++ b/configure.ac
59	@@ -570,6 +570,9 @@
60	if test "${use_loadextension}" = "yes" ; then
61	OPT_FEATURE_FLAGS=""
62
63	diff --git a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch
64	index 7ddb613..e2b8889 100644
65	--- a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch
66	+++ b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch
67	@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.
68	Increase timeout for fuzzcheck.
69	Fix building with dlopen() not available.
70
71	---- Makefile.in
72	-+++ Makefile.in
73	+--- a/Makefile.in
74	++++ b/Makefile.in
75	@@ -559,6 +559,7 @@
76	#
77	SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
78	@@ -133,8 +133,8 @@ Fix building with dlopen() not available.
79
80	loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
81	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
82	---- configure.ac
83	-+++ configure.ac
84	+--- a/configure.ac
85	++++ b/configure.ac
86	@@ -584,6 +584,9 @@
87	if test "${use_loadextension}" = "yes" ; then
88	OPT_FEATURE_FLAGS=""
89
90	diff --git a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch
91	index 7a979ae..15fb51e 100644
92	--- a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch
93	+++ b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch
94	@@ -1,7 +1,7 @@
95	https://www.sqlite.org/src/info/afbbb6c66a85ff3f
96
97	---- ext/icu/icu.c
98	-+++ ext/icu/icu.c
99	+--- a/ext/icu/icu.c
100	++++ b/ext/icu/icu.c
101	@@ -500,20 +500,20 @@
102	void pContext; / sqlite3_user_data() context */
103	void (xFunc)(sqlite3_context,int,sqlite3_value**);
104	@@ -34,8 +34,8 @@ https://www.sqlite.org/src/info/afbbb6c66a85ff3f
105
106	{"icu_load_collation", 2, SQLITE_UTF8, (void*)db, icuLoadCollation},
107	};
108	---- test/cursorhint2.test
109	-+++ test/cursorhint2.test
110	+--- a/test/cursorhint2.test
111	++++ b/test/cursorhint2.test
112	@@ -164,17 +164,19 @@
113	x2 {AND(EQ(c1,ADD(32,32)),EQ(c0,r[2]))}
114	}
115
116	diff --git a/dev-db/sqlite/sqlite-3.14.1.ebuild b/dev-db/sqlite/sqlite-3.14.1.ebuild
117	index 9a00cfb..e6ce8ce 100644
118	--- a/dev-db/sqlite/sqlite-3.14.1.ebuild
119	+++ b/dev-db/sqlite/sqlite-3.14.1.ebuild
120	@@ -50,7 +50,7 @@ pkg_setup() {
121
122	src_prepare() {
123	if full_tarball; then
124	- epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
125	+ eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
126
127	eapply_user
128
129	@@ -58,7 +58,7 @@ src_prepare() {
130	# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
131	sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac \|\| die "sed failed"
132	else
133	- epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
134	+ eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
135
136	eapply_user
137
138
139	diff --git a/dev-db/sqlite/sqlite-3.14.2.ebuild b/dev-db/sqlite/sqlite-3.14.2.ebuild
140	index 9a00cfb..e6ce8ce 100644
141	--- a/dev-db/sqlite/sqlite-3.14.2.ebuild
142	+++ b/dev-db/sqlite/sqlite-3.14.2.ebuild
143	@@ -50,7 +50,7 @@ pkg_setup() {
144
145	src_prepare() {
146	if full_tarball; then
147	- epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
148	+ eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
149
150	eapply_user
151
152	@@ -58,7 +58,7 @@ src_prepare() {
153	# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
154	sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac \|\| die "sed failed"
155	else
156	- epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
157	+ eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
158
159	eapply_user
160
161
162	diff --git a/dev-db/sqlite/sqlite-3.15.1.ebuild b/dev-db/sqlite/sqlite-3.15.1.ebuild
163	index a38cdb2..1ba3490 100644
164	--- a/dev-db/sqlite/sqlite-3.15.1.ebuild
165	+++ b/dev-db/sqlite/sqlite-3.15.1.ebuild
166	@@ -50,8 +50,8 @@ pkg_setup() {
167
168	src_prepare() {
169	if full_tarball; then
170	- epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
171	- epatch "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"
172	+ eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
173	+ eapply "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"
174
175	eapply_user
176
177	@@ -59,7 +59,7 @@ src_prepare() {
178	# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
179	sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac \|\| die "sed failed"
180	else
181	- epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
182	+ eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
183
184	eapply_user

Gentoo Archives: gentoo-commits