[gentoo-commits] repo/proj/guru:master commit in: net-irc/catgirl/, net-irc/catgirl/files/

[gentoo-commits] repo/proj/guru:master commit in: net-irc/catgirl/, net-irc/catgirl/files/

[Jian Lin]

commit:     0af003388a9df11507d5204e8309251943c64b9a
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Aug 16 08:17:08 2021 +0000
Commit:     Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
CommitDate: Mon Aug 16 08:21:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0af00338

net-irc/catgirl: add 1.9a, drop 1.8 and 1.9

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-irc/catgirl/Manifest                           |  3 +-
 net-irc/catgirl/catgirl-1.9.ebuild                 | 40 ----------------------
 .../{catgirl-1.8.ebuild => catgirl-1.9a.ebuild}    | 15 ++++++--
 net-irc/catgirl/files/README.gentoo                |  4 +++
 4 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/net-irc/catgirl/Manifest b/net-irc/catgirl/Manifest
index e8b99f313..20f4a24dd 100644
--- a/net-irc/catgirl/Manifest
+++ b/net-irc/catgirl/Manifest
@@ -1,2 +1 @@
-DIST catgirl-1.8.tar.gz 60915 BLAKE2B e985cad73482eae607e022263e8a07efa76eebd0a6e7b58887423df057a76b45ff6df7d9f3d873af19d4ea7774f4a13c6bf687628ea50fdc2e3359ae406a484b SHA512 c0aebd53d4e94e8f1a54690a8ceaf3f3318f805b7ff474bfce20f7f234e37e2f82fc8b6e8088996f0c88738c9059582b6a2670de9b5c5fcf359da867ad8de6e8
-DIST catgirl-1.9.tar.gz 62597 BLAKE2B 5c5d1eef75b5daa0322b233d369826a86fd701fa6b9aaf5d60ff652147cbbd21859a70ff2d6716c15349de166208bd7e6363bd1dbb53ef560a7826e81890e2fe SHA512 624e83cc68b2d7d7bb337d94c6383deed4a6439ca98b84fb0dffdd7d918a9b9065a4ff435b5b81b397c87ac9797bb9025a2454de47ec8bec4ada53f14d20326c
+DIST catgirl-1.9a.tar.gz 62635 BLAKE2B 9b1d7fb9eb7b8bd5703a2d9ebf354efbc229a85dcca95a3351a88201f426e20a022a8a19e654b9db85d5697b3043a79083d31f1c9d1d9c253f4015a1d81450c0 SHA512 2eed6cc54d19a090345aa719adc256d6c8d4f26a81c7a399c20d3b4cbce336bc94b15c1c4b92a54d7cf8b16eda09e589c931292627234b000e567b2d22742420

diff --git a/net-irc/catgirl/catgirl-1.9.ebuild b/net-irc/catgirl/catgirl-1.9.ebuild
deleted file mode 100644
index a0129b1f5..000000000
--- a/net-irc/catgirl/catgirl-1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="TLS-only terminal IRC client"
-HOMEPAGE="https://git.causal.agency/catgirl/about/"
-SRC_URI="https://git.causal.agency/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libretls
-	sys-libs/ncurses
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.7 scripts/chat.tmux.conf )
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--mandir="${EPREFIX}"/usr/share/man || die
-	tc-export CC
-}
-
-src_compile() {
-	emake all
-}
-
-pkg_postinst() {
-	einfo "You are encouraged to patch your own text macros in edit.c"
-	einfo "See Gentoo Wiki article on user patches:"
-	einfo "https://wiki.gentoo.org/wiki//etc/portage/patches"
-}

diff --git a/net-irc/catgirl/catgirl-1.8.ebuild b/net-irc/catgirl/catgirl-1.9a.ebuild
similarity index 80%
rename from net-irc/catgirl/catgirl-1.8.ebuild
rename to net-irc/catgirl/catgirl-1.9a.ebuild
index bde645b07..e712085b3 100644
--- a/net-irc/catgirl/catgirl-1.8.ebuild
+++ b/net-irc/catgirl/catgirl-1.9a.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="TLS-only terminal IRC client"
 HOMEPAGE="https://git.causal.agency/catgirl/about/"
@@ -26,9 +26,18 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--mandir="${EPREFIX}"/usr/share/man || die
+	tc-export CC
 }
 
 src_compile() {
-	tc-export CC
 	emake all
 }
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}

diff --git a/net-irc/catgirl/files/README.gentoo b/net-irc/catgirl/files/README.gentoo
new file mode 100644
index 000000000..0fee5a2e3
--- /dev/null
+++ b/net-irc/catgirl/files/README.gentoo
@@ -0,0 +1,4 @@
+You are encouraged to patch your own text macros in edit.c
+
+See Gentoo Wiki article on user patches:
+https://wiki.gentoo.org/wiki//etc/portage/patches