gentoo resync : 22.12.2021

3 files changed, 80 insertions, 3 deletions

diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index f414542a7e53..16cb1ba5d5d9 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,5 @@
 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 1511 BLAKE2B 6bd4c856539aa600e54246ccc378b72cf9e3bd6ca14b48b21454ee3d261ba626ced6bb0b9b5d8302375568557d790aac81198d0039dd9f0921dcecff81a59022 SHA512 a43ba8be64d4de30619c46cd710c191c47fb5d51cebfcdc366720590c296ff4f55a8c64dc908a1c0567ee2a4543bf6ba55c5b6d6035fe9fa3ae205e87ca1aa96
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1481 BLAKE2B 78a11e0c030b9531600729d0ba39ca016c83212add6a89f8c154f51f6c0cad873cab4dff2335973ade7477d4cae029e9c931293a3f866ba44919a0a0fbe69c0a SHA512 c51718107640160e03905c3cc650562b0116894315c44a7dd64df38deea2662b8899f862675065cde55504348e34ca26be293912abe311d9e81f2cd805bec700
+EBUILD tokyocabinet-1.4.48-r2.ebuild 1649 BLAKE2B 962fcf525136eb78b631874e6ba086a59b2f992fae2d236a2504d1ed982c8da152e40d861ad431ce46ee8c4e0267ab8aef189f9f4bfd1f544791080dff18da66 SHA512 2de7b7a17d6afaa4080161a5b78105465d3ad0bfe2ee94ce1e58464c76982bf6bd1672ddbb5b847e5fa0f796bfa7458bb9db7738ebccbbfab3c189acabccc060
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index 4efc8e3e6d20..df6c7e422489 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 debug doc examples threads zlib"
+IUSE="bzip2 doc examples threads zlib"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
@@ -46,7 +46,6 @@ src_prepare() {
 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) \
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild
new file mode 100644
index 000000000000..0c20e2730d91
--- /dev/null
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A library of routines for managing a database"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
+SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="bzip2 debug doc examples threads zlib"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/fix_rpath.patch"
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/ldconfig/d" \
+		-e "/DATADIR/d" \
+		-i 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 || die
+	fi
+
+	sed -e 's/libtokyocabinet.a/libtokyocabinet.so/g' -i configure.in || die
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# we use the "fastest" target without the -O3
+	myconf=(
+		--disable-static
+		--enable-off64
+		--enable-fastest
+		$(use_enable bzip2 bzip)
+		$(use_enable debug)
+		$(use_enable threads pthread)
+		$(use_enable zlib)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/.
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}