Re: [gentoo-proxy-maint] [PATCH 4/4] net-irc/ii: flesh out ebuild

[Joonas Niilola]

Hey,

merged, thanks! I squashed your commits 2-4 to a single one, and added
the CFLAGS sed's back due to:

 * Messages for package net-irc/ii-1.8:
 * Log file:
/var/tmp/portage/vbslogs/build/net-irc/ii-1.8:20210507-122242.log

 * QA Notice: Files built without respecting CFLAGS have been detected
 *  Please include the following list of files in your report:
 * /usr/bin/ii

 * Messages for package net-irc/ii-9999:
 * Log file:
/var/tmp/portage/vbslogs/build/net-irc/ii-9999:20210507-122233.log

 * QA Notice: Files built without respecting CFLAGS have been detected
 *  Please include the following list of files in your report:
 * /usr/bin/ii

In future you can use
https://wiki.gentoo.org/wiki/Package_testing#make.conf these settings to
test your ebuilds and see these QA notices.

-- juippis

On 17.4.2021 19.52, Vladimir Kuznetsov wrote:
> Package-Manager: Portage-3.0.17, Repoman-3.0.2
> Signed-off-by: Vladimir Kuznetsov <fulade@××××××.net>
> ---
>  net-irc/ii/ii-1.8.ebuild  | 17 ++++++-----------
>  net-irc/ii/ii-9999.ebuild | 18 ++++++------------
>  2 files changed, 12 insertions(+), 23 deletions(-)
>
> diff --git a/net-irc/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild
> index 8602091e7e7..5ef9e5bdca9 100644
> --- a/net-irc/ii/ii-1.8.ebuild
> +++ b/net-irc/ii/ii-1.8.ebuild
> @@ -1,36 +1,31 @@
>  # Copyright 1999-2021 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>
>  EAPI=7
>  inherit toolchain-funcs
>
>  DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
>  HOMEPAGE="https://tools.suckless.org/ii/"
>  SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
>
>  LICENSE="MIT"
>  SLOT="0"
>  KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
>
>  src_prepare() {
>  	default
>
> -	sed -i \
> -		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
> -		-e '/^CC/d' \
> -		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
> -		config.mk || die
> -	sed -i \
> -		-e 's|@${CC}|$(CC)|g' \
> -		Makefile || die
> +	sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' config.mk || die
>  }
>
>  src_compile() {
>  	emake CC="$(tc-getCC)"
>  }
>
>  src_install() {
> -	dobin ii
> -	dodoc CHANGES FAQ README
> -	doman *.1
> +	emake \
> +		DESTDIR="${D}" \
> +		PREFIX="${EPREFIX}"/usr \
> +		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
> +		install
>  }
> diff --git a/net-irc/ii/ii-9999.ebuild b/net-irc/ii/ii-9999.ebuild
> index db00b6528aa..4ba2eac0c28 100644
> --- a/net-irc/ii/ii-9999.ebuild
> +++ b/net-irc/ii/ii-9999.ebuild
> @@ -1,36 +1,30 @@
>  # Copyright 1999-2021 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>
>  EAPI=7
>  inherit git-r3 toolchain-funcs
>
>  DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
>  HOMEPAGE="https://tools.suckless.org/ii/"
>  EGIT_REPO_URI="https://git.suckless.org/ii"
>
>  LICENSE="MIT"
>  SLOT="0"
> -KEYWORDS=""
>
>  src_prepare() {
>  	default
>
> -	sed -i \
> -		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
> -		-e '/^CC/d' \
> -		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
> -		config.mk || die
> -	sed -i \
> -		-e 's|@${CC}|$(CC)|g' \
> -		Makefile || die
> +	sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' config.mk || die
>  }
>
>  src_compile() {
>  	emake CC="$(tc-getCC)"
>  }
>
>  src_install() {
> -	dobin ii
> -	dodoc CHANGES FAQ README
> -	doman *.1
> +	emake \
> +		DESTDIR="${D}" \
> +		PREFIX="${EPREFIX}"/usr \
> +		DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} \
> +		install
>  }
>