summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-10 11:46:23 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-10 11:46:23 +0000
commit917648cfe2dd0a4a0eb79b4a45b0fbfd53e7f03d (patch)
tree31791ae96b099e2a84dd9243e842c15525a08ace
parent2022-07-10 11:36:46 UTC (diff)
parentapp-eselect/eselect-timidity: EAPI 8 (diff)
downloadgentoo-917648cfe2dd0a4a0eb79b4a45b0fbfd53e7f03d.tar.gz
gentoo-917648cfe2dd0a4a0eb79b4a45b0fbfd53e7f03d.tar.bz2
gentoo-917648cfe2dd0a4a0eb79b4a45b0fbfd53e7f03d.zip
Merge updates from master
-rw-r--r--app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild (renamed from app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild)10
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r2.ebuild (renamed from app-text/wdiff/wdiff-1.2.2-r1.ebuild)15
2 files changed, 14 insertions, 11 deletions
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
index d033658d49e8..885170c412e5 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Manages configuration of TiMidity++ patchsets"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
+SRC_URI="mirror://gentoo/timidity.eselect-${PV}.bz2"
+S="${WORKDIR}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
RDEPEND=">=app-admin/eselect-1.2.3"
-S="${WORKDIR}"
src_install() {
insinto /usr/share/eselect/modules
- newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect
+ newins "${WORKDIR}/timidity.eselect-${PV}" timidity.eselect
}
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f14..4418e21d3f05 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Create a diff disregarding formatting"
HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
RDEPEND="
sys-apps/diffutils
sys-apps/less
- sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+ sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/texinfo
- test? ( app-misc/screen )"
+ test? ( app-misc/screen )
+"
src_configure() {
- econf \
- $(use_enable experimental)
+ econf $(use_enable experimental)
}
src_test() {
@@ -31,5 +33,6 @@ src_test() {
# when an incompatible screenrc is found
touch tests/screenrc || die
export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
default
}