diff options
Diffstat (limited to 'sys-apps/coreutils')
| -rw-r--r-- | sys-apps/coreutils/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/coreutils/coreutils-8.30.ebuild (renamed from sys-apps/coreutils/coreutils-8.29.ebuild) | 33 |
2 files changed, 22 insertions, 15 deletions
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 5767a505befc..28421517cba8 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -3,7 +3,9 @@ DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2 DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd +DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 +DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed EBUILD coreutils-8.29-r1.ebuild 6176 BLAKE2B 7401f3562c128eba7dece52d55464e345b782cbbb5d033a5c1321ba3a2485ab48f01e26a3f5eadf0614607949bf0f1aee34c83303f2ad442a2e4b618569323ac SHA512 d6e571fbf22f285d230c128fcc5d583070d7c9d5464ddf8a1198cbd1bdbd79b8394c229d045ce5a5d0ef042d5e26da0d9f60590df7d7ff6ec86b791268c812d1 -EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196 +EBUILD coreutils-8.30.ebuild 6171 BLAKE2B d695f8f24e64e3c35ac6ef58143c31598b1877a05abeaebafa733962804e7bcd2b6cd301bcd22a8043d80085f75b4098b2d00d56e7f2508f79737d56c8655c84 SHA512 b25eba145100bbf5f4963c93706ca09318a2ac0654fa57a5aaabcc1f3dfbe537527c639c9da7ee7e74f26592fe75d7e123065cea0904f98648e0dfbd24366f4e MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044 diff --git a/sys-apps/coreutils/coreutils-8.29.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild index 92f88849d772..417a9b7195a1 100644 --- a/sys-apps/coreutils/coreutils-8.29.ebuild +++ b/sys-apps/coreutils/coreutils-8.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -7,17 +7,17 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit eutils flag-o-matic python-any-r1 toolchain-funcs -PATCH_VER="1.0" +PATCH_VER="01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" HOMEPAGE="https://www.gnu.org/software/coreutils/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz - https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz" + https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" -IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) @@ -89,7 +89,7 @@ src_configure() { --enable-install-program="arch,$(usev hostname),$(usev kill)" --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" --enable-largefile - $(use caps || echo --disable-libcap) + $(usex caps '' --disable-libcap) $(use_enable nls) $(use_enable acl) $(use_enable multicall single-binary) @@ -163,18 +163,23 @@ src_install() { local fhs="cat chgrp chmod chown cp date dd df echo false ln ls mkdir mknod mv pwd rm rmdir stty sync true uname" mv ${fhs} ../../bin/ || die "could not move fhs bins" + if use hostname; then + mv hostname ../../bin/ || die + fi if use kill; then mv kill ../../bin/ || die fi - # move critical binaries into /bin (common scripts) - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - local x - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done + if use split-usr ; then + # move critical binaries into /bin (common scripts) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "could not move common bins" + # create a symlink for uname in /usr/bin/ since autotools require it + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + fi else # For now, drop the man pages, collides with the ones of the system. rm -rf "${ED%/}"/usr/share/man |