diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
| commit | c5283d322accc6097afec74eab24550829788bab (patch) | |
| tree | b99ce668128d82a026eaa31461643f9173f9b77b /sys-apps/man | |
| parent | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff) | |
gentoo resync : 23.03.2018
Diffstat (limited to 'sys-apps/man')
| -rw-r--r-- | sys-apps/man/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/man/man-1.6g-r1.ebuild | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest index f24d8b4b9611..c730d080d507 100644 --- a/sys-apps/man/Manifest +++ b/sys-apps/man/Manifest @@ -13,6 +13,6 @@ 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 3685 BLAKE2B dc2a66f2b800ff50e9afb24381377925ca52487477432c2e13088b32c377d25315fd1de7368144faca8e40eb1ab9929b19170ff0757574b7f89ac4c677e776f4 SHA512 dde53299c1a2199b06b4bdc53e80b4bb38d9b0d7493ff5e7e666d6c7ddbf50d87b55b1896b151556c4e651cbe90c1695edae6eb10758547938ca90103460d40a +EBUILD man-1.6g-r1.ebuild 4083 BLAKE2B b26320ec505c5fc1b276587e6a0daf60b2a69bbcf74766b05b14085c53d412a450f19ef38cadb5d1f492512ed6c8b785156c4a64eb1150a00e6455f96e5ad84d SHA512 4328d4644c9e6d4ef6737ef590183338bf9cd8b0c04e7d537338335bb51b700211239d85fa72b042dd70c40a9d3a83f7dbae3e3813dbdadccd636db41125235b EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3 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 7d91bb1345a0..1a296cf7f7f5 100644 --- a/sys-apps/man/man-1.6g-r1.ebuild +++ b/sys-apps/man/man-1.6g-r1.ebuild @@ -3,7 +3,7 @@ EAPI="4" -inherit eutils toolchain-funcs user +inherit eutils prefix toolchain-funcs user DESCRIPTION="Standard commands to read man pages" HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" @@ -64,13 +64,24 @@ src_configure() { fi export COMPRESS if use lzma ; then - COMPRESS=/usr/bin/xz + COMPRESS="${EPREFIX}"/usr/bin/xz else - COMPRESS=/bin/bzip2 + COMPRESS="${EPREFIX}"/bin/bzip2 fi + + if [[ -n ${EPREFIX} ]]; then + hprefixify configure || die + sed -i \ + -e "s/man_user=root/man_user=$(id -u)/" \ + -e "s/man_group=man/man_group=$(id -g)/" \ + configure || die "Failed to disable suid/sgid options for man" + sed -i -e 's:/usr/bin:@bindir@:' man2html/Makefile.in || die + fi + echoit \ ./configure \ - -confdir=/etc \ + -bindir="${EPREFIX}"/usr/bin \ + -confdir="${EPREFIX}"/etc \ +sgid +fhs \ +lang ${mylang} \ || die "configure failed" @@ -89,8 +100,8 @@ src_install() { newexe "${FILESDIR}"/makewhatis.cron makewhatis keepdir /var/cache/man - diropts -m0775 -g man - local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-) + [[ -z ${EPREFIX} ]] && diropts -m0775 -g man + local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-) for x in ${mansects//:/ } ; do keepdir /var/cache/man/cat${x} done |