gentoo resync : 19.07.2019

3 files changed, 165 insertions, 14 deletions

diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
index 36cf7a7a64ea..97caeb102ae1 100644
--- a/net-irc/rhapsody/Manifest
+++ b/net-irc/rhapsody/Manifest
@@ -1,4 +1,5 @@
+AUX rhapsody-0.28b-tinfo.patch 5392 BLAKE2B 412ed32dd0e3719af1a16d44da17303301055139b65c7ff7984982a0b5eaaa258d98a63d6c11a0961595104c0389db6e65e62d6f4f0c90860bed0ea316873454 SHA512 4fbfbc54004bb5402868309a2df1911f993fce9fc18a799eda10ee7417802a10069f2379737eb85d721030afaa5c80886827a1bbe67864f69f8fb7ea51eb24f0
 AUX rhapsody-0.28b-uclibc.patch 382 BLAKE2B 9bd47da75b9fa0771025cd8993bba7e66b213abc66a13b0a06ea5426fee8caf9d30955ef4e5074caa02844702b2bcbacb9ffe2a3c59b67f9eb1e6c96bcf5aadf SHA512 6bb29efcca48fbab3e53f0d71f21ae558b3aff14c1ced6188fb3f1ae4f627ffa723d70ca65c4f05fe85943224f784dcb968340f1d0ebe2677fd26e1d25a49525
 DIST rhapsody_0.28b.tgz 110062 BLAKE2B 58f4a37efc11f019eac815e43fefb55b39da298682588519671b449f25be3fa89e807f92b55f1f62ef04321ff0ba5adc40f625c5c1c75aa2824138419e06f671 SHA512 1ff9f29d281421b7fe3dcdccbd8b2559572cc6e7167ff9e0f1a46dcff07486115de245055b3d72107f40f40a484d9aef94c7ed21b55a7bdf80094198d69dec6d
-EBUILD rhapsody-0.28b.ebuild 811 BLAKE2B 2c6f985ce12f8287367a578b0adc8b37aa8783484a50b7aede106b29195b0908e81ac4b753a89e2f37f9e1349572c3a8cc66d25e595cfbe16206cb9d2993fe03 SHA512 4fb67f5e3c9ec56ba7915df6c370380199c6d011fd59d19b6be95bf990af0c10a4c5592b08e07c9db05bfc517df797eeb1594c29698efa745ebdaf83e9adf381
+EBUILD rhapsody-0.28b.ebuild 795 BLAKE2B 775f24ea0090c980e5ceff109acf9e37ce748e6c877186959cebcf24b8c07bd146b62527f90e1adbf02c0650f26aa3195277a4691f6ce6562035a4c45025b6e8 SHA512 84bb81e002c125beb031604b97d6b9d40dc3e7c89edad800651a4c444bda778d9e5e5f88639ce9ea78ba5e9d48d2ee62e7671be9911795b361214c92b14ffece
 MISC metadata.xml 245 BLAKE2B f059db0d75f6addf564b9ba45029962f855144c1f7ea684dda39b60bb47e8b298b0827add3cea31e0c1d12da4f5d2e5f6819022a2afa6631351e876f62a0e0d3 SHA512 513af093eab23f31409638d76341a397635e358dde908edc462bc80ed46a95e37f7c1a7c8d9d30c7935c214e2e8ea4d071603b294ba133e7092f4bc71bdfe192
diff --git a/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch b/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch
new file mode 100644
index 000000000000..834b93165abf
--- /dev/null
+++ b/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch
@@ -0,0 +1,147 @@
+https://bugs.gentoo.org/690088
+
+--- rhapsody-0.28b/configure
++++ rhapsody-0.28b/configure
+@@ -66,6 +66,7 @@
+ OSNAME=`uname -o 2>/dev/null`
+ OSVER=`uname -r 2>/dev/null`
+ USER=`whoami 2>/dev/null`
++PKGCONFIG="${PKGCONFIG:-pkg-config}"
+ 
+ echo "The OS appears to be $OS ($OSNAME) version $OSVER."
+ echo ""
+@@ -75,7 +76,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -86,12 +87,12 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses -lnsl -lsocket" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket" 
+ 	GCCBASELIBPATHS=""
+ 	GCCBASEINCPATHS="-I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses -lnsl -lsocket" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS="-I/usr/local/include"
+ 	CCBASEFLAGS="-g -Wall"
+@@ -102,7 +103,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/sw/include /usr/include /sw/include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/sw/lib"
+ 	GCCBASEINCPATHS="/usr/include /usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused -no-cpp-precomp"
+@@ -113,7 +114,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -124,12 +125,12 @@
+ 	CCPATH="/usr/freeware/bin /usr/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/freeware/lib64"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-mabi=64 -g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS=""
+ 	CCBASEFLAGS="-mabi=64"
+@@ -140,12 +141,12 @@
+ 	CCPATH="/usr/freeware/bin /usr/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/freeware/lib32"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-mabi=n32 -g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS=""
+ 	CCBASEFLAGS="-mabi=n32 -g -Wall"
+@@ -156,7 +157,7 @@
+ 	CCPATH="/boot/develop/bin /bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/boot/develop/headers /boot/develop/headers/gnu /boot/home/config/include"
+ 
+-	GCCBASELIBS="-lncurses -lsocket -lbind"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lsocket -lbind"
+ 	GCCBASELIBPATHS="-L/boot/home/config/lib"
+ 	GCCBASEINCPATHS="-I/boot/home/config/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -172,12 +173,12 @@
+ 	CCPATH="/bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	GCCBASEINCPATHS="-I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	CCBASEINCPATHS="-I/usr/local/include"
+ 	CCBASEFLAGS="-g"
+@@ -188,12 +189,12 @@
+ 	CCPATH="/bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	GCCBASEINCPATHS="-I/usr/include -I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	CCBASEINCPATHS="-I/usr/include -I/usr/local/include"
+ 	CCBASEFLAGS="-g"
+@@ -204,7 +205,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -217,12 +218,12 @@
+ 	CCPATH="/bin /sbin /usr/bin /usr/sbin/ /usr/local/bin/ /usr/local/sbin" 
+ 	CURSESPATH="/include /usr/include /include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include -I/include"
+ 	GCCBASEFLAGS=""
+ 
+-	CCBASELIBS="-lncurses"
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	CCBASELIBPATHS="-L/usr/lib"
+ 	CCBASEINCPATHS="-I/usr/include -I/include"
+ 	CCBASEFLAGS=""
diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild
index 892b4df67e4a..52d276a3bb78 100644
--- a/net-irc/rhapsody/rhapsody-0.28b.ebuild
+++ b/net-irc/rhapsody/rhapsody-0.28b.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="IRC client intended to be displayed on a text console"
 HOMEPAGE="http://rhapsody.sourceforge.net/"
@@ -14,25 +14,28 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.0"
+DEPEND=">=sys-libs/ncurses-5.0:0="
+BDEPEND="virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
 
-	epatch "${FILESDIR}"/${P}-uclibc.patch
+src_configure() {
+	PKGCONFIG="$(tc-getPKG_CONFIG)" \
+	./configure -i /usr/share/rhapsody || die "configure failed"
 }
 
 src_compile() {
-	./configure -i /usr/share/rhapsody || die "configure failed"
-	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin rhapsody || die "dobin failed"
+	dobin rhapsody
 
 	insinto /usr/share/rhapsody/help
-	doins help/*.hlp || die "doins failed"
+	doins help/*.hlp
 
-	dodoc docs/CHANGELOG || die "dodoc failed"
+	dodoc docs/CHANGELOG
 }