gentoo resync : 12.03.2021

3 files changed, 39 insertions, 30 deletions

diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 9ad64c171672..f36ac04a42a4 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,4 @@
-AUX fix_rpath.patch 2111 BLAKE2B 3aa9797555e0eb02a3d63e4e117e8aff5c7c0a09922cf6b0344777cd95b2480623f05fe68cfe63750ba00ff954bd6bb3e1a587c4e8af31086c94b2b3344cc08e SHA512 c0ee076d048d8ec4a77b036d0503776c4e3ca7a97c30cd8ba41cb0d99707ad5021613e1d308f6e73cc3432e0f71f7b38429ca0edcbc4edfe0d96955fc56b3504
+AUX fix_rpath.patch 1792 BLAKE2B 38d89cc47984b4d83e2df79b444cba657b814a0d9f80d0c3172c49984a7c22eac40d7c880872be632244fcc2efbf24c52b5613ecbdef624db47df97d6c27c1c1 SHA512 aca59f03c289ed2ffc1df1a387d7f141df56968866187324d14239258c6b270a8a56739bfea7c8398af90f52c5ec7a87eedba4194eb3b097cd0df05cc8553964
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1494 BLAKE2B d7a32b2431724d6d9dd07a377fbd41fb3ad07ba6fe0c368c3e7fb0b20d6a5b5ae69ada03632fdf36b344b570b8e7e92ea4a88932069f205da5eb601f4a0f7ea0 SHA512 af9b93b20f9ce148b192ff151ffc7f70d51bf0e93d6cbd14d2e4265218044a21b8e64a2441a36a9f482124b5804529e0fc8d81a99f6f13a55672ccf75735b1ac
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1504 BLAKE2B 7be3bbe407d6283a0a8d2173348462e4d0d661f9461eb8c77f0b2d9cc1f2c4e8d4773cc4aa30201a81d27ffbeca8a097364b9228f387288d69b4f0cc53da6e87 SHA512 fc3d0c986990206a48d151d4be90f7914a09c43c48fb7cf7652edc66ea1c6be10df576dd2f735779f6d69b04b134218e812d8f9ad35f058d92892f78e015b687
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/tokyocabinet/files/fix_rpath.patch b/dev-db/tokyocabinet/files/fix_rpath.patch
index e1cba0a0370f..052e22f0c10f 100644
--- a/dev-db/tokyocabinet/files/fix_rpath.patch
+++ b/dev-db/tokyocabinet/files/fix_rpath.patch
@@ -1,6 +1,5 @@
-diff -ur Makefile.in Makefile.in
---- Makefile.in	2009-08-04 09:37:52.000000000 +0200
-+++ Makefile.in	2009-09-30 23:45:28.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -12,9 +11,8 @@ diff -ur Makefile.in Makefile.in
  POSTCMD = @MYPOSTCMD@
  
  
-diff -ur configure.in configure.in
---- configure.in	2009-08-31 11:36:58.000000000 +0200
-+++ configure.in	2009-09-30 23:45:28.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -31,25 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -44,9 +42,8 @@ diff -ur configure.in configure.in
  
  #================================================================
  # Options
-diff -ur tokyocabinet.pc.in tokyocabinet.pc.in
---- tokyocabinet.pc.in	2008-02-18 08:25:18.000000000 +0100
-+++ tokyocabinet.pc.in	2009-09-30 23:45:28.000000000 +0200
+--- a/tokyocabinet.pc.in
++++ b/tokyocabinet.pc.in
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index 52ddccc5c6ad..0fe6fc6285d1 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A library of routines for managing a database"
 HOMEPAGE="https://fallabs.com/tokyocabinet/"
@@ -18,43 +18,55 @@ DEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/fix_rpath.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/fix_rpath.patch"
+	default
+
 	sed -i \
 		-e "/ldconfig/d" \
 		-e "/DATADIR/d" Makefile.in || die
+
 	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
 	sed -i -e 's/-O3"$/"/' configure.in || die
 	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
+
 	# flag only works on x86 derivatives, remove everywhere else
-	if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
+	if ! use x86 && ! use amd64; then
+		sed -i -e 's/ -minline-all-stringops//' configure.in || die
+	fi
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_configure() {
 	# we use the "fastest" target without the -O3
 	econf \
-	$(use_enable debug) \
-	$(use_enable bzip2 bzip) \
-	$(use_enable zlib) \
-	$(use_enable threads pthread) \
-	--enable-off64 --enable-fastest
+		$(use_enable debug) \
+		$(use_enable bzip2 bzip) \
+		$(use_enable zlib) \
+		$(use_enable threads pthread) \
+		--enable-off64 \
+		--enable-fastest
+}
+
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/*
-	fi
-
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/*
+		dodoc -r doc/*
 	fi
-}
 
-src_test() {
-	emake -j1 check
+	if use examples; then
+		docinto example
+		dodoc example/*
+	fi
 }