summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49998 -> 49990 bytes
-rw-r--r--sys-apps/ethtool/Manifest8
-rw-r--r--sys-apps/ethtool/ethtool-4.16.ebuild14
-rw-r--r--sys-apps/ethtool/ethtool-4.18.ebuild (renamed from sys-apps/ethtool/ethtool-4.15.ebuild)0
-rw-r--r--sys-apps/ethtool/ethtool-4.8.ebuild14
-rw-r--r--sys-apps/kexec-tools/Manifest2
-rw-r--r--sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch38
-rw-r--r--sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild86
-rw-r--r--sys-apps/man/Manifest2
-rw-r--r--sys-apps/man/man-1.6g-r1.ebuild10
10 files changed, 130 insertions, 44 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c9ca5585813e..669b6fdfb58d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index e476ebf17e40..52b73b56eb01 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,11 +1,7 @@
DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789
-DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
-DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
DIST ethtool-4.17.tar.xz 221516 BLAKE2B f2548b3cc89898024b884c94c2b6be110c39aac450f0f2e2bbf7b2e4908318d5110e6cfbc5f19073d0b930970ad768aad8549fb8bce432e14edd7a125084c9a0 SHA512 9c8f72e32c480ec4ece7ca49acb8af668989e1e32fb1e6b884bbb6f2ffefc2a5241b5f278766e51ab01772b4f7437d7556354583c5bb63fc59ac6daecb046e8e
-DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
+DIST ethtool-4.18.tar.xz 221708 BLAKE2B 8ec40fee81ffd2f1b27aafd30b062bb0afd86b653d9b9fb863c4b81dd97b21d8241f98554e4bb2956eaaa1b46067fd75415860e937fbf2adeeece17b652e8e2b SHA512 e77f9967be4634955640d9dccbc539455d333bcbad61326617dffea32cfd13a72a7dda4087caf6fff41b49c9ce476435cc1310e131705d0ad402685e10b4fb0e
EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
-EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
-EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
EBUILD ethtool-4.17.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
-EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
+EBUILD ethtool-4.18.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-4.16.ebuild b/sys-apps/ethtool/ethtool-4.16.ebuild
deleted file mode 100644
index 373b38775050..000000000000
--- a/sys-apps/ethtool/ethtool-4.16.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-4.15.ebuild b/sys-apps/ethtool/ethtool-4.18.ebuild
index 373b38775050..373b38775050 100644
--- a/sys-apps/ethtool/ethtool-4.15.ebuild
+++ b/sys-apps/ethtool/ethtool-4.18.ebuild
diff --git a/sys-apps/ethtool/ethtool-4.8.ebuild b/sys-apps/ethtool/ethtool-4.8.ebuild
deleted file mode 100644
index 8895d365961f..000000000000
--- a/sys-apps/ethtool/ethtool-4.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index f4392b38fb70..26e7906cbca1 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,5 +1,6 @@
AUX 90_kexec 199 BLAKE2B 37bcd66beccc32a884b0c2fca9cbba14784b8e6bc7238c14397f0ded788b503df1f7d6fff01c9b9a6bc159c1a6e01821c4c78c144091a7e13bb2bbe88ab5a98c SHA512 31837eb7df9b5c9b63c5f500e55fb584e315ac20f328490ff812a265f1a01604724bf4699f142255f7c5fa78cb2d8f2d6220a91961ac90df644b5d545d47ca39
AUX README.Gentoo 937 BLAKE2B 88a8912015e1cab0d382661d6bdc82689c91970d6d84c949e99a932b4d153b0753183380930b753d23d1c40ab7f44cae784f716e54bc3609a28741ab0b5b1348 SHA512 f082763692def43a97866b88443daf08a2bc1b0dccdc90160d12effa16e1293d8db6935c72ca9dd5502f844078241cbecdfde15b6e8f67a2cca8f3e89f14e654
+AUX kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch 1373 BLAKE2B 95bb8970709289d68a01ecd89dab97a9592de03504d39cf7cd36325dbb32de42070b67ffea437173d6cb8fe9b3910a55385563ce6bc87671df97b5947e7c22e5 SHA512 b0290065af6a87d836492fbcf0342c770b8a5754593f779d8e3a5ef0186f90fed7e6846211e8887c376ab683e16195b2b40965939185a291da89f79b521dec37
AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb4d9a5be1c918a9e1337545f60c683a1a47b848020d0f8fbdc38c7111e505424783191faf3e221ffa642169d2d055d5e17e6b19b9d0d SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad
AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea222760845fe243aad1057e3620ed4c932a32edebf943f9557b2f67751bbcea1f91778c0c065e246d419d5725eb68edcb1e58ced SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504
AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
@@ -11,6 +12,7 @@ DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
+EBUILD kexec-tools-2.0.17-r1.ebuild 1882 BLAKE2B 29c1fb6af24a0d5b9002de318c405f65d4a34ea6d8aeb402954f188c7a44923615a12aeb7d131ac2c969f2bea96a0f46c0c560f0830f4a60561caa672ed9ba79 SHA512 50ecc958c304bd7afc785f3dd417d305fc4a85eb1d77c95f4abd836b9f0771d351ac779140676124ae6c54e20273ba058f870638fac8f27a0916a5d786bdfe41
EBUILD kexec-tools-2.0.17.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
new file mode 100644
index 000000000000..5d691b34beca
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
@@ -0,0 +1,38 @@
+From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001
+From: Chris Clayton <chris2553@googlemail.com>
+Date: Mon, 20 Aug 2018 12:00:31 +0100
+Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error
+
+In response to a change in binutils, commit b21ebf2fb4c
+(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
+the linux kernel during the 4.16 development cycle and has
+since been backported to earlier stable kernel series. The
+change results in the failure message in $SUBJECT when
+rebooting via kexec.
+
+Fix this by replicating the change in kexec.
+
+Signed-off-by: Chris Clayton <chris2553@googlemail.com>
+Acked-by: Baoquan He <bhe@redhat.com>
+Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
+Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+---
+ kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+index 7fdde73..db85b44 100644
+--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
++++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
+ goto overflow;
+ break;
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ *(uint32_t *)location = value - address;
+ break;
+ default:
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
new file mode 100644
index 000000000000..849d5fd33b9a
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 x86"
+fi
+
+inherit flag-o-matic libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+ "${FILESDIR}"/${P}-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig anymore"
+ fi
+}
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index d09b981cb9ef..58b841dc24e9 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,5 +13,5 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 4077 BLAKE2B cec245b471219cb55352dc12df4ce2621c7fadfb27f341bc13c62559547f122a4fa6574d6c4ea3382a24ad47192a6e29fec9633e80da2cc7a29bb2d1fa986066 SHA512 0008c1744a76bef13c1388b8c06a76eff436ce79d6ade963ec45dd84e0debda12eaca4e5e718aceb0ac3f7c545cb21c3d2827f6d03121726f172ce330fe1f34a
+EBUILD man-1.6g-r1.ebuild 3760 BLAKE2B 6e1e91aceddd9467bd4e4d2c9ad5aa912876ad222baa2b5d256aa1fd8b0a747275d4a5ed0820b64a74abd7492c1f309847e3ddf323be25de6216ed894393f2df SHA512 1a7e5aa3effcbe7779df99f1c4ae9401995c006338a321c6c5716818d60fe69c8e06281ce5a052af8e14e3f1c6d9c6d287e9cfbe8f513a618f036ac0e25ddc46
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index f77b64f12175..2574b3cd8dc6 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x8
IUSE="+lzma nls selinux"
DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
+RDEPEND=">=sys-apps/groff-1.19.2-r1
!sys-apps/man-db
!<app-arch/lzma-4.63
lzma? ( app-arch/xz-utils )
@@ -128,12 +128,4 @@ pkg_postinst() {
ewarn "You might want to delete all but one of these:"
ewarn ${files}
fi
-
- if has_version app-doc/heirloom-doctools; then
- ewarn "Please note that the /etc/man.conf file installed will not"
- ewarn "work with heirloom's nroff by default (yet)."
- ewarn ""
- ewarn "Check app-doc/heirloom-doctools elog messages for the proper"
- ewarn "configuration."
- fi
}