diff options
| author |   Martin Väth <martin@mvath.de> | 2018-05-07 23:17:25 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2018-05-07 23:17:25 +0200 |
| commit | 094d1baa446a429adf4d090893acf7f7c7dd1c49 (patch) | |
| tree | a7e50c7135cecf533bb6895a0a1df8cbfe8d0d09 | |
| parent | x11-libs/gtk+: Version bump. Remove old (diff) | |
| download | mv-094d1baa446a429adf4d090893acf7f7c7dd1c49.tar.gz mv-094d1baa446a429adf4d090893acf7f7c7dd1c49.tar.bz2 mv-094d1baa446a429adf4d090893acf7f7c7dd1c49.zip | |
Minor cleanups/EAPI bumps
148 files changed, 345 insertions, 339 deletions
diff --git a/app-accessibility/gespeaker/gespeaker-0.8.6-r2.ebuild b/app-accessibility/gespeaker/gespeaker-0.8.6-r2.ebuild index d5d8ac96..831b4791 100644 --- a/app-accessibility/gespeaker/gespeaker-0.8.6-r2.ebuild +++ b/app-accessibility/gespeaker/gespeaker-0.8.6-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2015-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 diff --git a/app-accessibility/gespeaker/gespeaker-0.8.6_p0.ebuild b/app-accessibility/gespeaker/gespeaker-0.8.6_p0.ebuild index bb493e58..28546821 100644 --- a/app-accessibility/gespeaker/gespeaker-0.8.6_p0.ebuild +++ b/app-accessibility/gespeaker/gespeaker-0.8.6_p0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2015-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 diff --git a/app-admin/flexlm/flexlm-9.5-r2.ebuild b/app-admin/flexlm/flexlm-9.5-r2.ebuild index d1fc45c9..839233f4 100644 --- a/app-admin/flexlm/flexlm-9.5-r2.ebuild +++ b/app-admin/flexlm/flexlm-9.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" inherit user diff --git a/app-admin/sudox/sudox-9.0.1.ebuild b/app-admin/sudox/sudox-9.0.1.ebuild index d418fa96..d13ab28b 100644 --- a/app-admin/sudox/sudox-9.0.1.ebuild +++ b/app-admin/sudox/sudox-9.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="wrapper for sudo which can pass X authority data and deal with screen and tmux" @@ -20,7 +20,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/app-arch/archwrap/archwrap-11.1.ebuild b/app-arch/archwrap/archwrap-11.1.ebuild index 957a915e..1fbd0fa3 100644 --- a/app-arch/archwrap/archwrap-11.1.ebuild +++ b/app-arch/archwrap/archwrap-11.1.ebuild @@ -1,7 +1,7 @@ # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A collection of POSIX shell scripts to invoke archiver programs" diff --git a/app-arch/bzwc/Manifest b/app-arch/bzwc/Manifest index 601b0d4c..6e2cfcaa 100644 --- a/app-arch/bzwc/Manifest +++ b/app-arch/bzwc/Manifest @@ -1 +1 @@ -DIST bzwc-5.0.tar.gz 2068 SHA256 f627212c76533e9321f8fc2339d4eea207c844ccd975890e1dd6ed14a19ec935 SHA512 94beebfa997baf5469ad39fbf958c99f8b22426dc471fc514182627b7c7939416a15277edd8a129a1f9f05fd8548d2b87edeb1b577a6c5a80bf45da2063cc193 +DIST bzwc-5.0.tar.gz 2068 SHA512 94beebfa997baf5469ad39fbf958c99f8b22426dc471fc514182627b7c7939416a15277edd8a129a1f9f05fd8548d2b87edeb1b577a6c5a80bf45da2063cc193 diff --git a/app-arch/bzwc/bzwc-5.0.ebuild b/app-arch/bzwc/bzwc-5.0.ebuild index b5cd672a..281ca2a5 100644 --- a/app-arch/bzwc/bzwc-5.0.ebuild +++ b/app-arch/bzwc/bzwc-5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)" diff --git a/app-arch/paq8l/paq8l-20070308.ebuild b/app-arch/paq8l/paq8l-20070308.ebuild index 1a218979..da18a0d5 100644 --- a/app-arch/paq8l/paq8l-20070308.ebuild +++ b/app-arch/paq8l/paq8l-20070308.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" RDEPEND="" S=${WORKDIR} diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r1.ebuild index 468fa4df..88d3aa99 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=6 +EAPI=7 inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig @@ -20,9 +20,9 @@ RDEPEND="acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) schily-tools? ( >=app-shells/schily-tools-2018.04.17[-system-libschily(-)] )" -DEPEND="${RDEPEND} - x11-misc/makedepend +BDEPEND="x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${P/_alpha[0-9][0-9]} diff --git a/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild b/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild index 29d2effd..34f70cdb 100644 --- a/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild +++ b/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="German dictionary (traditional orthography) for ispell" HOMEPAGE="http://www.lasr.cs.ucla.edu/geoff/ispell-dictionaries.html" @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86" IUSE="" -DEPEND="app-text/ispell:=" -RDEPEND="${DEPEND}" +BDEPEND="app-text/ispell:=" +RDEPEND="${BDEPEND}" S="${WORKDIR}" diff --git a/app-dicts/ispell-de/ispell-de-20161207.ebuild b/app-dicts/ispell-de/ispell-de-20161207.ebuild index b5b8ddf6..6c781041 100644 --- a/app-dicts/ispell-de/ispell-de-20161207.ebuild +++ b/app-dicts/ispell-de/ispell-de-20161207.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" MY_P=igerman98-${PV} @@ -14,7 +14,8 @@ LICENSE="GPL-2" IUSE="" KEYWORDS="alpha amd64 hppa mips ppc sparc x86" -DEPEND="app-text/ispell:=" +BDEPEND="app-text/ispell:=" +RDEPEND="${BDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild index d935f2cc..9d6cdea9 100644 --- a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild index 2bea436d..ca098b8d 100644 --- a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild index 5ab23c3c..23e6730c 100644 --- a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild index 3ffbacb3..fb4d94ab 100644 --- a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild index 9eef4b6d..39a2854d 100644 --- a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild index 3ab42f37..5863d724 100644 --- a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild +++ b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" DICT_PREFIX="" inherit stardict diff --git a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild index 3e690f6d..f286789e 100644 --- a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild +++ b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" FROM_LANG="German" TO_LANG="English" diff --git a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild index 537fc485..ddeb0cc7 100644 --- a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild +++ b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="fetch" FROM_LANG="German" TO_LANG="Italian" diff --git a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild index 5f04a074..7f5599ab 100644 --- a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild +++ b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 FROM_LANG="Italian" TO_LANG="German" DICT_PREFIX="dictd_www.freedict.de_" diff --git a/app-dicts/steak/steak-1.7.3-r3.ebuild b/app-dicts/steak/steak-1.7.3-r3.ebuild index a2898833..dcf18c44 100644 --- a/app-dicts/steak/steak-1.7.3-r3.ebuild +++ b/app-dicts/steak/steak-1.7.3-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="EN => DE Dictionary" @@ -19,8 +19,8 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~amd64" IUSE="" -DEPEND="app-text/recode" -! ${use_rpm} || DEPEND=${DEPEND}" app-arch/rpm2targz" +BDEPEND="app-text/recode" +! ${use_rpm} || BDEPEND=${BDEPEND}" app-arch/rpm2targz" RDEPEND="" S=${WORKDIR}/Steak @@ -35,7 +35,7 @@ PATCHES=("${FILESDIR}/${P}.patch") } src_prepare() { - eapply_user + default recode latin1..utf8 "${S}"/Datensatz/ger-eng.txt || die } diff --git a/app-emacs/mv_emacs/mv_emacs-1.3.ebuild b/app-emacs/mv_emacs/mv_emacs-1.3.ebuild index da259597..d321810c 100644 --- a/app-emacs/mv_emacs/mv_emacs-1.3.ebuild +++ b/app-emacs/mv_emacs/mv_emacs-1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit elisp-common @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="" -DEPEND="virtual/emacs" +BDEPEND="virtual/emacs" RDEPEND=${DEPEND} src_unpack() { diff --git a/app-eselect/eselect-net/eselect-net-0.2.ebuild b/app-eselect/eselect-net/eselect-net-0.2.ebuild index 3ce3d04a..20f3fa7d 100644 --- a/app-eselect/eselect-net/eselect-net-0.2.ebuild +++ b/app-eselect/eselect-net/eselect-net-0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-misc/knapsack/knapsack-7.2.1.ebuild b/app-misc/knapsack/knapsack-7.2.1.ebuild index d5b62bb0..63be7c52 100644 --- a/app-misc/knapsack/knapsack-7.2.1.ebuild +++ b/app-misc/knapsack/knapsack-7.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-misc/machine-learning-mv/machine-learning-mv-1.2.ebuild b/app-misc/machine-learning-mv/machine-learning-mv-1.2.ebuild index 4f04a61f..2ebd07a1 100644 --- a/app-misc/machine-learning-mv/machine-learning-mv-1.2.ebuild +++ b/app-misc/machine-learning-mv/machine-learning-mv-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-portage/etcat/Manifest b/app-portage/etcat/Manifest index 5fb6e4c0..470ffa54 100644 --- a/app-portage/etcat/Manifest +++ b/app-portage/etcat/Manifest @@ -1 +1 @@ -DIST etcat-1.0.1.tar.gz 40640 SHA256 53eaa44a6d3b098b0c5179280b09790001290e5849481ef8aeeee87f8898f1dd SHA512 1245828586253c156fc1a49ae5c2a13f9ee8238f934c40de2bdad87f48c7c0115cd1ea576ad1208edc523360a13e69aec430a3aaad64435ba97eadd8dbd94f61 +DIST etcat-1.0.1.tar.gz 40640 SHA512 1245828586253c156fc1a49ae5c2a13f9ee8238f934c40de2bdad87f48c7c0115cd1ea576ad1208edc523360a13e69aec430a3aaad64435ba97eadd8dbd94f61 diff --git a/app-portage/etcat/etcat-1.0.1.ebuild b/app-portage/etcat/etcat-1.0.1.ebuild index 220b1135..a4a2e5cb 100644 --- a/app-portage/etcat/etcat-1.0.1.ebuild +++ b/app-portage/etcat/etcat-1.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) @@ -31,7 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { python_fix_shebang "${S}" - eapply_user + default } src_install() { diff --git a/app-portage/etcat/etcat-99999999.ebuild b/app-portage/etcat/etcat-99999999.ebuild index 220b1135..a4a2e5cb 100644 --- a/app-portage/etcat/etcat-99999999.ebuild +++ b/app-portage/etcat/etcat-99999999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) @@ -31,7 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { python_fix_shebang "${S}" - eapply_user + default } src_install() { diff --git a/app-portage/find_cruft/find_cruft-5.1.ebuild b/app-portage/find_cruft/find_cruft-5.1.ebuild index 6e7b0f5d..a07b3a1d 100644 --- a/app-portage/find_cruft/find_cruft-5.1.ebuild +++ b/app-portage/find_cruft/find_cruft-5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -22,7 +22,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild index b76f3dcb..d9f35365 100644 --- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild +++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ into your /etc/make.conf to make use of getdelta" src_prepare() { eapply "${FILESDIR}/eapi2.patch" sed -i -e "s:/bin/sh:/bin/bash:" getdelta.sh || die - eapply_user + default } src_install() { diff --git a/app-portage/logclean/logclean-18.2.ebuild b/app-portage/logclean/logclean-18.2.ebuild index 2ec48f7d..53c4f9f1 100644 --- a/app-portage/logclean/logclean-18.2.ebuild +++ b/app-portage/logclean/logclean-18.2.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -28,7 +28,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-14.12.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-14.12.ebuild index 902faf1e..d9698779 100644 --- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-14.12.ebuild +++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-14.12.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags" diff --git a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-6.0.1.ebuild b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-6.0.1.ebuild index 6543aa6d..4cda0bdb 100644 --- a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-6.0.1.ebuild +++ b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-6.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -32,7 +32,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env "#!'"${EPREFIX}/usr/bin/"'"' \ -- bin/* || die } - eapply_user + default } src_install() { diff --git a/app-portage/trickyfetch/trickyfetch-8.20.ebuild b/app-portage/trickyfetch/trickyfetch-8.20.ebuild index cc78abe9..460baaf5 100644 --- a/app-portage/trickyfetch/trickyfetch-8.20.ebuild +++ b/app-portage/trickyfetch/trickyfetch-8.20.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -23,7 +23,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${S}"/bin/* || die fi - eapply_user + default } src_install() { diff --git a/app-portage/useflags/useflags-4.1.3.ebuild b/app-portage/useflags/useflags-4.1.3.ebuild index ab890981..12f6731e 100644 --- a/app-portage/useflags/useflags-4.1.3.ebuild +++ b/app-portage/useflags/useflags-4.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -27,7 +27,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/app-portage/world-mv/world-mv-3.19.ebuild b/app-portage/world-mv/world-mv-3.19.ebuild index 801c7727..848e1c36 100644 --- a/app-portage/world-mv/world-mv-3.19.ebuild +++ b/app-portage/world-mv/world-mv-3.19.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" mPN="${PN%-*}" @@ -25,7 +25,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die fi - eapply_user + default } src_install() { diff --git a/app-shells/auto-fu-zsh/Manifest b/app-shells/auto-fu-zsh/Manifest index f266ddd8..e620444f 100644 --- a/app-shells/auto-fu-zsh/Manifest +++ b/app-shells/auto-fu-zsh/Manifest @@ -1,2 +1,2 @@ DIST auto-fu-zsh-0.0.1.12.tar.gz 9409 SHA256 cf692f8a81588289e44396f06e30e36fc6fa6bdcb2c87e4d462a15bad61db1c1 SHA512 7e5dbbb7329bfb220fe467de0eebc7d2aa2469ddea84d516deaa00d193729362f02355325765b29f16df66fbf458df69f984b70fad801b97af65a498080272ba -DIST auto-fu-zsh-0.0.1.12_p0.tar.gz 17131 SHA256 ed24fa3b1464a1d1f80ade02b9ae7d81610b62d60ed7f784a1bc5c022db8e6a0 SHA512 0776897fa8f587bc69d48ffe2a8f3e4a5f1c14f7f3707c0cc9557f1722d97ec6c2ee24cd1cdce68c79146487d2784c3c3c4c9bcb80be6f17b295b6829fe19415 +DIST auto-fu-zsh-0.0.1.12_p0.tar.gz 17131 SHA512 0776897fa8f587bc69d48ffe2a8f3e4a5f1c14f7f3707c0cc9557f1722d97ec6c2ee24cd1cdce68c79146487d2784c3c3c4c9bcb80be6f17b295b6829fe19415 diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild index 3d83ef17..a8d30417 100644 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 pPN=${PN%-zsh} mPN="${pPN}.zsh" @@ -115,7 +115,7 @@ src_prepare() { # Make it work with older zsh versions: eapply "${FILESDIR}"/zsh-compatibility.patch fi - eapply_user + default } src_compile() { diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild index 3d83ef17..a8d30417 100644 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 pPN=${PN%-zsh} mPN="${pPN}.zsh" @@ -115,7 +115,7 @@ src_prepare() { # Make it work with older zsh versions: eapply "${FILESDIR}"/zsh-compatibility.patch fi - eapply_user + default } src_compile() { diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild index 3d83ef17..a8d30417 100644 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 pPN=${PN%-zsh} mPN="${pPN}.zsh" @@ -115,7 +115,7 @@ src_prepare() { # Make it work with older zsh versions: eapply "${FILESDIR}"/zsh-compatibility.patch fi - eapply_user + default } src_compile() { diff --git a/app-shells/command-not-found/command-not-found-0.4.5.ebuild b/app-shells/command-not-found/command-not-found-0.4.5.ebuild index 210a63d2..8f0106b2 100644 --- a/app-shells/command-not-found/command-not-found-0.4.5.ebuild +++ b/app-shells/command-not-found/command-not-found-0.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ src_prepare() { CMakeLists.txt || die sed -i -e "s/function[[:space:]]*\([^[:space:](]*\)[[:space:]]*(/\1(/" \ cnf.sh || die - eapply_user + default } src_install() { diff --git a/app-shells/dash/dash-99999999.ebuild b/app-shells/dash/dash-99999999.ebuild index 116417b1..2804cae3 100644 --- a/app-shells/dash/dash-99999999.ebuild +++ b/app-shells/dash/dash-99999999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 LIVE=false case ${PV} in @@ -45,7 +45,6 @@ DEPEND="${RDEPEND} src_prepare() { local c - default use vanilla || eapply "${FILESDIR}"/dumb-echo.patch if [ -n "${DEB_PATCH}" ] then eapply "${WORKDIR}"/${DEB_PF}.diff @@ -61,7 +60,7 @@ src_prepare() { -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ ${c} || die - eapply_user + default ! ${LIVE} || eautoreconf } diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild index df412bdd..0ac77d3a 100644 --- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild +++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,7 +38,7 @@ src_prepare() { sed -i -e 's!~/.oh-my-zsh!'"${ZSH_EDEST}"'!' \ "${S}/plugins/dirpersist/dirpersist.plugin.zsh" sed -i -e '/zstyle.*cache/d' "${S}/lib/completion.zsh" - eapply_user + default } src_install() { diff --git a/app-shells/push/push-3.1.ebuild b/app-shells/push/push-3.1.ebuild index a111ebf6..ee483815 100644 --- a/app-shells/push/push-3.1.ebuild +++ b/app-shells/push/push-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-shells/quoter/quoter-4.1.ebuild b/app-shells/quoter/quoter-4.1.ebuild index c2e98b22..5219db24 100644 --- a/app-shells/quoter/quoter-4.1.ebuild +++ b/app-shells/quoter/quoter-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-shells/runtitle/runtitle-2.10.ebuild b/app-shells/runtitle/runtitle-2.10.ebuild index c6b31bca..05a4067d 100644 --- a/app-shells/runtitle/runtitle-2.10.ebuild +++ b/app-shells/runtitle/runtitle-2.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Scripts to run commands and set the hard status line (windows title)" @@ -17,7 +17,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - eapply_user + default } src_install() { 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 10fc1177..dfd8cd30 100644 --- a/app-shells/schily-tools/schily-tools-2017.09.25.ebuild +++ b/app-shells/schily-tools/schily-tools-2017.09.25.ebuild @@ -1,7 +1,7 @@ # Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit flag-o-matic gnuconfig toolchain-funcs @@ -204,7 +204,7 @@ src_prepare() { ! use schilytools_translit || targets translit ! use schilytools_udiff || targets udiff ! use schilytools_ved || targets ved libxtermcap - eapply_user + default } ac_cv_sizeof() { 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 6f2b35b9..64d6ac16 100644 --- a/app-shells/schily-tools/schily-tools-2018.04.17.ebuild +++ b/app-shells/schily-tools/schily-tools-2018.04.17.ebuild @@ -1,7 +1,7 @@ # Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit flag-o-matic gnuconfig toolchain-funcs @@ -208,7 +208,7 @@ src_prepare() { ! use schilytools_translit || targets translit ! use schilytools_udiff || targets udiff ! use schilytools_ved || targets ved libxtermcap - eapply_user + default } ac_cv_sizeof() { diff --git a/app-shells/set_prompt/set_prompt-3.0.0.ebuild b/app-shells/set_prompt/set_prompt-3.0.0.ebuild index a3cedfea..be4310b1 100644 --- a/app-shells/set_prompt/set_prompt-3.0.0.ebuild +++ b/app-shells/set_prompt/set_prompt-3.0.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="An intelligent prompt for zsh or bash with status line (window title) support" @@ -17,7 +17,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env "#!'"${EPREFIX}"'/bin/"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/app-shells/termcolors-mv/termcolors-mv-4.7.ebuild b/app-shells/termcolors-mv/termcolors-mv-4.7.ebuild index eb58efde..6b64cf08 100644 --- a/app-shells/termcolors-mv/termcolors-mv-4.7.ebuild +++ b/app-shells/termcolors-mv/termcolors-mv-4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-shells/zshrc-mv/zshrc-mv-3.11.ebuild b/app-shells/zshrc-mv/zshrc-mv-3.11.ebuild index e245fe4d..2e354193 100644 --- a/app-shells/zshrc-mv/zshrc-mv-3.11.ebuild +++ b/app-shells/zshrc-mv/zshrc-mv-3.11.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A zshrc file initializing zsh specific interactive features" diff --git a/app-text/ispell/ispell-3.3.02-r1.ebuild b/app-text/ispell/ispell-3.3.02-r1.ebuild index 7d3c88b4..e39c8406 100644 --- a/app-text/ispell/ispell-3.3.02-r1.ebuild +++ b/app-text/ispell/ispell-3.3.02-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs @@ -29,7 +29,7 @@ src_prepare() { sed -e "s:GENTOO_LIBDIR:$(get_libdir):" -i local.h || die sed -e "s:\(^#define CC\).*:\1 \"$(tc-getCC)\":" -i local.h || die sed -e "s:\(^#define CFLAGS\).*:\1 \"${CFLAGS}\":" -i config.X || die - eapply_user + default } src_configure() { diff --git a/app-text/ispell/ispell-3.4.00.ebuild b/app-text/ispell/ispell-3.4.00.ebuild index bb11b086..23be52e2 100644 --- a/app-text/ispell/ispell-3.4.00.ebuild +++ b/app-text/ispell/ispell-3.4.00.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs @@ -30,7 +30,7 @@ src_prepare() { -e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \ -e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \ -- "${S}"/config.X || die - eapply_user + default } src_configure() { diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild index a38f6452..384bdc4a 100644 --- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild +++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon" HOMEPAGE="https://github.com/wofr06/lesspipe" @@ -207,7 +207,7 @@ src_prepare() { use netcdf; ModifyX 'ncdump' ModifyEnd printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die - eapply_user + default } src_configure() { diff --git a/app-text/lesspipe/lesspipe-1.84_alpha20180414-r1.ebuild b/app-text/lesspipe/lesspipe-1.84_alpha20180414-r1.ebuild index ecbc1e00..07c66cdb 100644 --- a/app-text/lesspipe/lesspipe-1.84_alpha20180414-r1.ebuild +++ b/app-text/lesspipe/lesspipe-1.84_alpha20180414-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon" HOMEPAGE="https://github.com/wofr06/lesspipe" @@ -220,7 +220,7 @@ src_prepare() { use netcdf; ModifyX 'ncdump' ModifyEnd printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die - eapply_user + default } src_configure() { diff --git a/app-text/lesspipe/lesspipe-99999999.ebuild b/app-text/lesspipe/lesspipe-99999999.ebuild index ecbc1e00..07c66cdb 100644 --- a/app-text/lesspipe/lesspipe-99999999.ebuild +++ b/app-text/lesspipe/lesspipe-99999999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon" HOMEPAGE="https://github.com/wofr06/lesspipe" @@ -220,7 +220,7 @@ src_prepare() { use netcdf; ModifyX 'ncdump' ModifyEnd printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die - eapply_user + default } src_configure() { diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild index 1e0e087d..f6944235 100644 --- a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild +++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs diff --git a/app-text/psjoin/psjoin-0.3.ebuild b/app-text/psjoin/psjoin-0.3.ebuild index e3a754ee..6afcb6ed 100644 --- a/app-text/psjoin/psjoin-0.3.ebuild +++ b/app-text/psjoin/psjoin-0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="concatenate postscript files. From new PostScript Utilities" diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild index 21569424..a061a883 100644 --- a/app-text/stardict/stardict-3.0.6-r4.ebuild +++ b/app-text/stardict/stardict-3.0.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -84,7 +84,7 @@ src_prepare() { sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die fi - eapply_user + default 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 eab1b401..88865d51 100644 --- a/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild +++ b/app-text/stardict/stardict-4.0.0_pre20160518-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -119,7 +119,7 @@ src_prepare() { eapply "${FILESDIR}/${PN}-strip-canberra.patch" fi - eapply_user + default eautoreconf gnome2_src_prepare } diff --git a/dev-cpp/cpplint/cpplint-99999999.ebuild b/dev-cpp/cpplint/cpplint-99999999.ebuild index e2f4d8d9..d8ba20d7 100644 --- a/dev-cpp/cpplint/cpplint-99999999.ebuild +++ b/dev-cpp/cpplint/cpplint-99999999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( pypy python2_7 ) EGIT_REPO_URI="https://github.com/google/styleguide.git" inherit elisp-common git-r3 python-single-r1 @@ -19,7 +19,7 @@ EMACSNAME="google-c-style" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON="emacs? ( virtual/emacs )" -DEPEND="${COMMON}" +BDEPEND="${COMMON}" RDEPEND="${PYTHON_DEPS} ${COMMON}" @@ -42,7 +42,7 @@ EOF -e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \ -- "${S}/${PN}/${PN}.py" || die python_fix_shebang "${S}" - eapply_user + default } src_compile() { diff --git a/dev-libs/osformat/Manifest b/dev-libs/osformat/Manifest index ffa01fca..8c11c996 100644 --- a/dev-libs/osformat/Manifest +++ b/dev-libs/osformat/Manifest @@ -1 +1 @@ -DIST osformat-1.0.5.tar.xz 246980 SHA256 3040ee944b1333167091b482420f85af8dac9eef8005a6bdf04ddcc4a0156afa SHA512 aa7dd40c444d74daeb60c910fd50f2f6b0b83759ae3f2424ed5f4ac11b6ca56008cf12226d379f7a9bc8b8add13a6b9c1f95d36e134fa77c73e3e2358c5f43d4 +DIST osformat-1.0.5.tar.xz 246980 SHA512 aa7dd40c444d74daeb60c910fd50f2f6b0b83759ae3f2424ed5f4ac11b6ca56008cf12226d379f7a9bc8b8add13a6b9c1f95d36e134fa77c73e3e2358c5f43d4 diff --git a/dev-libs/osformat/osformat-1.0.5.ebuild b/dev-libs/osformat/osformat-1.0.5.ebuild index ae9ed4af..81b4d28f 100644 --- a/dev-libs/osformat/osformat-1.0.5.ebuild +++ b/dev-libs/osformat/osformat-1.0.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" SRC_URI="https://github.com/vaeth/osformat/releases/download/v${PV}/${P}.tar.xz" diff --git a/dev-libs/osformat/osformat-999999999.ebuild b/dev-libs/osformat/osformat-999999999.ebuild index 48f90894..201a328f 100644 --- a/dev-libs/osformat/osformat-999999999.ebuild +++ b/dev-libs/osformat/osformat-999999999.ebuild @@ -1,7 +1,7 @@ # Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools case ${PV} in diff --git a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild index 35878648..336a78d2 100644 --- a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild +++ b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2014-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/dev-tex/chklref/chklref-2.6.0.ebuild b/dev-tex/chklref/chklref-2.6.0.ebuild index f75b3e61..715dbedd 100644 --- a/dev-tex/chklref/chklref-2.6.0.ebuild +++ b/dev-tex/chklref/chklref-2.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${S}"/src/chklref.in || die - eapply_user + default } src_configure() { diff --git a/dev-util/comp/comp-4.3.ebuild b/dev-util/comp/comp-4.3.ebuild index d2b3e25d..37525b44 100644 --- a/dev-util/comp/comp-4.3.ebuild +++ b/dev-util/comp/comp-4.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="compare files or directories, including metadata" @@ -27,7 +27,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/dev-util/diffhelp/diffhelp-1.11.ebuild b/dev-util/diffhelp/diffhelp-1.11.ebuild index d734d8e1..5c221fb1 100644 --- a/dev-util/diffhelp/diffhelp-1.11.ebuild +++ b/dev-util/diffhelp/diffhelp-1.11.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A frontend, beautifier, and path-fixer for diff -u" @@ -17,7 +17,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/dev-util/mv_perl/mv_perl-3.16.ebuild b/dev-util/mv_perl/mv_perl-3.16.ebuild index ff040336..ecd15fa8 100644 --- a/dev-util/mv_perl/mv_perl-3.16.ebuild +++ b/dev-util/mv_perl/mv_perl-3.16.ebuild @@ -1,7 +1,7 @@ # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A collection of perl scripts (replacement in files, syncing dirs etc)" @@ -30,7 +30,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/dev-util/pyrep/pyrep-1.5-r1.ebuild b/dev-util/pyrep/pyrep-1.5-r1.ebuild index 413760ec..2d5af915 100644 --- a/dev-util/pyrep/pyrep-1.5-r1.ebuild +++ b/dev-util/pyrep/pyrep-1.5-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Search and/or replace regular expressions within many files interactively" diff --git a/dev-util/replacer/replacer-3.1-r1.ebuild b/dev-util/replacer/replacer-3.1-r1.ebuild index 27e9e958..647b8f8f 100644 --- a/dev-util/replacer/replacer-3.1-r1.ebuild +++ b/dev-util/replacer/replacer-3.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Search and replace python regular expressions within many files interactively" @@ -19,7 +19,7 @@ done RDEPEND="dev-lang/python nls? ( virtual/libintl )" -DEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext )" src_prepare() { local r diff --git a/dev-vcs/git-wrappers-mv/git-wrappers-mv-1.17.ebuild b/dev-vcs/git-wrappers-mv/git-wrappers-mv-1.17.ebuild index 277d0840..b9a435f7 100644 --- a/dev-vcs/git-wrappers-mv/git-wrappers-mv-1.17.ebuild +++ b/dev-vcs/git-wrappers-mv/git-wrappers-mv-1.17.ebuild @@ -1,7 +1,7 @@ # Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Some personal wrappers for the most important git commands" @@ -17,7 +17,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \ -- bin/git-[b-z]* || die - eapply_user + default } src_install() { diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9a5d4909..69063c6f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,5 +1,4 @@ # ChangeLog for eclass directory -# Copyright 2012-2018 Gentoo Foundation; Distributed under the GPL v2 12 May 2012; Martin Väth <martin@mvath.de>: Created ChangeLog @@ -80,3 +79,6 @@ 14 Apr 2018; Martin Väth <martin@mvath.de>: mv_mozextension-r1.eclass: remove support for legacy extensions + + 07 May 2018; Martin Väth <martin@mvath.de>: + monotone.eclass, mv_mozextension-r1.eclass: Support EAPI=7 diff --git a/eclass/monotone.eclass b/eclass/monotone.eclass index 54c7cbae..d07ba97d 100644 --- a/eclass/monotone.eclass +++ b/eclass/monotone.eclass @@ -1,4 +1,4 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: monotone.eclass @@ -191,6 +191,11 @@ monotone_src_unpack() { monotone_finish } -[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || DEPEND='dev-vcs/monotone' +[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || case ${EAPI:-0} in +0|1|2|3|4|5|6) + DEPEND='dev-vcs/monotone';; +*) + BDEPEND='dev-vcs/monotone';; +esac EXPORT_FUNCTIONS src_unpack diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass index 8d99800c..0042bf1a 100644 --- a/eclass/mv_mozextension-r1.eclass +++ b/eclass/mv_mozextension-r1.eclass @@ -18,7 +18,7 @@ # inherit mv_mozextension-r1 # # MOZ="<firefox-57 seamonkey" -# DEPEND=${MOZ_DEPEND} +# BDEPEND=${MOZ_BDEPEND} # RDEPEND=$(moz_rdepend ${MOZ}) # IUSE=$(moz_iuse ${MOZ}) # REQUIRED_USE=$(moz_required_use ${MOZ}) @@ -65,7 +65,12 @@ moz_variables() { esac done shift $(( ${OPTIND} - 1 )) - DEPEND=${MOZ_DEPEND} + case ${EAPI} in + 6) + DEPEND=${MOZ_BDEPEND};; + *) + BDEPEND=${MOZ_BDEPEND};; + esac RDEPEND=$(moz_rdepend "${@}") IUSE=$(moz_iuse ${o} "${@}") REQUIRED_USE=$(moz_required_use "${@}") @@ -101,10 +106,10 @@ moz_install$quoteargs }" } -# @ECLASS-VARIABLE: MOZ_DEPEND +# @ECLASS-VARIABLE: MOZ_BDEPEND # @DESCRIPTION: # This is an eclass-generated depend expression needed for moz_unpack to work -MOZ_DEPEND='app-arch/unzip' +MOZ_BDEPEND='app-arch/unzip' # @FUNCTION: moz_split_browser # @USAGE: <browser> diff --git a/games-action/trackballs/trackballs-1.1.4-r1.ebuild b/games-action/trackballs/trackballs-1.1.4-r1.ebuild index ea6926ce..c8fbeb1c 100644 --- a/games-action/trackballs/trackballs-1.1.4-r1.ebuild +++ b/games-action/trackballs/trackballs-1.1.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils user RESTRICT="mirror" @@ -23,8 +23,8 @@ RDEPEND="virtual/opengl media-libs/sdl-image media-libs/sdl-ttf nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" pkg_setup(){ enewgroup gamestat 36 @@ -54,7 +54,7 @@ src_prepare() { -e 's/\(snprintf(\(textureName\),\)63\(,textureNames\[i\])\)/\1 sizeof(\2), "%s"\3/' \ src/map.cc || die eapply "${FILESDIR}"/${P}-warning.patch - eapply_user + default } src_configure() { diff --git a/games-board/chessproblem/Manifest b/games-board/chessproblem/Manifest index 93a1cbb4..58b66759 100644 --- a/games-board/chessproblem/Manifest +++ b/games-board/chessproblem/Manifest @@ -1,2 +1,2 @@ -DIST chessproblem-1.8.tar.gz 38915 SHA256 383397979dec94e1e36214be1e817a67585c6aa7b733f187c659d10dad19520f SHA512 bf2eae53ba4d0d36877e9b93236f16895c06a94f252d3b1ed15d6282177c0309cf7ca588922c48d4203e196abf5c82a9a777a3b78199c72e295d258563496d1d -DIST chessproblem-2.9.tar.gz 43151 SHA256 9e5d7913dee01632aa2a7a1924cf2f576c0bb4f08d64ced17c8ab2e504f6af9b SHA512 be285fab02e49876ec286fd7554f410ad51680d794a3f8c0bb0aa7a1d57b404aac1c3d417c9eb5ed02cdce69dca5d42f020c6465a9083446a9b5f185915e0f33 +DIST chessproblem-1.8.tar.gz 38915 SHA512 bf2eae53ba4d0d36877e9b93236f16895c06a94f252d3b1ed15d6282177c0309cf7ca588922c48d4203e196abf5c82a9a777a3b78199c72e295d258563496d1d +DIST chessproblem-2.9.tar.gz 43151 SHA512 be285fab02e49876ec286fd7554f410ad51680d794a3f8c0bb0aa7a1d57b404aac1c3d417c9eb5ed02cdce69dca5d42f020c6465a9083446a9b5f185915e0f33 diff --git a/games-board/chessproblem/chessproblem-1.8.ebuild b/games-board/chessproblem/chessproblem-1.8.ebuild index 16b52dac..7496d539 100644 --- a/games-board/chessproblem/chessproblem-1.8.ebuild +++ b/games-board/chessproblem/chessproblem-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- contrib/test.pl || die - eapply_user + default eautoreconf } diff --git a/games-board/chessproblem/chessproblem-2.9.ebuild b/games-board/chessproblem/chessproblem-2.9.ebuild index 99909d1a..2bcb6bf4 100644 --- a/games-board/chessproblem/chessproblem-2.9.ebuild +++ b/games-board/chessproblem/chessproblem-2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- contrib/test.pl || die - eapply_user + default eautoreconf } diff --git a/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild b/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild index d526d46f..ef0c5482 100644 --- a/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild +++ b/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit python-any-r1 toolchain-funcs qmake-utils @@ -45,11 +45,11 @@ RDEPEND="!games-emulation/sdlmametools dev-qt/qtwidgets:5 ) x11-libs/libX11 x11-libs/libXinerama" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS} app-arch/unzip virtual/pkgconfig - x11-proto/xineramaproto" + x11-base/xorg-proto" S=${WORKDIR} diff --git a/games-emulation/xmame/xmame-0.106-r4.ebuild b/games-emulation/xmame/xmame-0.106-r4.ebuild index e7bb7c97..46e2816e 100644 --- a/games-emulation/xmame/xmame-0.106-r4.ebuild +++ b/games-emulation/xmame/xmame-0.106-r4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs RESTRICT="mirror" @@ -32,13 +32,9 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) X? ( x11-libs/libXext )" -DEPEND="${RDEPEND} - dga? ( - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto ) - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - x86? ( dev-lang/nasm )" +DEPEND="${RDEPEND}" +BDEPEND="x86? ( dev-lang/nasm ) + x11-base/xorg-proto" # Icc sucks. bug #41342 # icc? ( dev-lang/icc ) diff --git a/games-emulation/xmess/xmess-0.106-r3.ebuild b/games-emulation/xmess/xmess-0.106-r3.ebuild index 850f45ba..7f043cdc 100644 --- a/games-emulation/xmess/xmess-0.106-r3.ebuild +++ b/games-emulation/xmess/xmess-0.106-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs RESTRICT="mirror" @@ -32,13 +32,9 @@ RDEPEND="sys-libs/zlib xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) X? ( x11-libs/libXext )" -DEPEND="${RDEPEND} - dga? ( - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto ) - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - x86? ( dev-lang/nasm )" +DEPEND="${RDEPEND}" +BDEPEND="x86? ( dev-lang/nasm ) + x11-base/xorg-proto" # Icc sucks. bug #41342 # icc? ( dev-lang/icc ) diff --git a/games-engines/freesci/freesci-0.6.4-r1.ebuild b/games-engines/freesci/freesci-0.6.4-r1.ebuild index b128c953..0159709a 100644 --- a/games-engines/freesci/freesci-0.6.4-r1.ebuild +++ b/games-engines/freesci/freesci-0.6.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 +inherit desktop RESTRICT="mirror" DESCRIPTION="Sierra script interpreter for your old Sierra adventures" @@ -30,7 +30,7 @@ src_prepare() { Makefile.in \ || die "sed failed" eapply -p0 "${FILESDIR}"/${P}-glibc2.10.patch - eapply_user + default } src_configure() { diff --git a/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild b/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild index f0724f7a..0975a8e3 100644 --- a/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild +++ b/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A remake of Richard C. Garriott's Ultima prequel" @@ -17,7 +17,7 @@ DEPEND="media-libs/libsdl" src_prepare() { eapply -p0 "${FILESDIR}"/${P}-gcc43.patch - eapply_user + default } src_install() { diff --git a/games-rpg/dsa-stats/dsa-stats-1.0.ebuild b/games-rpg/dsa-stats/dsa-stats-1.0.ebuild index 12eb11ff..4a067392 100644 --- a/games-rpg/dsa-stats/dsa-stats-1.0.ebuild +++ b/games-rpg/dsa-stats/dsa-stats-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="calculate stat probabalities for the role playing game DSA - Das schwarze Auge" diff --git a/games-rpg/m5figur-mv/m5figur-mv-3.0.ebuild b/games-rpg/m5figur-mv/m5figur-mv-3.0.ebuild index 5339427e..518116d8 100644 --- a/games-rpg/m5figur-mv/m5figur-mv-3.0.ebuild +++ b/games-rpg/m5figur-mv/m5figur-mv-3.0.ebuild @@ -1,7 +1,7 @@ # Copyright 2014-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 # Do *not* inherit latex-package: It DEPENDS unconditionally on texinfo. # Moreover, it would attempt to compile the *.tex example with texinfo to dvi. RESTRICT="mirror" @@ -15,9 +15,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+examples" # We need texlive-latexextra for toolbox.sty -RDEPEND="virtual/latex-base +DEPEND="virtual/latex-base" +RDEPEND="${DEPEND} dev-texlive/texlive-latexextra" -DEPEND="examples? ( ${RDEPEND} )" +BDEPEND="examples? ( ${DEPEND} )" src_compile() { if use examples diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild index d335bce5..34788d7b 100644 --- a/mail-client/alpine/alpine-2.00-r7.ebuild +++ b/mail-client/alpine/alpine-2.00-r7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic autotools toolchain-funcs CHAPPA_PL=115 @@ -54,7 +54,7 @@ src_prepare() { eapply -p0 "${FILESDIR}"/2.00-qa.patch use chappa && eapply -p0 "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch" - eapply_user + default eautoreconf } diff --git a/media-gfx/pqiv/pqiv-2.10.2.ebuild b/media-gfx/pqiv/pqiv-2.10.2.ebuild index a223b056..b1ad78e4 100644 --- a/media-gfx/pqiv/pqiv-2.10.2.ebuild +++ b/media-gfx/pqiv/pqiv-2.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest index 40b01103..6ad5aa8e 100644 --- a/media-tv/nvtv/Manifest +++ b/media-tv/nvtv/Manifest @@ -1 +1 @@ -DIST nvtv-0.4.7.tar.gz 419564 SHA256 f044c6de2df66196fa589ed0d33203bd10d88604f447befce1a6f62eb7b08dac SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d WHIRLPOOL c5ac613d4331f62c761addc321f3b619dc73206b5c5d5bbf75cbb7e261537521f8f67cbc4ea154dc89c9ebcba6b95c08b7b78569c50f8d2f895481b7aefc4a11 +DIST nvtv-0.4.7.tar.gz 419564 SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild index 2d164aca..9557e8ff 100644 --- a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild +++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -21,8 +21,8 @@ RDEPEND="sys-apps/pciutils[-zlib] x11-libs/libXmu x11-libs/libXxf86vm )" -DEPEND="${RDEPEND} - X? ( x11-proto/xf86vidmodeproto )" +DEPEND="${RDEPEND}" +BDEPEND="X? ( x11-base/xorg-proto )" PATCHES=( "${FILESDIR}/respect-cflags.patch" ) diff --git a/media-tv/sundtek-tv/sundtek-tv-180407.235821.ebuild b/media-tv/sundtek-tv/sundtek-tv-180407.235821.ebuild index 3701d50d..f278ebd1 100644 --- a/media-tv/sundtek-tv/sundtek-tv-180407.235821.ebuild +++ b/media-tv/sundtek-tv/sundtek-tv-180407.235821.ebuild @@ -144,7 +144,7 @@ want to use with sundtek-tv. " ln -sfn mediaclient.video mediaclient.audio ln -sfn mediaclient.video mediaclient.dvb - eapply_user + default } src_install() { diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest index bdd03f11..7b4ea41b 100644 --- a/media-tv/w_scan/Manifest +++ b/media-tv/w_scan/Manifest @@ -1 +1 @@ -DIST w_scan-20170107.tar.bz2 245517 SHA256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a +DIST w_scan-20170107.tar.bz2 245517 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a diff --git a/media-tv/w_scan/w_scan-20170107-r1.ebuild b/media-tv/w_scan/w_scan-20170107-r1.ebuild index e4aefcc6..33ed9a54 100644 --- a/media-tv/w_scan/w_scan-20170107-r1.ebuild +++ b/media-tv/w_scan/w_scan-20170107-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies" HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html" diff --git a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild b/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild index f3b356c5..6f0d4a9c 100644 --- a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild +++ b/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs @@ -23,7 +23,7 @@ src_prepare() { eapply "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff eapply "${FILESDIR}"/no-bison.patch sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die - eapply_user + default } src_compile() { diff --git a/media-video/video-mv/video-mv-12.1.ebuild b/media-video/video-mv/video-mv-12.1.ebuild index eb0f1b17..437e4de5 100644 --- a/media-video/video-mv/video-mv-12.1.ebuild +++ b/media-video/video-mv/video-mv-12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,7 +38,7 @@ src_prepare() { -e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \ -- "${i}" || die done - eapply_user + default } src_install() { diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index b2f51bf5..a0deaf9b 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -97,7 +97,7 @@ sys-block/zram-init 7.1: Scripts to support compressed swap devices or ramdisks sys-boot/grub-cfg-mv 1.5: A grub.cfg library/example for GRUB2 sys-fs/emount 3.0.4: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab sys-fs/squash_dir 13.14: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist -sys-fs/squashfs-tools 4.3.1_alpha20171129-r1 99999999-r1: Tool for creating compressed filesystem type squashfs +sys-fs/squashfs-tools 4.3.1_alpha20171129-r1 99999999: Tool for creating compressed filesystem type squashfs sys-fs/squashfuse 0.1.103: FUSE filesystem to mount squashfs archives sys-fs/squashmount 16.1.0 19.0.2: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files 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 f31b6586..d13bfe89 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 2016 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit rpm toolchain-funcs RESTRICT="mirror" @@ -41,7 +41,7 @@ src_prepare() { "${CDIR}"/defines.h sed -i -e's!/var/log/[^.]*\.log!'"${ACCOUNTING_LOG}"'!' \ "${DDIR}"/accounting.1 - eapply_user + default } src_configure() { diff --git a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild index a94f019e..7358a8e8 100644 --- a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild +++ b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -71,7 +71,7 @@ src_prepare() { # It contains version checking code, hence can be applied unconditionally eapply "${FILESDIR}/${P}-linux-3.10.patch" fi - eapply_user + default } src_install() { diff --git a/net-dns/host/host-20070128-r1.ebuild b/net-dns/host/host-20070128-r1.ebuild index 2ff1d5d8..b4bc77e3 100644 --- a/net-dns/host/host-20070128-r1.ebuild +++ b/net-dns/host/host-20070128-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit toolchain-funcs multilib @@ -17,15 +17,13 @@ IUSE="debug" # Bug 91515 RESTRICT="${RESTRICT} test" -RDEPEND="" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" +BDEPEND=">=sys-apps/sed-4" src_prepare() { eapply -p0 "${FILESDIR}/${P}-Makefile.patch" sed -i -e "s:^\(# if defined(__alpha).*\):\1 || defined(__x86_64__):" \ port.h || die "sed failed" - eapply_user + defalut } src_compile() { diff --git a/net-dns/noip-updater/noip-updater-2.1.9-r4.ebuild b/net-dns/noip-updater/noip-updater-2.1.9-r4.ebuild index 88343b6b..87c6302a 100644 --- a/net-dns/noip-updater/noip-updater-2.1.9-r4.ebuild +++ b/net-dns/noip-updater/noip-updater-2.1.9-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -36,7 +36,7 @@ src_prepare() { -e "s:\"nobody\":\"ez-ipupd\":g" ) sed -i "${sedarg[@]}" noip2.c || die "sed failed" - eapply_user + default } src_compile() { diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest index 62c49b6d..aa02d76f 100644 --- a/net-firewall/firewall-mv/Manifest +++ b/net-firewall/firewall-mv/Manifest @@ -1 +1 @@ -DIST firewall-mv-13.0.tar.gz 17159 SHA256 e3e6f94535dec4c5f143b13f71885cc0a7158ff5f902fa9e490e784d3dee4920 SHA512 caf0b66fbf9d98f897ef901b366379e8db58cc6a2bbd911215cf0ba9f7cbecb230fe4d0b3ae7ef60f2429cd9b27e052ec19a4b14125928559431b15d4ebb06ac +DIST firewall-mv-13.0.tar.gz 17159 SHA512 caf0b66fbf9d98f897ef901b366379e8db58cc6a2bbd911215cf0ba9f7cbecb230fe4d0b3ae7ef60f2429cd9b27e052ec19a4b14125928559431b15d4ebb06ac diff --git a/net-firewall/firewall-mv/firewall-mv-13.0.ebuild b/net-firewall/firewall-mv/firewall-mv-13.0.ebuild index 8666268e..ccf565ea 100644 --- a/net-firewall/firewall-mv/firewall-mv-13.0.ebuild +++ b/net-firewall/firewall-mv/firewall-mv-13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/net-misc/openrdate/openrdate-1.2.ebuild b/net-misc/openrdate/openrdate-1.2.ebuild index c70a5e6c..55097999 100644 --- a/net-misc/openrdate/openrdate-1.2.ebuild +++ b/net-misc/openrdate/openrdate-1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools DESCRIPTION="use TCP or UDP to retrieve the current time of another machine" @@ -18,7 +18,7 @@ RDEPEND="${DEPEND}" src_prepare() { eapply "${FILESDIR}"/${PN}-1.1.3-rename.patch - eapply_user + default eautomake mv docs/{,open}rdate.8 } diff --git a/net-misc/sshstart/sshstart-3.00.ebuild b/net-misc/sshstart/sshstart-3.00.ebuild index ba56527e..a2e0fd30 100644 --- a/net-misc/sshstart/sshstart-3.00.ebuild +++ b/net-misc/sshstart/sshstart-3.00.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="Start ssh-agent/ssh-add only if you really use ssh or friends" @@ -20,7 +20,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${PN}" || die - eapply_user + default } src_install() { diff --git a/net-print/foo2zjs/foo2zjs-20160722.ebuild b/net-print/foo2zjs/foo2zjs-20160722.ebuild index caddaca6..7d67cdb5 100644 --- a/net-print/foo2zjs/foo2zjs-20160722.ebuild +++ b/net-print/foo2zjs/foo2zjs-20160722.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Support for printing to ZjStream-based printers" HOMEPAGE="http://foo2zjs.rkkda.com/" @@ -22,8 +22,8 @@ RDEPEND="${COMMON} net-print/cups net-print/cups-filters virtual/udev" -DEPEND="${COMMON} - app-arch/unzip +DEPEND="${COMMON}" +BDEPEND="app-arch/unzip app-editors/vim sys-apps/ed sys-devel/bc @@ -184,7 +184,7 @@ src_prepare() { -i hplj1000 sed -e 's/chmod -w/sleep 2; chmod -w/' \ -i osx-hotplug/Makefile - eapply_user + default } src_compile() { diff --git a/sci-mathematics/genius/genius-1.0.21.ebuild b/sci-mathematics/genius/genius-1.0.21.ebuild index 951b3d00..035698ab 100644 --- a/sci-mathematics/genius/genius-1.0.21.ebuild +++ b/sci-mathematics/genius/genius-1.0.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} " src_prepare() { - eapply_user + default if ! use gnome then sed \ -e "s/AC_PATH_PROG.\(SCROLLKEEPER_CONFIG\).*/\1=true/" \ diff --git a/sci-mathematics/reduce/reduce-20141130-r2.ebuild b/sci-mathematics/reduce/reduce-20141130-r2.ebuild index 40fb04d5..acdf7d81 100644 --- a/sci-mathematics/reduce/reduce-20141130-r2.ebuild +++ b/sci-mathematics/reduce/reduce-20141130-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit elisp-common @@ -33,7 +33,7 @@ src_prepare() { # sed -i -e 's/\${l}/"\${l}"/g' -- "${S}"/scripts/make.sh sed -i -e 's/static char unmapTable/static unsigned char unmapTable/' \ -- "${S}"/csl/fox/src/FXShowMath.cpp - eapply_user + default } src_configure() { diff --git a/sys-apps/cpi/cpi-3.1.ebuild b/sys-apps/cpi/cpi-3.1.ebuild index 598e6bf7..481e5346 100644 --- a/sys-apps/cpi/cpi-3.1.ebuild +++ b/sys-apps/cpi/cpi-3.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2016 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A wrapper for cp -i -a, making use of diff" @@ -17,7 +17,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/cpi || die - eapply_user + default } src_install() { diff --git a/sys-apps/less/less-530.ebuild b/sys-apps/less/less-530.ebuild index 2ccca6d4..267b3e82 100644 --- a/sys-apps/less/less-530.ebuild +++ b/sys-apps/less/less-530.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" PATCHN="less-select" @@ -41,7 +41,7 @@ src_prepare() { "${SELECTDIR}/bin/less-select" || die fi chmod a+x configure || die - eapply_user + default } src_configure() { diff --git a/sys-apps/openrc-wrapper/openrc-wrapper-2.3.ebuild b/sys-apps/openrc-wrapper/openrc-wrapper-2.3.ebuild index 7faf4475..630a3646 100644 --- a/sys-apps/openrc-wrapper/openrc-wrapper-2.3.ebuild +++ b/sys-apps/openrc-wrapper/openrc-wrapper-2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-apps/paxopen/paxopen-1.2.ebuild b/sys-apps/paxopen/paxopen-1.2.ebuild index 621ec2b3..8f436aef 100644 --- a/sys-apps/paxopen/paxopen-1.2.ebuild +++ b/sys-apps/paxopen/paxopen-1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A wrapper script to set PAX kernel variables to an insecure/safe state" diff --git a/sys-apps/schedule/schedule-7.5.4.ebuild b/sys-apps/schedule/schedule-7.5.4.ebuild index f553c906..29da9553 100644 --- a/sys-apps/schedule/schedule-7.5.4.ebuild +++ b/sys-apps/schedule/schedule-7.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2014-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,7 @@ src_prepare() { -e 's"^/usr/share/schedule"${EPREFIX}/usr/share/${PN}"' \ -e '/^use FindBin;/,/^\}$/d' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-apps/starter/starter-3.0.ebuild b/sys-apps/starter/starter-3.0.ebuild index 7d18aba5..4b625668 100644 --- a/sys-apps/starter/starter-3.0.ebuild +++ b/sys-apps/starter/starter-3.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="POSIX shell script and function to schedule commands" @@ -20,7 +20,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-block/parted/parted-2.4-r2.ebuild b/sys-block/parted/parted-2.4-r2.ebuild index 63c0f521..1e912c7b 100644 --- a/sys-block/parted/parted-2.4-r2.ebuild +++ b/sys-block/parted/parted-2.4-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" @@ -27,9 +27,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig " +BDEPEND="nls? ( >=sys-devel/gettext-0.12.1-r2 )" PATCHES=( "${FILESDIR}"/${P}-no-gets.patch "${FILESDIR}"/${P}-readline.patch diff --git a/sys-block/zram-init/zram-init-7.1.ebuild b/sys-block/zram-init/zram-init-7.1.ebuild index 5c6ccc55..723c1285 100644 --- a/sys-block/zram-init/zram-init-7.1.ebuild +++ b/sys-block/zram-init/zram-init-7.1.ebuild @@ -27,7 +27,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- sbin/* || die - eapply_user + default } src_install() { diff --git a/sys-boot/grub-cfg-mv/grub-cfg-mv-1.5.ebuild b/sys-boot/grub-cfg-mv/grub-cfg-mv-1.5.ebuild index 580314ac..1c91a9b5 100644 --- a/sys-boot/grub-cfg-mv/grub-cfg-mv-1.5.ebuild +++ b/sys-boot/grub-cfg-mv/grub-cfg-mv-1.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2016-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="A grub.cfg library/example for GRUB2" diff --git a/sys-fs/emount/emount-3.0.4.ebuild b/sys-fs/emount/emount-3.0.4.ebuild index f5e243f8..d4173199 100644 --- a/sys-fs/emount/emount-3.0.4.ebuild +++ b/sys-fs/emount/emount-3.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" DESCRIPTION="mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab" @@ -27,7 +27,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-fs/squash_dir/squash_dir-13.14.ebuild b/sys-fs/squash_dir/squash_dir-13.14.ebuild index 1a7fa926..38f7c0b1 100644 --- a/sys-fs/squash_dir/squash_dir-13.14.ebuild +++ b/sys-fs/squash_dir/squash_dir-13.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,7 +50,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* sbin/* || die fi - eapply_user + default eautoreconf } diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild index 81dc0801..20af011d 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171129-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs LIVE=false @@ -69,7 +69,7 @@ src_prepare() { eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch eapply "${FILESDIR}"/${Pm}-static-inline.patch - eapply_user + default } use10() { diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild index f628b34e..20af011d 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-99999999-r1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs LIVE=false @@ -60,7 +60,7 @@ fi src_prepare() { local debian - debian="${WORKDIR}"/debian/patches/ + debian="${WORKDIR}"/debian/patches eapply -p2 "${debian}"/0001-kfreebsd.patch eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch @@ -69,7 +69,7 @@ src_prepare() { eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch eapply "${FILESDIR}"/${Pm}-static-inline.patch - eapply_user + default } use10() { diff --git a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild index 9fe394d6..23ba3c41 100644 --- a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild +++ b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit autotools flag-o-matic diff --git a/sys-fs/squashmount/squashmount-16.1.0.ebuild b/sys-fs/squashmount/squashmount-16.1.0.ebuild index 2e495b03..f1e8cc53 100644 --- a/sys-fs/squashmount/squashmount-16.1.0.ebuild +++ b/sys-fs/squashmount/squashmount-16.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2013-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -51,7 +51,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-fs/squashmount/squashmount-19.0.2.ebuild b/sys-fs/squashmount/squashmount-19.0.2.ebuild index ed29c56f..00db3927 100644 --- a/sys-fs/squashmount/squashmount-19.0.2.ebuild +++ b/sys-fs/squashmount/squashmount-19.0.2.ebuild @@ -51,7 +51,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild b/sys-kernel/kccmp/kccmp-0.3-r1.ebuild index e9801be8..9a226091 100644 --- a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild +++ b/sys-kernel/kccmp/kccmp-0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit qmake-utils DESCRIPTION="A simple tool for comparing two linux kernel .config files" diff --git a/sys-kernel/kernel/kernel-4.5.ebuild b/sys-kernel/kernel/kernel-4.5.ebuild index c3a81070..b41b5281 100644 --- a/sys-kernel/kernel/kernel-4.5.ebuild +++ b/sys-kernel/kernel/kernel-4.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 RESTRICT="mirror" inherit eutils @@ -29,7 +29,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - eapply_user + default } src_install() { diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild index 6c930d02..625fbed8 100644 --- a/sys-power/nut/nut-2.7.4-r1.ebuild +++ b/sys-power/nut/nut-2.7.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -106,7 +106,7 @@ src_prepare() { -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \ lib/libupsclient{.pc,-config}.in || die #361685 - eapply_user + default eautoreconf } diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild index 93ad3069..e61568ba 100644 --- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild +++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild @@ -1,11 +1,15 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="A virtual to choose between different icon themes" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="" +LICENSE="" +HOMEPAGE="" +IUSE="" # Compared to the gentoo repository, we add: # hicolor-icon-theme (which is needed for gimp anyway) diff --git a/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild b/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild index 0ebfc574..9baa38a2 100644 --- a/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild +++ b/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/calc-extension/calc-extension-5.1.ebuild b/www-plugins/calc-extension/calc-extension-5.1.ebuild index 4b95176c..72c663d6 100644 --- a/www-plugins/calc-extension/calc-extension-5.1.ebuild +++ b/www-plugins/calc-extension/calc-extension-5.1.ebuild @@ -1,7 +1,7 @@ # Copyright 2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/canvasblocker/canvasblocker-0.4.4b.ebuild b/www-plugins/canvasblocker/canvasblocker-0.4.4b.ebuild index c4eda356..56af66a8 100644 --- a/www-plugins/canvasblocker/canvasblocker-0.4.4b.ebuild +++ b/www-plugins/canvasblocker/canvasblocker-0.4.4b.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/dark-mode/dark-mode-0.2.3.ebuild b/www-plugins/dark-mode/dark-mode-0.2.3.ebuild index e4c12eaa..70d26b40 100644 --- a/www-plugins/dark-mode/dark-mode-0.2.3.ebuild +++ b/www-plugins/dark-mode/dark-mode-0.2.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit mv_mozextension-r1 readme.gentoo-r1 +EAPI=7 +inherit mv_mozextension-r1 RESTRICT="mirror" DESCRIPTION="Firefox webextension: a global dark theme for the web" diff --git a/www-plugins/decentraleyes/decentraleyes-2.0.3.ebuild b/www-plugins/decentraleyes/decentraleyes-2.0.3.ebuild index 20b21e20..7ec14903 100644 --- a/www-plugins/decentraleyes/decentraleyes-2.0.3.ebuild +++ b/www-plugins/decentraleyes/decentraleyes-2.0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/duckduckgo/duckduckgo-2018.4.20.ebuild b/www-plugins/duckduckgo/duckduckgo-2018.4.20.ebuild index 45841951..14cc2fd1 100644 --- a/www-plugins/duckduckgo/duckduckgo-2018.4.20.ebuild +++ b/www-plugins/duckduckgo/duckduckgo-2018.4.20.ebuild @@ -1,7 +1,7 @@ # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild b/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild index 60c4f11b..8d010805 100644 --- a/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild +++ b/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2014-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/form-history-control/form-history-control-2.0.3.2.ebuild b/www-plugins/form-history-control/form-history-control-2.0.3.2.ebuild index ab67426e..4d6e5477 100644 --- a/www-plugins/form-history-control/form-history-control-2.0.3.2.ebuild +++ b/www-plugins/form-history-control/form-history-control-2.0.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/google-translation/google-translation-2.6.ebuild b/www-plugins/google-translation/google-translation-2.6.ebuild index d951a5d6..cdc6f619 100644 --- a/www-plugins/google-translation/google-translation-2.6.ebuild +++ b/www-plugins/google-translation/google-translation-2.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/https-everywhere/https-everywhere-2018.4.11.ebuild b/www-plugins/https-everywhere/https-everywhere-2018.4.11.ebuild index c9b56b7c..3431fde7 100644 --- a/www-plugins/https-everywhere/https-everywhere-2018.4.11.ebuild +++ b/www-plugins/https-everywhere/https-everywhere-2018.4.11.ebuild @@ -1,7 +1,7 @@ # Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/no-color/no-color-0.9.4.ebuild b/www-plugins/no-color/no-color-0.9.4.ebuild index 64901e0c..8556c0a2 100644 --- a/www-plugins/no-color/no-color-0.9.4.ebuild +++ b/www-plugins/no-color/no-color-0.9.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/noscript/noscript-10.1.7.2.ebuild b/www-plugins/noscript/noscript-10.1.7.2.ebuild index d4f7d8fb..79ed5f74 100644 --- a/www-plugins/noscript/noscript-10.1.7.2.ebuild +++ b/www-plugins/noscript/noscript-10.1.7.2.ebuild @@ -1,7 +1,7 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/noscript/noscript-10.1.7.5.ebuild b/www-plugins/noscript/noscript-10.1.7.5.ebuild index 562f4e10..712bee2c 100644 --- a/www-plugins/noscript/noscript-10.1.7.5.ebuild +++ b/www-plugins/noscript/noscript-10.1.7.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/open-in-google-translate/open-in-google-translate-0.1.3.ebuild b/www-plugins/open-in-google-translate/open-in-google-translate-0.1.3.ebuild index cbeabf8d..3cd8a18c 100644 --- a/www-plugins/open-in-google-translate/open-in-google-translate-0.1.3.ebuild +++ b/www-plugins/open-in-google-translate/open-in-google-translate-0.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild b/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild index 9f0728c0..15cfc5ec 100644 --- a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild +++ b/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild b/www-plugins/translate-to-me/translate-to-me-1.1.ebuild index f9032298..d7adc810 100644 --- a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild +++ b/www-plugins/translate-to-me/translate-to-me-1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/www-plugins/ublock-origin/ublock-origin-1.16.0.ebuild b/www-plugins/ublock-origin/ublock-origin-1.16.0.ebuild index 2930375e..7aa47f6a 100644 --- a/www-plugins/ublock-origin/ublock-origin-1.16.0.ebuild +++ b/www-plugins/ublock-origin/ublock-origin-1.16.0.ebuild @@ -1,7 +1,7 @@ # Copyright 2017-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit mv_mozextension-r1 RESTRICT="mirror" diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild index 93f891f5..3964d1cc 100644 --- a/x11-libs/gtk+/gtk+-2.24.32.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild @@ -9,7 +9,7 @@ inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 vi DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" +SRC_URI=${SRC_URI}" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="LGPL-2+" SLOT="2" diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild index f91996cc..61faaa0e 100644 --- a/x11-libs/gtk+/gtk+-3.22.30.ebuild +++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild @@ -8,6 +8,7 @@ inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" +SRC_URI=${SRC_URI} LICENSE="LGPL-2+" SLOT="3" diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild index 0e8a8d09..9b93a483 100644 --- a/x11-libs/motif/motif-2.3.8-r1.ebuild +++ b/x11-libs/motif/motif-2.3.8-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal @@ -28,15 +28,15 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - sys-devel/flex +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/flex || ( sys-devel/bison dev-util/byacc sys-freebsd/freebsd-ubin ) x11-base/xorg-proto x11-misc/xbitmaps" src_prepare() { eapply ../patch - eapply_user + default # disable compilation of demo binaries sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am diff --git a/x11-wm/fvwm/fvwm-2.6.7-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.7-r1.ebuild index bbbc27a8..82806bca 100644 --- a/x11-wm/fvwm/fvwm-2.6.7-r1.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" @@ -42,7 +42,6 @@ COMMON_DEPEND=" x11-libs/libXft ) xinerama? ( - x11-proto/xineramaproto x11-libs/libXinerama ) " @@ -60,11 +59,10 @@ RDEPEND="${COMMON_DEPEND} userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) ) " -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig +DEPEND="${COMMON_DEPEND}" +BDEPEND="virtual/pkgconfig doc? ( dev-libs/libxslt ) - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " DOCS=( NEWS ) @@ -79,7 +77,7 @@ src_prepare() { fi eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - eapply_user + default eautoreconf } |