gentoo resync : 28.04.2021

5 files changed, 20 insertions, 27 deletions

diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index aa8295177bf2..b33da73071c8 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -1,6 +1,6 @@
-AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824adeae14f21af67d905c9ff391d1561788e5eac364efee3728a457d3ed226490f394c4fdff2a4fa895c4 SHA512 1b7c2c1bf8331069cdc74ad60c0ea346050118755c1502a3b1ee0786518d578a322ab1b8eda77d9699a6a4bd2eb9396a32407c5dc64238c1f28f3873957fc0cd
-AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
-AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
+AUX fix_ldconfig.patch 370 BLAKE2B 17aff364e0db7613cb848a8b836ce3df20dde3aa6a29d1b92edd558bbfa4e1aa5d35dedf8070d27012aa56c4573bb1c4931adb4748147a893f49aad842e11f76 SHA512 5dac3e50393a435b0b3866132c1e9bf0984e38c39e393d324836c22fc8c21261e0986c11a3522086b0c28a87d5fbb60d15856d2a08d22bc7641fa258bcfd6227
+AUX fix_rpath.patch 2034 BLAKE2B daa9e4a15db349a0a3621e52c428dc9efce6c4fd6fe28c5eb15ab721248a5ee282e3eb946cb0f720484aa12fa87767bea01d93f66874123408b5c732544bb8aa SHA512 60a3fd9739dbd73d858716788bb5cb9674e65ffd034f5d34c83234e930f46ea7312ddb7b86c0449aaec298eea530e9411b282a0063f2400226dfd70d637f21e0
+AUX remove_docinst.patch 387 BLAKE2B 4fe13f614cec55c91e03097e8bf1d6256f31a49347a62f8816e0b6e5d9579e2d77dd32798a54698fbfd47dacaf88de07b6b51ec502ef171f23ba1a34ae99caaf SHA512 8aaa887238e069a02667dc086ddc4cf96286a3243b129521fc08dab3063d5b228b77faeab55c182630f2599551fb7e69b5c98dd99b051814c4a2fc7d5a25e938
 DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
-EBUILD tokyodystopia-0.9.15.ebuild 740 BLAKE2B 989306adb013c2a7a5abaec93ce37196ff3c67b98a368624275ce102aef9cce4cb37a126b626f522e09f64887f3b40f3414e95084ab4d3676e6cf10b8517eec8 SHA512 75bfd5229d27289a343159a16658c560a26f3d13d9bddbffaa8bd3108dd31e888da8ca77ba6b06365fdaf0de646211666dc8bba3c84fda22f320ad77fde034c4
+EBUILD tokyodystopia-0.9.15.ebuild 723 BLAKE2B a185c583e93de0cb1afbe85a854749cea580716318d7ec8551b096c113b4745a8c95ba77c322cbb7824ed069b3f55f5767ed83868520cfd6f23d8a5f1c0e7437 SHA512 457342a0b9c85a59c54a9286d3c7ebec7fd8b594ff6f6cb69ed2264e0e4ffaa7dde8dc6974046ab14e9d2b4635666848975b60faf6c666a9af5ef5a7fe9a098e
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/files/fix_ldconfig.patch b/app-text/tokyodystopia/files/fix_ldconfig.patch
index a75da590ee38..e9c28b96bc9d 100644
--- a/app-text/tokyodystopia/files/fix_ldconfig.patch
+++ b/app-text/tokyodystopia/files/fix_ldconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 60b1036..12f02b0 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -125,7 +125,6 @@ install :
diff --git a/app-text/tokyodystopia/files/fix_rpath.patch b/app-text/tokyodystopia/files/fix_rpath.patch
index 68c0b6e03510..12c95a5778c3 100644
--- a/app-text/tokyodystopia/files/fix_rpath.patch
+++ b/app-text/tokyodystopia/files/fix_rpath.patch
@@ -1,6 +1,5 @@
-diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
---- tokyodystopia-0.9.13/Makefile.in	2009-07-05 04:06:06.000000000 +0200
-+++ tokyodystopia-0.9.13-new/Makefile.in	2009-10-20 22:39:18.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -55,8 +55,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -12,9 +11,8 @@ diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
  POSTCMD = @MYPOSTCMD@
  
  
-diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
---- tokyodystopia-0.9.13/configure.in	2009-06-14 05:44:54.000000000 +0200
-+++ tokyodystopia-0.9.13-new/configure.in	2009-10-20 22:40:00.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -26,31 +26,14 @@
  MYPCFILES="tokyodystopia.pc"
  
@@ -49,9 +47,8 @@ diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
  
  #================================================================
  # Options
-diff -ur tokyodystopia-0.9.13/tokyodystopia.pc.in tokyodystopia-0.9.13-new/tokyodystopia.pc.in
---- tokyodystopia-0.9.13/tokyodystopia.pc.in	2008-02-21 10:45:01.000000000 +0100
-+++ tokyodystopia-0.9.13-new/tokyodystopia.pc.in	2009-10-20 22:40:17.000000000 +0200
+--- a/tokyodystopia.pc.in
++++ b/tokyodystopia.pc.in
 @@ -10,5 +10,5 @@
  Name: Tokyo Dystopia
  Description: a full-text search system
diff --git a/app-text/tokyodystopia/files/remove_docinst.patch b/app-text/tokyodystopia/files/remove_docinst.patch
index d513f54b753c..5b8fe1e8acd7 100644
--- a/app-text/tokyodystopia/files/remove_docinst.patch
+++ b/app-text/tokyodystopia/files/remove_docinst.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8846c38..29ac11e 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -117,8 +117,6 @@ install :
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 6bb8c6f44679..a384bbf797c7 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,26 +16,26 @@ DEPEND="dev-db/tokyocabinet"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/fix_rpath.patch"
-	"${FILESDIR}/fix_ldconfig.patch"
-	"${FILESDIR}/remove_docinst.patch"
+	"${FILESDIR}"/fix_rpath.patch
+	"${FILESDIR}"/fix_ldconfig.patch
+	"${FILESDIR}"/remove_docinst.patch
 )
 
 src_configure() {
 	econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
 }
 
+src_test() {
+	emake -j1 check
+}
+
 src_install() {
 	HTML_DOCS=( doc/. )
 
 	default
 
 	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/.
+		docinto example
+		dodoc example/.
 	fi
 }
-
-src_test() {
-	emake -j1 check
-}