diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-shells/shish | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-shells/shish')
| -rw-r--r-- | app-shells/shish/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/shish/shish-0.7_pre3-r1.ebuild | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app-shells/shish/Manifest b/app-shells/shish/Manifest index 6e5c7ceeaf36..90f4f0171bc9 100644 --- a/app-shells/shish/Manifest +++ b/app-shells/shish/Manifest @@ -1,3 +1,3 @@ DIST shish-0.7-pre3.tar.bz2 189207 BLAKE2B dc5f12bf75da6c1843a0cb2f35d3d4e06bd65082598979c07cae55dc56cc25eea77a2727ab1848d42a969b87b36a30cc27b392f24020435b2a207e86c7ed7a0a SHA512 b8269394a3b2a06d1ab48224b81c041ffa4b0a08d6849fc8081fad38aad34e179c12198a1b8e94703cf17e029f88068af87ffd2ef4051ff8e24886fa96b39c98 -EBUILD shish-0.7_pre3-r1.ebuild 1124 BLAKE2B 15d0dba2a89c86a694027b9c3fece9832adc7a4cece5f3788098012dbc9b91c97161ebe7acc99ef1afb3d8836bf36bc7e9f03bccb42a0a303ffa6b50563391ba SHA512 10b5f2efa21a3972be694a020fe7224837b07548c0aa3b1776135dacebc14d493b5d7737e68a19fa2345f42f07ee324d650ec29195fe775d8cf22c33af6c3d3e +EBUILD shish-0.7_pre3-r1.ebuild 1120 BLAKE2B cab7381850a95d8c5ac9548d4734d02d9c19065515f6cdd389728b47cf06fa5f4b47ce42155011095141a17e6727bcdd986c8ab06a2261702e020c3c6d35226f SHA512 238a2f5fdda6ef3fb2479661ba74356a0cc835ad130aa349d91b24fb168a1a59f781c62d8d9ffbcb9c6301133183254597b833a6963eb9256aa03ad52849da60 MISC metadata.xml 239 BLAKE2B b2686587f8cce11c2771d4e8e6c71108e2665261561a6c89c7a0a57d5cf70866ff643761b3a3f7f5a85f35b180f62b6fd77cfa5e22a02e9b6b5bd463b4c6aedf SHA512 4103ab440f482f120bfa4fee4954d61fe78f020f7d15da74294223ea361a4d952495c71533ced054585c7001fb213d93a554f3caf4538f973bd7e7ce371f5398 diff --git a/app-shells/shish/shish-0.7_pre3-r1.ebuild b/app-shells/shish/shish-0.7_pre3-r1.ebuild index 11fee89ec6d7..10c7d469d2dc 100644 --- a/app-shells/shish/shish-0.7_pre3-r1.ebuild +++ b/app-shells/shish/shish-0.7_pre3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="The diet shell" HOMEPAGE="http://www.blah.ch/shish/" SRC_URI="http://www.blah.ch/${PN}/pkg/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -20,15 +21,11 @@ IUSE="debug diet" DEPEND="diet? ( dev-libs/dietlibc )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - DOCS=( AUTHORS BUGS ChangeLog README TODO ) -pkg_setup() { - use diet && export CC="diet $(tc-getCC) -nostdinc" -} - src_prepare() { + default + # Respect CFLAGS, bug #439974 sed -i \ -e '/CFLAGS="$CFLAGS/d' \ @@ -37,6 +34,8 @@ src_prepare() { } src_configure() { + use diet && export CC="diet $(tc-getCC) -nostdinc" + econf \ $(use_enable debug) \ --disable-quiet # bug 439974 @@ -53,7 +52,7 @@ src_install() { } pkg_postinst() { - einfo "Updating ${ROOT}etc/shells" - ( grep -v "^/bin/shish$" "${ROOT}"etc/shells; echo "/bin/shish" ) > "${T}"/shells - mv -f "${T}"/shells "${ROOT}"etc/shells + einfo "Updating ${EROOT}/etc/shells" + ( grep -v "^/bin/shish$" "${EROOT}"/etc/shells; echo "/bin/shish" ) > "${T}"/shells + mv -f "${T}"/shells "${EROOT}"/etc/shells } |