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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/
Date: Tue, 29 Nov 2016 09:16:50 +0000 (UTC)	[thread overview]
Message-ID: <1480411004.c678c2cc9429618640fe2168493aae6b7061869d.polynomial-c@gentoo> (raw)

commit:     c678c2cc9429618640fe2168493aae6b7061869d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 09:16:44 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 09:16:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c678c2cc

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

Package-Manager: portage-2.3.2

 dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch  | 4 ++--
 dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch     | 8 ++++----
 dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch     | 8 ++++----
 dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch | 8 ++++----
 dev-db/sqlite/sqlite-3.14.1.ebuild                             | 4 ++--
 dev-db/sqlite/sqlite-3.14.2.ebuild                             | 4 ++--
 dev-db/sqlite/sqlite-3.15.1.ebuild                             | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

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
index fe9f70a..0308964 100644
--- 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
@@ -1,7 +1,7 @@
 Fix building with dlopen() not available.
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -89,6 +89,9 @@
    [], [enable_dynamic_extensions=yes])
  if test x"$enable_dynamic_extensions" != "xno"; then

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
index c2f9762..32e2902 100644
--- 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
@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.
 Increase timeout for fuzzcheck.
 Fix building with dlopen() not available.
 
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -555,7 +555,7 @@
  # Extra compiler options for various shell tools
  #
@@ -123,8 +123,8 @@ Fix building with dlopen() not available.
  
  loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
  	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -570,6 +570,9 @@
  if test "${use_loadextension}" = "yes" ; then
    OPT_FEATURE_FLAGS=""

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
index 7ddb613..e2b8889 100644
--- 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
@@ -2,8 +2,8 @@ Link executables against libsqlite3.so.
 Increase timeout for fuzzcheck.
 Fix building with dlopen() not available.
 
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -559,6 +559,7 @@
  #
  SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
@@ -133,8 +133,8 @@ Fix building with dlopen() not available.
  
  loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
  	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -584,6 +584,9 @@
  if test "${use_loadextension}" = "yes" ; then
    OPT_FEATURE_FLAGS=""

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
index 7a979ae..15fb51e 100644
--- 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
@@ -1,7 +1,7 @@
 https://www.sqlite.org/src/info/afbbb6c66a85ff3f
 
---- ext/icu/icu.c
-+++ ext/icu/icu.c
+--- a/ext/icu/icu.c
++++ b/ext/icu/icu.c
 @@ -500,20 +500,20 @@
      void *pContext;                           /* sqlite3_user_data() context */
      void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
@@ -34,8 +34,8 @@ https://www.sqlite.org/src/info/afbbb6c66a85ff3f
  
      {"icu_load_collation",  2, SQLITE_UTF8, (void*)db, icuLoadCollation},
    };
---- test/cursorhint2.test
-+++ test/cursorhint2.test
+--- a/test/cursorhint2.test
++++ b/test/cursorhint2.test
 @@ -164,17 +164,19 @@
    x2 {AND(EQ(c1,ADD(32,32)),EQ(c0,r[2]))}
  }

diff --git a/dev-db/sqlite/sqlite-3.14.1.ebuild b/dev-db/sqlite/sqlite-3.14.1.ebuild
index 9a00cfb..e6ce8ce 100644
--- a/dev-db/sqlite/sqlite-3.14.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.14.1.ebuild
@@ -50,7 +50,7 @@ pkg_setup() {
 
 src_prepare() {
 	if full_tarball; then
-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
 
 		eapply_user
 
@@ -58,7 +58,7 @@ src_prepare() {
 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
 		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"
 	else
-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
 
 		eapply_user
 

diff --git a/dev-db/sqlite/sqlite-3.14.2.ebuild b/dev-db/sqlite/sqlite-3.14.2.ebuild
index 9a00cfb..e6ce8ce 100644
--- a/dev-db/sqlite/sqlite-3.14.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.14.2.ebuild
@@ -50,7 +50,7 @@ pkg_setup() {
 
 src_prepare() {
 	if full_tarball; then
-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
 
 		eapply_user
 
@@ -58,7 +58,7 @@ src_prepare() {
 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
 		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"
 	else
-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
 
 		eapply_user
 

diff --git a/dev-db/sqlite/sqlite-3.15.1.ebuild b/dev-db/sqlite/sqlite-3.15.1.ebuild
index a38cdb2..1ba3490 100644
--- a/dev-db/sqlite/sqlite-3.15.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.15.1.ebuild
@@ -50,8 +50,8 @@ pkg_setup() {
 
 src_prepare() {
 	if full_tarball; then
-		epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
-		epatch "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"
+		eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch"
 
 		eapply_user
 
@@ -59,7 +59,7 @@ src_prepare() {
 		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
 		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"
 	else
-		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+		eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
 
 		eapply_user

next             reply	other threads:[~2016-11-29  9:16 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-29  9:16 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-10 22:44 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/ Sam James
2024-11-06 11:03 Sam James
2024-03-21  3:46 Sam James
2024-01-07  8:12 Sam James
2023-12-12  5:43 Sam James
2022-02-02 12:15 Jakov Smolić
2022-01-16 18:33 Jakov Smolić
2021-12-12 23:42 Sam James
2020-09-15 18:34 Mike Gilbert
2020-07-29 18:46 Mike Gilbert
2020-03-09 19:29 Mike Gilbert
2019-08-16 17:03 Mike Gilbert
2019-08-09 18:39 Mike Gilbert
2019-05-05 19:05 Mike Gilbert
2019-02-27 22:35 Mike Gilbert
2019-02-27 22:35 Mike Gilbert
2018-04-26 15:14 Mike Gilbert
2017-09-28 17:18 Mike Gilbert
2017-04-04 19:50 Mike Gilbert
2017-01-27 17:34 Mike Gilbert
2016-05-30 21:01 Mike Gilbert
2016-04-28 21:07 Mike Gilbert

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fe9f70a dfblob:0308964 dfblob:c2f9762 dfblob:32e2902
dfblob:7ddb613 dfblob:e2b8889 dfblob:7a979ae dfblob:15fb51e
dfblob:9a00cfb dfblob:e6ce8ce dfblob:9a00cfb dfblob:e6ce8ce
dfblob:a38cdb2 dfblob:1ba3490 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480411004.c678c2cc9429618640fe2168493aae6b7061869d.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox