diff options
Diffstat (limited to 'sys-apps/sed')
| -rw-r--r-- | sys-apps/sed/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/sed/metadata.xml | 7 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.5.ebuild | 49 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.7.ebuild | 51 | ||||
| -rw-r--r-- | sys-apps/sed/sed-4.8.ebuild | 47 |
5 files changed, 52 insertions, 110 deletions
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index a4323580c64a..b924f8ba9327 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,7 +1,7 @@ DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8 -EBUILD sed-4.5.ebuild 1754 BLAKE2B 378e3f30251c058eb87608c952c941892245e6c41dea873ca7fbf34d1fa1a53248422801a6728b17b3bba0b499233dc32eefe9108e2ce31e5500eb6af691e848 SHA512 a4a9f5d17ff2c46860dbd3da1ebfc1f6eb2ba7f4009b4f39dd4ef27922cf7d31fc0f09ca680ef465ce062ceb28980db7fb97553ad92ea3f580495f99319da37e -EBUILD sed-4.7.ebuild 1764 BLAKE2B 0da4d5bc5cf60d148028766cffff9638e9b11003a38003528300a1b143a7b47c22cf824f608e115ffcd26dea3432cd38a620eaa87a4151ab11faca2fda14b599 SHA512 63cb466f5263a150e92cc3dc2332bb826292ad651ea0425731471f0c7674ed681c55a9e217eaea79d049492ab1fd860b54c83849f38cd53c2b20f7544e841a00 -EBUILD sed-4.8.ebuild 1767 BLAKE2B f73107d19359fb5143078428ed9e8a8f46dc253b98f2120408b4e4d1562ed71f8f556e7c00082345ad1543c14a8670396ad20e93e283e8c7243a805b33dce37f SHA512 5d7c86fdbfdcf0f86b459b52db1df930623c37e8ef9e7b775b36842a7f27177653855cd0ec80d8d02cbd8d49062207966209656900fc953f023dba9e21d956f6 -MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5 +EBUILD sed-4.5.ebuild 1111 BLAKE2B f7564d0ec2c55ea629c0b0d38432297d047ffcab549c9738ad7cd2c7f7f96d986b307b3d9e6892a9cce18851e29a79ba983f461e1e2d69ae1f701b75c3f96dbc SHA512 f873e92e5509782096f8f7fea5cbd59c19d1233e95f1c208d93bd8703242dd5e86d419f3fe662728cc4961fc58a5ece8b69620a0a03aa70b72296f5577173751 +EBUILD sed-4.7.ebuild 1119 BLAKE2B c7844da1e2d55be0f7640acfc919b84557b970aa01023870fc64b66b8fceea6596f95922d0fb50423d4d670c4bb982efc19812283d26ce4d7aed74adaa62389f SHA512 48d676d1cf99ca0e322dfbbb2ffebc77dfc5ded30154ce1e577d232e0a37462bc28a3d295bae0804756e5f35009f0499c41e7021853ff28b631d7fb7357e59cd +EBUILD sed-4.8.ebuild 1124 BLAKE2B 90231eec93291dcc293916699cf92b1209f09277b674ead4ffffa58985ec946d7eb6a36f2be939f83a80fd15ad48bba22b950dad996b50ededbe4b259c268be0 SHA512 ae2955a2f9195f6fc7ae2c6f9e1af5c7bd55e9489fa7cfb5e4a942b9ac16af8a2901a3dc6788c5c7505743b748e45005c2dae485894adf3c36810491d1eb8259 +MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml index 504b6a5e4649..b738f8c54a01 100644 --- a/sys-apps/sed/metadata.xml +++ b/sys-apps/sed/metadata.xml @@ -8,11 +8,4 @@ <upstream> <remote-id type="sourceforge">sed</remote-id> </upstream> -<use> - <flag name="forced-sandbox"> - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands). - Note: This may break many configure scripts, so it should be avoided on dev systems - (and generally used on binpkg/final systems only). - </flag> -</use> </pkgmetadata> diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild index 555171c1e834..c6ede4cfc760 100644 --- a/sys-apps/sed/sed-4.5.ebuild +++ b/sys-apps/sed/sed-4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,40 +12,23 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" -IUSE="acl forced-sandbox nls selinux static" +IUSE="acl nls selinux static" -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_bootstrap_sed() { - # make sure system-sed works #40786 #650052 - if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then - mkdir -p "${T}/bootstrap" - printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die - chmod a+rx "${T}/bootstrap/sed" - PATH="${T}/bootstrap:${PATH}" - fi -} - -src_prepare() { - # Don't use sed before bootstrap if we have to recover a broken host sed. - src_bootstrap_sed - - default - - if use forced-sandbox ; then - # Upstream doesn't want to add a configure flag for this. - # https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html - sed -i \ - -e '/^bool sandbox = false;/s:false:true:' \ - sed/sed.c || die - # Make sure the sed took. - grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed" - fi -} + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild index 87cc5cb0f6d1..ebcf003708b4 100644 --- a/sys-apps/sed/sed-4.7.ebuild +++ b/sys-apps/sed/sed-4.7.ebuild @@ -11,41 +11,24 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86" -IUSE="acl forced-sandbox nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86" +IUSE="acl nls selinux static" + +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_bootstrap_sed() { - # make sure system-sed works #40786 #650052 - if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then - mkdir -p "${T}/bootstrap" - printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die - chmod a+rx "${T}/bootstrap/sed" - PATH="${T}/bootstrap:${PATH}" - fi -} - -src_prepare() { - # Don't use sed before bootstrap if we have to recover a broken host sed. - src_bootstrap_sed - - default - - if use forced-sandbox ; then - # Upstream doesn't want to add a configure flag for this. - # https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html - sed -i \ - -e '/^bool sandbox = false;/s:false:true:' \ - sed/sed.c || die - # Make sure the sed took. - grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed" - fi -} + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild index eee25f42b285..3cf0562a1777 100644 --- a/sys-apps/sed/sed-4.8.ebuild +++ b/sys-apps/sed/sed-4.8.ebuild @@ -12,40 +12,23 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="acl forced-sandbox nls selinux static" +IUSE="acl nls selinux static" -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_bootstrap_sed() { - # make sure system-sed works #40786 #650052 - if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then - mkdir -p "${T}/bootstrap" - printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die - chmod a+rx "${T}/bootstrap/sed" - PATH="${T}/bootstrap:${PATH}" - fi -} - -src_prepare() { - # Don't use sed before bootstrap if we have to recover a broken host sed. - src_bootstrap_sed - - default - - if use forced-sandbox ; then - # Upstream doesn't want to add a configure flag for this. - # https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html - sed -i \ - -e '/^bool sandbox = false;/s:false:true:' \ - sed/sed.c || die - # Make sure the sed took. - grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed" - fi -} + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() |