diff options
7 files changed, 39 insertions, 39 deletions
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild index 88d3aa99..4cad768f 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig diff --git a/app-dicts/steak/files/steak-1.7.3.patch b/app-dicts/steak/files/steak-1.7.3.patch index 8c1b6a07..19e38fc9 100644 --- a/app-dicts/steak/files/steak-1.7.3.patch +++ b/app-dicts/steak/files/steak-1.7.3.patch @@ -1,5 +1,5 @@ ---- woerterbuch.alt 2004-12-04 23:34:28.115707552 +0100 -+++ woerterbuch 2004-12-04 23:41:19.259204240 +0100 +--- a/woerterbuch ++++ b/woerterbuch @@ -6,13 +6,13 @@ ################################################################ # diff --git a/app-shells/schily-tools/schily-tools-2017.09.25.ebuild b/app-shells/schily-tools/schily-tools-2017.09.25.ebuild index dfd8cd30..a9cb4d02 100644 --- a/app-shells/schily-tools/schily-tools-2017.09.25.ebuild +++ b/app-shells/schily-tools/schily-tools-2017.09.25.ebuild @@ -137,7 +137,7 @@ src_schily_prepare() ( -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ -e "s|^\(LDPATH=\).*|\1|" \ -e "s|^\(RUNPATH=\).*|\1|" \ - -e "s|^\(INS_BASE=\).*|\1\t${ED}usr|" \ + -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ -e '/^DEFUMASK/s,002,022,g' \ @@ -342,57 +342,57 @@ src_install() { LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install if ! use static-libs then find "${ED}" -name '*.a' -delete || die - ! test -d "${ED}"usr/include || rm -rfv -- "${ED}"usr/include || die + ! test -d "${ED}"/usr/include || rm -rfv -- "${ED}"/usr/include || die fi if use schilytools_sccs - then mv -v "${ED}"usr/share/man/man1/{,sccs-}diff.1 || die - else ! test -d "${ED}"usr/ccs || rm -rfv -- "${ED}"usr/ccs || die - mustnothave usr/share/man/man1/diff.1 + then mv -v "${ED}"/usr/share/man/man1/{,sccs-}diff.1 || die + else ! test -d "${ED}"/usr/ccs || rm -rfv -- "${ED}"/usr/ccs || die + mustnothave /usr/share/man/man1/diff.1 fi if use schilytools_hdump - then mustremove usr/bin/od usr/share/man/man1/od.1 - else mustnothave usr/bin/od usr/share/man/man1/od.1 + then mustremove /usr/bin/od /usr/share/man/man1/od.1 + else mustnothave /usr/bin/od /usr/share/man/man1/od.1 fi if use schilytools_patch - then mustremove usr/share/man/man1/patch.1 - else mustnothave usr/share/man/man1/patch.1 + then mustremove /usr/share/man/man1/patch.1 + else mustnothave /usr/share/man/man1/patch.1 fi if use schilytools_bosh then dodir bin || die - rm -v "${ED}"usr/bin/{bo,j,pf}sh \ - "${ED}"usr/share/man/man1/bosh.1 || die - rm -rfv "${ED}"usr/xpg4 || die - mv -v -- "${ED}"{usr/bin/sh,bin/bosh} || die + rm -v "${ED}"/usr/bin/{bo,j,pf}sh \ + "${ED}"/usr/share/man/man1/bosh.1 || die + rm -rfv "${ED}"/usr/xpg4 || die + mv -v -- "${ED}"/{usr/bin/sh,bin/bosh} || die ln -s -- bosh "${ED}"/bin/jsh || die ln -s -- bosh "${ED}"/bin/pfsh || die - mv -v -- "${ED}"usr/share/man/man1/{,bo}sh.1 || die + mv -v -- "${ED}"/usr/share/man/man1/{,bo}sh.1 || die if use renameschily_jsh - then mv -v -- "${ED}"bin/{,s}jsh || die - mv -v -- "${ED}"usr/share/man/man1/{,s}jsh.1 || die + then mv -v -- "${ED}"/bin/{,s}jsh || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}jsh.1 || die fi fi if use schilytools_match && use system-star - then rm -v -- "${ED}"usr/share/man/man1/match.1 || die + then rm -v -- "${ED}"/usr/share/man/man1/match.1 || die fi if use schilytools_calc && use renameschily_calc - then mv -v -- "${ED}"usr/bin/{,s}calc || die - mv -v -- "${ED}"usr/share/man/man1/{,s}calc.1 || die + then mv -v -- "${ED}"/usr/bin/{,s}calc || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}calc.1 || die fi if use schilytools_compare && use renameschily_compare - then mv -v -- "${ED}"usr/bin/{,s}compare || die - mv -v -- "${ED}"usr/share/man/man1/{,s}compare.1 || die + then mv -v -- "${ED}"/usr/bin/{,s}compare || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}compare.1 || die fi if use schilytools_count && use renameschily_count - then mv -v -- "${ED}"usr/bin/{,s}count || die - mv -v -- "${ED}"usr/share/man/man1/{,s}count.1 || die + then mv -v -- "${ED}"/usr/bin/{,s}count || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}count.1 || die fi if use schilytools_man2html && use renameschily_man2html - then mv -v -- "${ED}"usr/bin/{,s}man2html || die - mv -v -- "${ED}"usr/share/man/man1/{,s}man2html.1 || die + then mv -v -- "${ED}"/usr/bin/{,s}man2html || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}man2html.1 || die fi if use schilytools_p && use renameschily_p - then mv -v -- "${ED}"usr/bin/{,s}p || die - mv -v -- "${ED}"usr/share/man/man1/{,s}p.1 || die + then mv -v -- "${ED}"/usr/bin/{,s}p || die + mv -v -- "${ED}"/usr/share/man/man1/{,s}p.1 || die fi if use schilytools_ved then docompress -x /usr/share/man/help diff --git a/app-shells/schily-tools/schily-tools-2018.04.17.ebuild b/app-shells/schily-tools/schily-tools-2018.04.17.ebuild index 64d6ac16..2b37466e 100644 --- a/app-shells/schily-tools/schily-tools-2018.04.17.ebuild +++ b/app-shells/schily-tools/schily-tools-2018.04.17.ebuild @@ -141,7 +141,7 @@ src_schily_prepare() ( -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ -e "s|^\(LDPATH=\).*|\1|" \ -e "s|^\(RUNPATH=\).*|\1|" \ - -e "s|^\(INS_BASE=\).*|\1\t${ED}usr|" \ + -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ -e '/^DEFUMASK/s,002,022,g' \ @@ -350,15 +350,15 @@ src_install() { if use schilytools_sccs then mv -v "${ED}"/usr/share/man/man1/{,sccs-}diff.1 || die else ! test -d "${ED}"/usr/ccs || rm -rfv -- "${ED}"/usr/ccs || die - mustnothave usr/share/man/man1/diff.1 + mustnothave /usr/share/man/man1/diff.1 fi if use schilytools_hdump - then mustremove usr/bin/od usr/share/man/man1/od.1 - else mustnothave usr/bin/od usr/share/man/man1/od.1 + then mustremove /usr/bin/od /usr/share/man/man1/od.1 + else mustnothave /usr/bin/od /usr/share/man/man1/od.1 fi if use schilytools_patch - then mustremove usr/share/man/man1/patch.1 - else mustnothave usr/share/man/man1/patch.1 + then mustremove /usr/share/man/man1/patch.1 + else mustnothave /usr/share/man/man1/patch.1 fi if use schilytools_bosh then dodir bin || die diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild index a061a883..8a523f7d 100644 --- a/app-text/stardict/stardict-3.0.6-r4.ebuild +++ b/app-text/stardict/stardict-3.0.6-r4.ebuild @@ -84,7 +84,7 @@ src_prepare() { sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die fi - default + eapply_user if ! use gnome then sed -i \ -e 's/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/' \ diff --git a/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild b/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild index 88865d51..8ef822a5 100644 --- a/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild +++ b/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild @@ -119,7 +119,7 @@ src_prepare() { eapply "${FILESDIR}/${PN}-strip-canberra.patch" fi - default + eapply_user eautoreconf gnome2_src_prepare } diff --git a/net-dialup/accounting/accounting-1.60.45.3.1.ebuild b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild index d13bfe89..fb809ae7 100644 --- a/net-dialup/accounting/accounting-1.60.45.3.1.ebuild +++ b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild @@ -1,7 +1,7 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 inherit rpm toolchain-funcs RESTRICT="mirror" |