diff options
59 files changed, 131 insertions, 230 deletions
diff --git a/app-admin/checksec/checksec-1.5.ebuild b/app-admin/checksec/checksec-1.5.ebuild index 45c465f9..45cbb7b3 100644 --- a/app-admin/checksec/checksec-1.5.ebuild +++ b/app-admin/checksec/checksec-1.5.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="Check for hardened protections like RELRO, NoExec, Stack protection, ASLR, PIE" HOMEPAGE="http://www.trapkit.de/tools/checksec.html" @@ -16,10 +15,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" S="${WORKDIR}" -src_prepare() { - epatch_user -} - src_install() { newbin "${DISTDIR}/${P}.sh" "${PN}" insinto /usr/share/zsh/site-functions diff --git a/app-admin/sudox/sudox-3.20.ebuild b/app-admin/sudox/sudox-3.20.ebuild index e923996a..256ff7e5 100644 --- a/app-admin/sudox/sudox-3.20.ebuild +++ b/app-admin/sudox/sudox-3.20.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="sudox is a wrapper for sudo which can pass X authority data and deal with screen and tmux" HOMEPAGE="https://github.com/vaeth/sudox/" @@ -18,10 +17,6 @@ RDEPEND="app-admin/sudo app-shells/push" DEPEND="" -src_prepare() { - epatch_user -} - src_install() { dobin "${PN}" insinto /usr/share/zsh/site-functions diff --git a/app-arch/archwrap/archwrap-2.0.ebuild b/app-arch/archwrap/archwrap-2.0.ebuild index 530af13f..407cddef 100644 --- a/app-arch/archwrap/archwrap-2.0.ebuild +++ b/app-arch/archwrap/archwrap-2.0.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="A collection of POSIX shell scripts to invoke archiver programs" HOMEPAGE="https://github.com/vaeth/archwrap/" @@ -25,7 +24,7 @@ src_prepare() { -e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/share/archwrap/archwrap.sh"'"' \ -- "${i}" || die done - epatch_user + eapply_user } src_install() { diff --git a/app-arch/bzwc/bzwc-2.18.ebuild b/app-arch/bzwc/bzwc-2.18.ebuild index e2227818..821d6668 100644 --- a/app-arch/bzwc/bzwc-2.18.ebuild +++ b/app-arch/bzwc/bzwc-2.18.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)" HOMEPAGE="https://github.com/vaeth/bzwc/" @@ -24,7 +23,7 @@ src_prepare() { sed -i -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' -- "${i}" \ || die done - epatch_user + eapply_user } src_install() { 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 b97fbcd2..8bfe4f05 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's The Britannica Concise Encyclopedia" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 b3d00897..1525aaa1 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's Collins Cobuild English Dictionary" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 08a3e17f..a0451573 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's Longman Dictionary of Contemporary English" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 219903fe..dfc62446 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's Merrian Webster 10th dictionary" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 cfa4f341..b1250c77 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's Oxford Advanced Learner's Dictionary" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 bdf0b458..1b69f1d0 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 @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DICT_PREFIX="" -inherit eutils stardict +inherit stardict RESTRICT="mirror" DESCRIPTION="Stardict Dictionary for Dictd.org's English Thesaurus" @@ -12,7 +12,3 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 339e2a56..6ccfbc4d 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 @@ -2,17 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 FROM_LANG="German" TO_LANG="English" DICT_PREFIX="dictd_www.freedict.de_" -inherit eutils stardict +inherit stardict RESTRICT="mirror" HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 61c203aa..75d1b9c2 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 @@ -2,17 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 FROM_LANG="German" TO_LANG="Italian" DICT_PREFIX="dictd_www.freedict.de_" -inherit eutils stardict +inherit stardict RESTRICT="mirror" HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} 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 29c121f2..6ecb80fd 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 @@ -2,17 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 FROM_LANG="Italian" TO_LANG="German" DICT_PREFIX="dictd_www.freedict.de_" -inherit eutils stardict +inherit stardict RESTRICT="mirror" HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php" KEYWORDS="~amd64 ~x86" IUSE="" - -src_prepare() { - epatch_user -} diff --git a/app-emacs/mv_emacs/mv_emacs-1.2.ebuild b/app-emacs/mv_emacs/mv_emacs-1.2.ebuild index f3fd39a7..e85c99bd 100644 --- a/app-emacs/mv_emacs/mv_emacs-1.2.ebuild +++ b/app-emacs/mv_emacs/mv_emacs-1.2.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit elisp-common eutils +inherit elisp-common DESCRIPTION="(X)Emacs extensions: block support, macrorecorder, verify change" HOMEPAGE="https://github.com/vaeth/mv_emacs/" @@ -28,10 +28,6 @@ src_unpack() { EOF } -src_prepare() { - epatch_user -} - src_compile() { elisp-make-autoload-file || die elisp-compile *.el || die diff --git a/app-portage/find_cruft/find_cruft-3.0.7.ebuild b/app-portage/find_cruft/find_cruft-3.0.7.ebuild index 6d7ca106..30a83d5d 100644 --- a/app-portage/find_cruft/find_cruft-3.0.7.ebuild +++ b/app-portage/find_cruft/find_cruft-3.0.7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -23,7 +23,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - epatch_user + eapply_user } src_install() { diff --git a/app-portage/logclean/logclean-9.8-r1.ebuild b/app-portage/logclean/logclean-9.8-r1.ebuild index e04173b4..87450953 100644 --- a/app-portage/logclean/logclean-9.8-r1.ebuild +++ b/app-portage/logclean/logclean-9.8-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -23,7 +23,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- "${PN}" || die - epatch_user + eapply_user } src_install() { diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild index a112f8df..92a7c7f1 100644 --- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild +++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -16,10 +16,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="!<dev-util/ccache-3.2" -src_prepare() { - epatch_user -} - src_install() { dodoc NEWS README exeinto "/usr/share/doc/${PF}" diff --git a/app-portage/trickyfetch/trickyfetch-8.7.ebuild b/app-portage/trickyfetch/trickyfetch-8.7.ebuild index 1a58aab1..1873a142 100644 --- a/app-portage/trickyfetch/trickyfetch-8.7.ebuild +++ b/app-portage/trickyfetch/trickyfetch-8.7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -24,7 +24,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${S}"/bin/* || die fi - epatch_user + eapply_user } src_install() { diff --git a/app-portage/useflags/useflags-3.4.ebuild b/app-portage/useflags/useflags-3.4.ebuild index 2d4a2bf7..9ba268be 100644 --- a/app-portage/useflags/useflags-3.4.ebuild +++ b/app-portage/useflags/useflags-3.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -22,7 +22,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- "${PN}" || die - epatch_user + eapply_user } src_install() { diff --git a/app-portage/world-mv/world-mv-3.14.ebuild b/app-portage/world-mv/world-mv-3.14.ebuild index d1eff415..d39d92a9 100644 --- a/app-portage/world-mv/world-mv-3.14.ebuild +++ b/app-portage/world-mv/world-mv-3.14.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils mPN="${PN%-*}" DESCRIPTION="Organize your world file and find installed packages or differences to @world" @@ -27,7 +26,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${mPN}" || die fi - epatch_user + eapply_user } src_install() { 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 feb8d9bb..ba681293 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 @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils +EAPI=6 pPN=${PN%-zsh} mPN="${pPN}.zsh" @@ -105,13 +104,13 @@ src_prepare() { if ! ${LIVE} then # Make Ctrl-D return correctly. - epatch "${FILESDIR}"/exit.patch + eapply "${FILESDIR}"/exit.patch # Reset color with "return": - epatch "${FILESDIR}"/reset-color.patch + eapply "${FILESDIR}"/reset-color.patch # Make it work with older zsh versions: - epatch "${FILESDIR}"/zsh-compatibility.patch + eapply "${FILESDIR}"/zsh-compatibility.patch fi - epatch_user + eapply_user } 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 feb8d9bb..ba681293 100644 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils +EAPI=6 pPN=${PN%-zsh} mPN="${pPN}.zsh" @@ -105,13 +104,13 @@ src_prepare() { if ! ${LIVE} then # Make Ctrl-D return correctly. - epatch "${FILESDIR}"/exit.patch + eapply "${FILESDIR}"/exit.patch # Reset color with "return": - epatch "${FILESDIR}"/reset-color.patch + eapply "${FILESDIR}"/reset-color.patch # Make it work with older zsh versions: - epatch "${FILESDIR}"/zsh-compatibility.patch + eapply "${FILESDIR}"/zsh-compatibility.patch fi - epatch_user + eapply_user } src_compile() { diff --git a/app-shells/runtitle/runtitle-2.7.ebuild b/app-shells/runtitle/runtitle-2.7.ebuild index 71ebe8a4..59598f45 100644 --- a/app-shells/runtitle/runtitle-2.7.ebuild +++ b/app-shells/runtitle/runtitle-2.7.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="Scripts to run commands and set the hard status line (windows title)" HOMEPAGE="https://github.com/vaeth/runtitle/" @@ -19,7 +18,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - epatch_user + eapply_user } src_install() { diff --git a/app-shells/set_prompt/set_prompt-1.23.ebuild b/app-shells/set_prompt/set_prompt-1.23.ebuild index 94a9288d..42a8e326 100644 --- a/app-shells/set_prompt/set_prompt-1.23.ebuild +++ b/app-shells/set_prompt/set_prompt-1.23.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="An intelligent prompt for zsh or bash with status line (window title) support" HOMEPAGE="https://github.com/vaeth/set_prompt/" @@ -20,7 +19,7 @@ src_prepare() { -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \ -e '1s"^#!/usr/bin/env zsh$"#!'"${EPREFIX}"'/bin/zsh"' \ -- * || die - epatch_user + eapply_user } src_install() { diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild index 351b7e58..8a0f58e4 100644 --- a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild +++ b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils +EAPI=6 case ${PV} in 99999999*) @@ -15,7 +14,7 @@ case ${PV} in SRC_URI="";; *) LIVE=false - RESTRICT="mirror" + #RESTRICT="mirror" TARBALL_VERSION='0.12.0' SRC_URI="https://github.com/zsh-users/${PN}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -39,11 +38,11 @@ USEFILE=() FILEINDEX=() used_value() { case ${!1} in - '*'*) - eval ${1}=\${${1}#?} + '#'*) + eval "${1}=\${${1}#?}" ${LIVE};; '/'*) - eval ${1}=\${${1}#?} + eval "${1}=\${${1}#?}" ! ${LIVE};; esac } @@ -82,8 +81,8 @@ calculate_data \ '+filesystem _zfs' \ '+git _git-flow _git-pulls' \ '+hardware _optirun _perf _primus' \ - '+haskell _cabal _ghc *_stack' \ - '+managers *_ansible *_ansible-galaxy *_ansible-playbook _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \ + '+haskell _cabal _ghc #_stack' \ + '+managers #_ansible #_ansible-galaxy #_ansible-playbook _bower _brew #_cask _debuild _lein _pactree _pkcon _port _yaourt' \ '+multimedia _id3 _id3v2 _showoff' \ '+net _dget _dhcpcd _httpie _iw _mosh _rfkill _socat _ssh-copy-id _vpnc _vnstat' \ '+nfs _exportfs' \ @@ -93,8 +92,8 @@ calculate_data \ '+search _ack _ag _jq' \ '+session _atach _teamocil _tmuxinator _wemux' \ '+subtitles _language_codes _periscope _subliminal' \ - '+virtualization _boot2docker *_docker-compose *_docker-machine _virtualbox _virsh' \ - '+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio *_salt _sbt _scala _svm' + '+virtualization _boot2docker #_docker-compose #_docker-machine _virtualbox _virsh' \ + '+web _coffee _composer _docpad _drush _heroku #_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio /_salt _sbt _scala _svm' src_prepare() { # Remove colliding completions @@ -102,7 +101,7 @@ src_prepare() { then mv src/_docker . || eerror "mv failed" else mv src/_docker src/_pip . || die fi - epatch_user + eapply_user } src_install() { diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild index 351b7e58..8a0f58e4 100644 --- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild +++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils +EAPI=6 case ${PV} in 99999999*) @@ -15,7 +14,7 @@ case ${PV} in SRC_URI="";; *) LIVE=false - RESTRICT="mirror" + #RESTRICT="mirror" TARBALL_VERSION='0.12.0' SRC_URI="https://github.com/zsh-users/${PN}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -39,11 +38,11 @@ USEFILE=() FILEINDEX=() used_value() { case ${!1} in - '*'*) - eval ${1}=\${${1}#?} + '#'*) + eval "${1}=\${${1}#?}" ${LIVE};; '/'*) - eval ${1}=\${${1}#?} + eval "${1}=\${${1}#?}" ! ${LIVE};; esac } @@ -82,8 +81,8 @@ calculate_data \ '+filesystem _zfs' \ '+git _git-flow _git-pulls' \ '+hardware _optirun _perf _primus' \ - '+haskell _cabal _ghc *_stack' \ - '+managers *_ansible *_ansible-galaxy *_ansible-playbook _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \ + '+haskell _cabal _ghc #_stack' \ + '+managers #_ansible #_ansible-galaxy #_ansible-playbook _bower _brew #_cask _debuild _lein _pactree _pkcon _port _yaourt' \ '+multimedia _id3 _id3v2 _showoff' \ '+net _dget _dhcpcd _httpie _iw _mosh _rfkill _socat _ssh-copy-id _vpnc _vnstat' \ '+nfs _exportfs' \ @@ -93,8 +92,8 @@ calculate_data \ '+search _ack _ag _jq' \ '+session _atach _teamocil _tmuxinator _wemux' \ '+subtitles _language_codes _periscope _subliminal' \ - '+virtualization _boot2docker *_docker-compose *_docker-machine _virtualbox _virsh' \ - '+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio *_salt _sbt _scala _svm' + '+virtualization _boot2docker #_docker-compose #_docker-machine _virtualbox _virsh' \ + '+web _coffee _composer _docpad _drush _heroku #_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio /_salt _sbt _scala _svm' src_prepare() { # Remove colliding completions @@ -102,7 +101,7 @@ src_prepare() { then mv src/_docker . || eerror "mv failed" else mv src/_docker src/_pip . || die fi - epatch_user + eapply_user } src_install() { diff --git a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild index 6f08fdd9..41952656 100644 --- a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild +++ b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -16,10 +16,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]" -src_prepare() { - epatch_user -} - src_install() { dodoc README insinto /etc/zsh diff --git a/app-text/psjoin/psjoin-0.3.ebuild b/app-text/psjoin/psjoin-0.3.ebuild index a8efb2ac..381c8283 100644 --- a/app-text/psjoin/psjoin-0.3.ebuild +++ b/app-text/psjoin/psjoin-0.3.ebuild @@ -2,11 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils - DESCRIPTION="concatenate postscript files. From new PostScript Utilities" HOMEPAGE="http://homepage3.nifty.com/tsato/tools/psjoin.html" SRC_URI="http://homepage3.nifty.com/tsato/tools/${PN} -> ${P}" @@ -25,10 +23,6 @@ src_unpack() { cp -p -- "${DISTDIR}/${P}" "${S}/${PN}" } -src_prepare() { - epatch_user -} - src_install() { dobin "${PN}" } diff --git a/dev-util/diffhelp/diffhelp-1.9.ebuild b/dev-util/diffhelp/diffhelp-1.9.ebuild index f3539c9c..195c0363 100644 --- a/dev-util/diffhelp/diffhelp-1.9.ebuild +++ b/dev-util/diffhelp/diffhelp-1.9.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="A frontend, beautifier, and path-fixer for diff -u" HOMEPAGE="https://github.com/vaeth/diffhelp/" @@ -19,7 +18,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${PN}" || die - epatch_user + eapply_user } src_install() { diff --git a/dev-util/mv_perl/mv_perl-2.49.ebuild b/dev-util/mv_perl/mv_perl-2.49.ebuild index 83f2adcd..9df82b3a 100644 --- a/dev-util/mv_perl/mv_perl-2.49.ebuild +++ b/dev-util/mv_perl/mv_perl-2.49.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -21,10 +21,6 @@ RDEPEND=">=dev-lang/perl-5.12" # || ( >=dev-lang/perl-5.7.3 virtual/perl-Digest-MD5 ) # || ( >=dev-lang/perl-5.7.3 virtual/perl-Time-HiRes ) -src_prepare() { - epatch_user -} - src_install() { dobin bin/* dodoc README diff --git a/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild b/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild index 068b1bdc..2b1c4568 100644 --- a/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild +++ b/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 # Do *not* inherit latex-package: It DEPENDS unconditionally on texinfo. # Moreover, it would attempt to compile the *.tex example with texinfo to dvi. -inherit eutils RESTRICT="mirror" DESCRIPTION="LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)" diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild index fd1eead1..8018da09 100644 --- a/games-rpg/magus/magus-1.3.1.ebuild +++ b/games-rpg/magus/magus-1.3.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils flag-o-matic RESTRICT="mirror" @@ -180,7 +180,7 @@ my_autoreconf() { src_prepare() { local i src_patch - epatch_user + eapply_user set_browser einfo einfo "Calling eautoreconf for all subprojects:" diff --git a/games-rpg/magus/magus-1.3.3.ebuild b/games-rpg/magus/magus-1.3.3.ebuild index fd1eead1..8018da09 100644 --- a/games-rpg/magus/magus-1.3.3.ebuild +++ b/games-rpg/magus/magus-1.3.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils flag-o-matic RESTRICT="mirror" @@ -180,7 +180,7 @@ my_autoreconf() { src_prepare() { local i src_patch - epatch_user + eapply_user set_browser einfo einfo "Calling eautoreconf for all subprojects:" diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild index fd1eead1..8018da09 100644 --- a/games-rpg/magus/magus-99999999.ebuild +++ b/games-rpg/magus/magus-99999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils flag-o-matic RESTRICT="mirror" @@ -180,7 +180,7 @@ my_autoreconf() { src_prepare() { local i src_patch - epatch_user + eapply_user set_browser einfo einfo "Calling eautoreconf for all subprojects:" diff --git a/media-gfx/pqiv/pqiv-2.2.ebuild b/media-gfx/pqiv/pqiv-2.2.ebuild index 31a0a5ca..48322785 100644 --- a/media-gfx/pqiv/pqiv-2.2.ebuild +++ b/media-gfx/pqiv/pqiv-2.2.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit linux-info toolchain-funcs eutils +EAPI=6 +inherit linux-info toolchain-funcs DESCRIPTION="Modern rewrite of Quick Image Viewer" HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/" @@ -28,10 +28,6 @@ pkg_setup() { fi } -src_prepare() { - epatch_user -} - src_configure() { local gtkver=3 ! use gtk2 || gtkver=2 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 91d88aad..72bcf43b 100644 --- a/net-dialup/accounting/accounting-1.60.45.3.1.ebuild +++ b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils rpm toolchain-funcs +EAPI=6 +inherit rpm toolchain-funcs RESTRICT="mirror" MY_PN="smpppd" @@ -28,7 +28,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -test -z "${ACCOUNTING_LOG}" && ACCOUNTING_LOG="/var/log/accounting.log" +: ${ACCOUNTING_LOG:="/var/log/accounting.log"} DEPEND=">=net-dialup/ppp-2.4.4-r13" RDEPEND="${DEPEND}" @@ -42,7 +42,7 @@ src_prepare() { "${CDIR}"/defines.h sed -i -e's!/var/log/[^.]*\.log!'"${ACCOUNTING_LOG}"'!' \ "${DDIR}"/accounting.1 - epatch_user + eapply_user } src_configure() { diff --git a/net-misc/sshstart/sshstart-2.15.ebuild b/net-misc/sshstart/sshstart-2.15.ebuild index a12d6f9f..df0bb8bc 100644 --- a/net-misc/sshstart/sshstart-2.15.ebuild +++ b/net-misc/sshstart/sshstart-2.15.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="Start ssh-agent/ssh-add only if you really use ssh or friends" HOMEPAGE="https://github.com/vaeth/sshstart/" @@ -22,7 +21,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${PN}" || die - epatch_user + eapply_user } src_install() { diff --git a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild index ec664b77..e25edb99 100644 --- a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild +++ b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils +EAPI=6 DESCRIPTION="Support for printing to ZjStream-based printers. Fixes bug 271079" HOMEPAGE="http://foo2zjs.rkkda.com/" @@ -82,11 +81,7 @@ RDEPEND="cups? ( net-print/cups ) KEYWORDS="~x86 ~amd64 ~ppc" S="${WORKDIR}/${PN}" -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-udevfwld.patch - epatch_user -} +PATCHES=("${FILESDIR}"/${P}-Makefile.patch "${FILESDIR}"/${P}-udevfwld.patch) src_unpack() { unpack ${P}.tar.gz diff --git a/sci-mathematics/reduce/reduce-20141130-r1.ebuild b/sci-mathematics/reduce/reduce-20141130-r1.ebuild index 80f9ed9e..6cc8bbfd 100644 --- a/sci-mathematics/reduce/reduce-20141130-r1.ebuild +++ b/sci-mathematics/reduce/reduce-20141130-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit elisp-common eutils multilib +inherit elisp-common DESCRIPTION="A general-purpose computer algebra system" HOMEPAGE="http://reduce-algebra.sourceforge.net/ @@ -32,7 +32,7 @@ DEPEND="${RDEPEND}" src_prepare() { sed -i -e '2iecho gentoo; exit' -- "${S}"/scripts/findos.sh # sed -i -e 's/\${l}/"\${l}"/g' -- "${S}"/scripts/make.sh - epatch_user + eapply_user } src_configure() { diff --git a/sys-apps/cpi/cpi-2.10.ebuild b/sys-apps/cpi/cpi-2.10.ebuild index 736a1051..e951bc0e 100644 --- a/sys-apps/cpi/cpi-2.10.ebuild +++ b/sys-apps/cpi/cpi-2.10.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="A wrapper for cp -i -a, making use of diff" HOMEPAGE="https://github.com/vaeth/cpi/" @@ -19,7 +18,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/cpi || die - epatch_user + eapply_user } src_install() { diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild index ddbb26ff..016751e2 100644 --- a/sys-apps/less/less-481.ebuild +++ b/sys-apps/less/less-481.ebuild @@ -2,9 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 - -inherit eutils +EAPI=6 CODE2COLOR_PV="0.2" CODE2COLOR_P="code2color-${CODE2COLOR_PV}" @@ -50,14 +48,14 @@ src_unpack() { src_prepare() { if use less-select - then epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die + then eapply "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" "${SELECTDIR}"/after-patch || die "${SELECTDIR}/after-patch failed" sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX}"'/etc/less/select-key.bin|g' \ "${SELECTDIR}/bin/less-select" || die fi - epatch "${FILESDIR}/${CODE2COLOR_P}.patch" + eapply -p0 "${FILESDIR}/${CODE2COLOR_P}.patch" chmod a+x configure || die - epatch_user + eapply_user } src_configure() { diff --git a/sys-apps/lesspipe/lesspipe-1.83.ebuild b/sys-apps/lesspipe/lesspipe-1.83.ebuild index be9849e0..4826407d 100644 --- a/sys-apps/lesspipe/lesspipe-1.83.ebuild +++ b/sys-apps/lesspipe/lesspipe-1.83.ebuild @@ -2,11 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils - DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Append colon to filename to disable" HOMEPAGE="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" SRC_URI="http://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz" @@ -197,7 +195,7 @@ src_prepare() { use netcdf; ModifyX 'ncdump' ModifyEnd printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe - epatch_user + eapply_user } src_configure() { diff --git a/sys-apps/starter/starter-2.15.ebuild b/sys-apps/starter/starter-2.15.ebuild index eeeae225..8b6bc8eb 100644 --- a/sys-apps/starter/starter-2.15.ebuild +++ b/sys-apps/starter/starter-2.15.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="POSIX shell script and function to schedule commands" HOMEPAGE="https://github.com/vaeth/starter/" @@ -22,7 +21,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- bin/* || die - epatch_user + eapply_user } src_install() { diff --git a/sys-fs/aufs-util/aufs-util-99999999.ebuild b/sys-fs/aufs-util/aufs-util-99999999.ebuild index b4264e15..61073447 100644 --- a/sys-fs/aufs-util/aufs-util-99999999.ebuild +++ b/sys-fs/aufs-util/aufs-util-99999999.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git" EGIT_BRANCH="aufs3.9" -inherit eutils git-r3 linux-info multilib +inherit git-r3 linux-info DESCRIPTION="Userspace tools for aufs" HOMEPAGE="http://aufs.sourceforge.net/" @@ -38,5 +38,5 @@ src_prepare() { sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \ die "Patching ${i} failed" done - epatch_user + eapply_user } diff --git a/sys-fs/aufs/aufs-99999999.ebuild b/sys-fs/aufs/aufs-99999999.ebuild index f986d375..30f163f2 100644 --- a/sys-fs/aufs/aufs-99999999.ebuild +++ b/sys-fs/aufs/aufs-99999999.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git" EGIT_BRANCH="aufs3.0" -inherit eutils git-r3 linux-info +inherit git-r3 linux-info DESCRIPTION="An entirely re-designed and re-implemented Unionfs" HOMEPAGE="http://aufs.sourceforge.net/" @@ -125,7 +125,7 @@ pkg_setup() { src_prepare() { local i j w v newest all - epatch_user + eapply_user all="2.2.0 2.2.1 2.2.2 2.2.2.r1 2.9.1" newest=${all##* } v= diff --git a/sys-fs/emount/emount-2.8.3.ebuild b/sys-fs/emount/emount-2.8.3.ebuild index eb56318c..85048821 100644 --- a/sys-fs/emount/emount-2.8.3.ebuild +++ b/sys-fs/emount/emount-2.8.3.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" -inherit eutils DESCRIPTION="mount/unmount (and create/remove) dm-crypt filesystems according to your /etc/fstab" HOMEPAGE="https://github.com/vaeth/emount/" @@ -24,7 +23,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \ -- bin/* || die - epatch_user + eapply_user } src_install() { diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch index c4fe57de..e0e9854c 100644 --- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch +++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch @@ -1,5 +1,5 @@ ---- 1/squashfs-tools/mksquashfs.c -+++ 1/squashfs-tools/mksquashfs.c +--- 1/mksquashfs.c ++++ 1/mksquashfs.c @@ -78,6 +78,7 @@ #include "process_fragments.h" diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild index 7703390b..39a9826d 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs +EAPI=6 +inherit flag-o-matic toolchain-funcs DESCRIPTION="Tool for creating compressed filesystem type squashfs. Patched to support -quiet" HOMEPAGE="http://squashfs.sourceforge.net" @@ -27,10 +27,7 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/squashfs${PV}/${PN}" -src_prepare() { - epatch "${FILESDIR}/${P}-quiet.patch" - epatch_user -} +PATCHES=("${FILESDIR}/${P}-quiet.patch") src_configure() { # set up make command line variables in EMAKE_SQUASHFS_CONF diff --git a/sys-kernel/kernel/kernel-1.41.ebuild b/sys-kernel/kernel/kernel-1.41.ebuild index 528ac75e..95ddacf9 100644 --- a/sys-kernel/kernel/kernel-1.41.ebuild +++ b/sys-kernel/kernel/kernel-1.41.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 RESTRICT="mirror" inherit eutils @@ -25,7 +25,7 @@ src_prepare() { use prefix || sed -i \ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ -- "${PN}" || die - epatch_user + eapply_user } src_install() { diff --git a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.2.ebuild b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.2.ebuild index 5d803dec..fcc396d9 100644 --- a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.2.ebuild +++ b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 MV_MOZ_MOZILLAS="firefox" inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild b/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild index ae803969..b5560970 100644 --- a/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild +++ b/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 MV_MOZ_MOZILLAS="firefox" inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild b/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild index bd6cffa2..f35f99d4 100644 --- a/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild +++ b/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild b/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild index bec8881a..fd87c6b1 100644 --- a/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild +++ b/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild b/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild index 25e85e97..ae52ec78 100644 --- a/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild +++ b/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/noscript/noscript-2.6.9.38.ebuild b/www-plugins/noscript/noscript-2.6.9.38.ebuild index d51ee087..0db665fa 100644 --- a/www-plugins/noscript/noscript-2.6.9.38.ebuild +++ b/www-plugins/noscript/noscript-2.6.9.38.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/noscript/noscript-2.6.9.39.ebuild b/www-plugins/noscript/noscript-2.6.9.39.ebuild index d51ee087..0db665fa 100644 --- a/www-plugins/noscript/noscript-2.6.9.39.ebuild +++ b/www-plugins/noscript/noscript-2.6.9.39.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild b/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild index 63d4ca17..516f8f74 100644 --- a/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild +++ b/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" diff --git a/www-plugins/shumway/shumway-0.11.394.ebuild b/www-plugins/shumway/shumway-0.11.394.ebuild index 211ca313..b956cfe6 100644 --- a/www-plugins/shumway/shumway-0.11.394.ebuild +++ b/www-plugins/shumway/shumway-0.11.394.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://github.com/mozilla/shumway.git" inherit mv_mozextension diff --git a/www-plugins/xclear/xclear-1.8-r2.ebuild b/www-plugins/xclear/xclear-1.8-r2.ebuild index 4aca66a8..0ae242b6 100644 --- a/www-plugins/xclear/xclear-1.8-r2.ebuild +++ b/www-plugins/xclear/xclear-1.8-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit mv_mozextension RESTRICT="mirror" |