From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCDBC1395E2 for ; Tue, 29 Nov 2016 09:16:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07FBFE0B8F; Tue, 29 Nov 2016 09:16:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D15DDE0B8F for ; Tue, 29 Nov 2016 09:16:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E1E33412B7 for ; Tue, 29 Nov 2016 09:16:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5707C4A1 for ; Tue, 29 Nov 2016 09:16:50 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1480411004.c678c2cc9429618640fe2168493aae6b7061869d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch dev-db/sqlite/sqlite-3.14.1.ebuild dev-db/sqlite/sqlite-3.14.2.ebuild dev-db/sqlite/sqlite-3.15.1.ebuild X-VCS-Directories: dev-db/sqlite/files/ dev-db/sqlite/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c678c2cc9429618640fe2168493aae6b7061869d X-VCS-Branch: master Date: Tue, 29 Nov 2016 09:16:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2db2743d-805f-401f-84e7-71ee30e8971d X-Archives-Hash: 083e7e724cf4a99855c81777c59eda55 commit: c678c2cc9429618640fe2168493aae6b7061869d Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 29 09:16:44 2016 +0000 Commit: Lars Wendler gentoo 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