gentoo resync : 25.08.2020

3 files changed, 86 insertions, 0 deletions

diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild
new file mode 100644
index 000000000000..c0067291509e
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.640.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ISHIGAKI
+DIST_VERSION=1.64
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test system-sqlite"
+RESTRICT="!test? ( test )"
+
+# Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
+# when bumping versions re: system-sqlite interop
+SYSTEM_SQLITE_DEP="
+	>=dev-db/sqlite-3.29.0[extensions(+)]
+"
+RDEPEND="
+	system-sqlite? ( ${SYSTEM_SQLITE_DEP} )
+	>=dev-perl/DBI-1.570.0
+	!<dev-perl/DBD-SQLite-1
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="
+	system-sqlite? ( ${SYSTEM_SQLITE_DEP} )
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	test? (
+		>=virtual/perl-File-Spec-0.820.0
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+src_prepare() {
+	perl-module_src_prepare
+	if use system-sqlite; then
+		einfo "Removing bundled SQLite"
+		eapply "${FILESDIR}/${PN}-1.64-no-bundle.patch"
+		# remove bundled sqlite (rt.cpan#61361)
+		perl_rm_files sqlite3{.c,.h,ext.h}
+	fi
+}
+src_configure() {
+	use system-sqlite && myconf="SQLITE_LOCATION=${EPREFIX}/usr"
+	perl-module_src_configure
+}
+
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 8be088ccf397..d26ba6d786e0 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,5 +1,8 @@
+AUX DBD-SQLite-1.64-no-bundle.patch 722 BLAKE2B 6c906a72b8ecc0111eed947ce9ab06c8ef28a2989d1dcd3d23937dc9a4f656ef7342ab2b66634ba987282934156a1e8ba0621766279293044c1269f2e7754d91 SHA512 b547a410367d739b3d8790788a5d6cb8b7f9026f176cbcaa90c01c6007a406b28dbb06deda00ffb4bd6b502433c6035026754809e1faae6d2855180c0f0b58e0
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
 DIST DBD-SQLite-1.58.tar.gz 2248800 BLAKE2B 54cb94d0c64389984290361104e723be4cc9c7352e2f1c80838efa15d8f3d9d671705117422a1076203821b24ef63e06bf95244a0bdd7b710394e655041af18e SHA512 080d1e304fb0d43926ce0345df3367132c317ba113bdc11952c0a159bc68d988a024828a28e66be267f82e07731dee225723854fb80914ba7c476b27dbdeb212
+DIST DBD-SQLite-1.64.tar.gz 2416842 BLAKE2B c2223492bc5662d6babfd4cc9c31697c48c9d2a55cf7228ccd55d351134f6380ca173f96a5ed99e1d377d2427b4a3e9b09e72104937e508a484d9263c15e9e40 SHA512 36a227193b4544c7cec24eec50ee51f46c00a2dad99ab7b8899b0417ea928a1e223f4052fb75f2d641cbfa4408192492ba8943fdb92520dc9888014467f503a4
 EBUILD DBD-SQLite-1.560.0.ebuild 1289 BLAKE2B 402942595d5c2b15d4e7e133cc3d5245b24d6fce2978e9954fed0af59babdcc36e2e2ce9e331cf796852b161b3f2f3dfbfe46eb90f4bb1215c0b845e1cc48d5b SHA512 bfa013983062ae109c188bd4106744422ea2767bf6e01a8dea51ab732070ae02b403c364418b1e35e82dfa91fd162845986a78a4583b2b403c1abc6a29b7954a
 EBUILD DBD-SQLite-1.580.0.ebuild 1296 BLAKE2B 5eaf245eb05bff9f897a2de7c2ec75958287a1abae34ec113e34a3b69a7f7d18bd2e091ab42a83a58a83302d4dc626a158cdd726aec996805ae30fd9cf877c5c SHA512 375153390a4f3affc68fd7d9fa216c21655fca9604a443a0d6ce70588c5ffba2018b4c7989d5815d72b9762d8b0cf0c40db2dc5e984b0067574a81587834b517
+EBUILD DBD-SQLite-1.640.0.ebuild 1434 BLAKE2B ef3664786fc1fdbe7c1b3cd5eaa7917e0f454b6de0f385637dbc14a03adc824d97cc7618ff187693766a962f5f18a359b085fbb6824d6d4060e90d69045656bd SHA512 d7334e1d57daf926a97a4e69cef09d31e0cd6bba97d360c6e33697bc959ba5cb0fdc26145cb17c613ff2424477f7a4e60023e62541ad793411cba477a45eae47
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/DBD-SQLite/files/DBD-SQLite-1.64-no-bundle.patch b/dev-perl/DBD-SQLite/files/DBD-SQLite-1.64-no-bundle.patch
new file mode 100644
index 000000000000..99f10adec3b5
--- /dev/null
+++ b/dev-perl/DBD-SQLite/files/DBD-SQLite-1.64-no-bundle.patch
@@ -0,0 +1,25 @@
+From dc0684bc73ca2124a5d278eaaa34848b0d8fd9d9 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 9 Jul 2020 12:44:07 +1200
+Subject: Disable using bundled SQLite
+
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 5c832af..5f308ab 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -129,7 +129,7 @@ SCOPE: {
+ # a system sqlite is also sophisticated enough to have a patching system
+ # that can change the if ( 0 ) to if ( 1 )
+ my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+-if ( 0 ) {
++if ( 1 ) {
+ 	require File::Spec;
+ 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+ 		$sqlite_base =~ /=(.*)/;
+-- 
+2.27.0
+