From a124396685f9f39d7f21c44eb4ed89c889e5f779 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 19 Apr 2021 07:15:07 +0100 Subject: app-text/tokyodystopia: fix DeprecatedInsinto, clean up patches Signed-off-by: Sam James --- app-text/tokyodystopia/files/fix_ldconfig.patch | 2 -- app-text/tokyodystopia/files/fix_rpath.patch | 15 ++++++--------- app-text/tokyodystopia/files/remove_docinst.patch | 2 -- app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 23 deletions(-) (limited to 'app-text') 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 -} -- cgit v1.2.3-65-gdbad