diff options
Diffstat (limited to 'app-text/multitail')
| -rw-r--r-- | app-text/multitail/Manifest | 6 | ||||
| -rw-r--r-- | app-text/multitail/metadata.xml | 9 | ||||
| -rw-r--r-- | app-text/multitail/multitail-6.4.1.ebuild | 2 | ||||
| -rw-r--r-- | app-text/multitail/multitail-6.4.2.ebuild | 31 |
4 files changed, 23 insertions, 25 deletions
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index 42c23ecd1dff..e0dc1db804c2 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1,6 +1,6 @@ AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7 DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd -EBUILD multitail-6.4.1.ebuild 1279 BLAKE2B 03b0022e5d7c0e9ede138abe5393646feed9da09d7eb27ff9373d6c38b3b762ac45c37d05c60217c72373ece3dbb7a624b17090edec4a9c0964ae0b1e4f75392 SHA512 9fc8bc426de8522afc3f5d681ab2a3bfaba24ff25ef553fac1c55b193ff087644fabb08fabdc014d127d7c2b54a312d15905dbc16f25202a04113c620fe031e1 -EBUILD multitail-6.4.2.ebuild 1284 BLAKE2B c336442cad722e0aee03c97e43b3e9b4c51146afa4b704387f417c27cfd43459fea7ce5edad9058f319d4544c30af36c5b8ac973cab4990a19794708cea1d9bf SHA512 aacfeb85b96ff2a6b321019edf6427f61634bee087fa79103d2224424ef6f87bf1cd5a0181c886abca2f63eeade937d87feca9709b484dbe870b9c6cd60296d7 -MISC metadata.xml 272 BLAKE2B 609c633a45e8ff00773488f8866b7db5928c91bb7d81172a893fee6ac47f1125ddad1c15a59e3c337d57612112ab6c4731669e31ea4690c8097e6a4602019d5b SHA512 d36a244fa048a320eecd4da6ab2b4a65287a32ef24a253e028b5f95d4abeb7fd935b466cbe02f29a8e83d4c0cd3d1109de7c8d9b0799fa45273b0fb695bc37f7 +EBUILD multitail-6.4.1.ebuild 1297 BLAKE2B f42d72abd21ec2b2d5e8386dfe5915fabb73538a47dc353956788c3f86d6d7f05a27334dd0e6f94d1edcb48ea0e83d82034a517db67b7c543a83c01a84e6e38c SHA512 1b14d664c5cb2f4d17c96785c59f38655b2241a437e738a345bc479da37e3934441eabbea5deba077fba4b26f05e4e2e18b18843bfcb2f55e64943550cdadf96 +EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B 4cf3af57fc091bf6440061bafa203c549b873bfce4240d5088448b9a183d0e09fffc9ed00767179743cea2f75a95314393c8502a32d850a787f5c667f18c7b35 SHA512 f89a7611e0617a6ba204685ad7b358fd53c1fbec2a6ae9d5886359fe96de2f73b3cd6dbc4797171a0e5e5cefcf42b03074056f4861a6251dfbcff455f65d1187 +MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml index 183cf910aa3f..3cf14bf74636 100644 --- a/app-text/multitail/metadata.xml +++ b/app-text/multitail/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>shell-tools@gentoo.org</email> - <name>Gentoo Shell Tools Project</name> - </maintainer> + <maintainer type="project"> + <email>shell-tools@gentoo.org</email> + <name>Gentoo Shell Tools Project</name> + </maintainer> </pkgmetadata> - diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild index 4bf7e87f111d..9b88ebb4680e 100644 --- a/app-text/multitail/multitail-6.4.1.ebuild +++ b/app-text/multitail/multitail-6.4.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils flag-o-matic toolchain-funcs +inherit epatch eutils flag-o-matic optfeature toolchain-funcs DESCRIPTION="Tail with multiple windows" HOMEPAGE="http://www.vanheusden.com/multitail/" diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild index 819fc4d3e724..6fb9bf917d18 100644 --- a/app-text/multitail/multitail-6.4.2.ebuild +++ b/app-text/multitail/multitail-6.4.2.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs +EAPI=7 + +inherit flag-o-matic optfeature toolchain-funcs DESCRIPTION="Tail with multiple windows" HOMEPAGE="http://www.vanheusden.com/multitail/" @@ -10,33 +11,31 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" IUSE="debug examples unicode" +RESTRICT="test" # bug 492270 + +RDEPEND="sys-libs/ncurses:0=[unicode?]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -RDEPEND=" - sys-libs/ncurses:0=[unicode?] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -RESTRICT="test" # bug #492270 +PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch ) src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-6.4.1-gentoo.patch + default sed \ - -e "/^DESTDIR/s:=.*$:=${EROOT}:g" \ + -e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \ -i Makefile || die sed \ -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \ -i xclip.c ${PN}.conf || die +} +src_configure() { tc-export CC PKG_CONFIG - - use debug && append-flags "-D_DEBUG" + use debug && append-flags -D_DEBUG } src_compile() { |