gentoo resync : 02.08.2019

3 files changed, 18 insertions, 18 deletions

diff --git a/net-misc/tokyotyrant/Manifest b/net-misc/tokyotyrant/Manifest
index b041c7218bf1..704a854ad0c4 100644
--- a/net-misc/tokyotyrant/Manifest
+++ b/net-misc/tokyotyrant/Manifest
@@ -1,7 +1,7 @@
 AUX fix_makefiles-1.4.41.patch 3247 BLAKE2B 6951d7a58fe844b5f29db84fecffb7c9670a8de366cd1b8c2ff854d6d61b14c0cbd552fc1676d3339407c371926670f0d5cd4f2abc490c2ef106b4211c59356f SHA512 0b9a1cc16f999a0a89c5e58fdc7e9aa98c66c9357804c46bb4657279434d59c3928d37ddc774fba53a8bccdd1fd530efa5f418388cb18805a5ffc81fc3405a4b
-AUX fix_testsuite.patch 6590 BLAKE2B 1022f036caba172226da34debdb0fd83436025c5d84a85a36616a0f18f394867aca6dc1a90a616be24fadd4671fbd56c2e90e45cf4cea92af2899c33407266e8 SHA512 a22dc39f3abe870f6c3219b945411e38035a00e403a477440d11232215e30df03a85eb315f3957dc6d9c494a92a1f4caa641d520744e8bd728b088ea05d3c459
+AUX fix_testsuite.patch 6594 BLAKE2B 415936e5b506e0fe979395ac9167f42a09d0a037064f537f362aa1fdd4f143e99a14572153ba5657ea03a25c6911de8038b40c8240ae950d2fa3caad1ea9a30e SHA512 2d64147c4721d5d59589e8a038fbcffb4db61f35e5bcbc4f29e806df616d4534cc281fe6a9ac00cf74cda6677b60bc6f1b44f2085d703affb9ccf81717026cd0
 AUX tokyotyrant.confd 361 BLAKE2B b1fd84606e4f3e5c528ef8fb1c4cff4c4b7ac5568fdd25951a3cdc6e5c72bba09e8ed0f9596e6ba543f2c459d17673c17ef965e63af1496df7829c5ec462e29a SHA512 5e762267eba0f214a47d385c41d32b9a2a82c7ece41c42266ad980a936080528b42d7f86fd2b32679f65e97f6b1b6a3a74d8d7c4465cc9b2739c4d1746f04cf0
 AUX tokyotyrant.initd 800 BLAKE2B 4a09d86f8dbf70ebcc38c72a9f55ee42004a94ea4c7428312b50ce60f5b89cb29a197d4293754e549ee7615f230e9d15c0cd0f1d10608974cd36aabce4d89508 SHA512 e00874a33eeab7228815e303d9a028e9ce50dde96012db397bcf11a530acecbb9a3252468d2745e239e1b7a7e873f3bb87962c585cea122e011a981fdf0ba9bf
 DIST tokyotyrant-1.1.41.tar.gz 196196 BLAKE2B adfeb14146a4078d01d75608c8deb206de60b956b73d7cab2d2b29b2daf9ef7be7c3ab932984460fc07858e836421932472eaef801d0d79f4e8dd3ed7ab37580 SHA512 fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e
-EBUILD tokyotyrant-1.1.41-r1.ebuild 1316 BLAKE2B 7dea3f03708a3bb908c9965f71e9f1b9ff243a6637ea5f5dba497e62012a0231c104da3d97b2ecfeca8a235564decc636559f636b6d8af2b4870e6ee9a5cb72e SHA512 951748d4f910e55cfc6f4927b2e53fc25b810313413b519226bcab62c3266814b4977bb3094931521af07c089923a5a1b849e42772aa1e031c054a641a589570
+EBUILD tokyotyrant-1.1.41-r2.ebuild 1177 BLAKE2B 8edfe177dd4acd0aa12283c517973c622d5e2ff0a2763ef8658baf4b92df9fd010349e2ac7fcd0ef0a46d1e608e030a77d63c34ea0ef202a738ddfd38bbcaa42 SHA512 9c729c7a9c1d3f52e5e47dcafbc8bb7292ceb71a431b0d115b9c8f3b63ccc14bc433bd2d89337022a2ce1ac2001bb32be47495cf5b89dd66f56b0fbeeaa6e783
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch
index d48825381777..7ee9dc801cb6 100644
--- a/net-misc/tokyotyrant/files/fix_testsuite.patch
+++ b/net-misc/tokyotyrant/files/fix_testsuite.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2009-10-14 10:33:16.000000000 +0200
-+++ Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
+--- a/Makefile.in	2009-10-14 10:33:16.000000000 +0200
++++ b/Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
 @@ -166,48 +166,49 @@
  
  
diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
index 3aebae8184ac..1da7a34c2009 100644
--- a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild
+++ b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
-inherit eutils user
+inherit user
 
 DESCRIPTION="A network interface to Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyotyrant/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+HOMEPAGE="https://fallabs.com/tokyotyrant/"
+SRC_URI="https://fallabs.com/tokyotyrant/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -16,7 +16,6 @@ IUSE="debug examples lua"
 
 DEPEND="dev-db/tokyocabinet
 	sys-libs/zlib
-	app-arch/bzip2
 	lua? ( dev-lang/lua )"
 RDEPEND="${DEPEND}"
 
@@ -28,8 +27,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/fix_makefiles-1.4.41.patch
-	epatch "${FILESDIR}"/fix_testsuite.patch
+	default
+	eapply "${FILESDIR}"/fix_makefiles-1.4.41.patch
+	eapply "${FILESDIR}"/fix_testsuite.patch
 }
 
 src_configure() {
@@ -40,7 +40,7 @@ src_configure() {
 
 src_install() {
 	rm ttservctl || die "Install failed"
-	emake DESTDIR="${D}" install || die "Install failed"
+	default
 
 	for x in /var/{lib,run,log}/${PN}; do
 		dodir "${x}" || die "Install failed"
@@ -49,16 +49,16 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
+		doins -r example/
 	fi
 
-	dohtml doc/* || die
+	dodoc -r doc
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 }
 
 src_test() {
-	emake -j1 check || die "Tests failed"
+	emake -j1 check
 }