gentoo resync : 14.12.2020

3 files changed, 58 insertions, 15 deletions

diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 5efa691af8ef..65737f139794 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,7 +1,8 @@
+AUX qdbm-1.8.78-darwin.patch 1139 BLAKE2B 687d8dc4948fb075ab41a32cb8378da49025f477c23af9be3605f1377fdd8366af4d1225fdf60b597a443054d4cb2b57558bb0fcc7d8b3b8c2e4f84c67590d7f SHA512 45014e917ff16b7295eb7d2d583399779b05f98668418f756710a2e456a86f1366fdcdc006398a19e65465ba1ffec593aa77f398393ea2a543083bf3b7c2532f
 AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c
 AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3
 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r2.ebuild 3403 BLAKE2B 23967de1b107a6f912ca47808a47a9aa4f7b29dba650eb137b4603b40e9e8948380fa191d98333bf8e70a10b97195a919e01faced7256617beb2cf5dfa5616be SHA512 a3f8ff8dbeb8705bd96684d55c04dfa4d835096e44dd4fcd1137f7803ad8bb8d43fdf76c9aac21cc40985e76785df815fac22bcca0283943f698ada4e7d30352
+EBUILD qdbm-1.8.78-r2.ebuild 3707 BLAKE2B f73a6db82c52f8bf986fb90075c26dfbcef5c8a1f50c820707b92cce304801260920050b03eb7d971de3b459aa355d95400f338deeb36fc64aa3ae216a40f7b1 SHA512 3e238150a4108032ec21eaaf4f14d5a8676123a01d1629569f46682572196fa8f9c4c4c20347bc7ee7cf7c380b31797914efc6296523b9b221ab36f5c8026ddf
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
new file mode 100644
index 000000000000..de2d33c4ea15
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2fec03a..2a1c3a3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,18 +52,18 @@ DESTDIR =
+ # Building binaries
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++  -I$(HOME)/include @MYDEFS@ \
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS)
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib
+ 
+ 
+ 
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 40f5281fa882..1906d48f0204 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
+	"${FILESDIR}"/${PN}-1.8.78-darwin.patch
 )
 HTML_DOCS=( doc/. )
 
@@ -99,10 +100,10 @@ src_prepare() {
 		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
 		-e 's/make\( \|$\)/$(MAKE)\1/g' \
 		-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \
-		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
-	find -name "*~" -delete
+		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die
+	find -name "*~" -delete || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 	qdbm_foreach_api
 }
@@ -111,9 +112,9 @@ each_ruby_prepare() {
 	sed -i \
 		-e "s|ruby |${RUBY} |" \
 		-e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \
-		{Makefile,configure}.in {curia,depot,villa}/extconf.rb
+		{Makefile,configure}.in {curia,depot,villa}/extconf.rb || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -133,8 +134,12 @@ each_ruby_configure() {
 }
 
 src_compile() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_compile() {
@@ -142,8 +147,12 @@ each_ruby_compile() {
 }
 
 src_test() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake check-mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_test() {
@@ -151,23 +160,28 @@ each_ruby_test() {
 }
 
 src_install() {
-	default
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake install-mac
+	else
+		default
+	fi
+
 	qdbm_foreach_api
 	use static-libs || find "${ED}" -name '*.a' -delete || die
 
-	rm -rf "${ED}"/usr/share/${PN}
+	rm -rf "${ED}"/usr/share/${PN} || die
 
 	if use java; then
 		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
-		rm -f "${ED}"/usr/$(get_libdir)/*.jar
+		rm -f "${ED}"/usr/$(get_libdir)/*.jar || die
 	fi
 	if use perl; then
 		perl_delete_module_manpages
 		perl_fix_packlist
 	fi
 
-	rm -f "${ED}"/usr/bin/*test
-	rm -f "${ED}"/usr/share/man/man1/*test.1*
+	rm -f "${ED}"/usr/bin/*test || die
+	rm -f "${ED}"/usr/share/man/man1/*test.1* || die
 }
 
 each_ruby_install() {