Set S (bug #522700). Respect LDFLAGS. Convert sed script to patch. Convert helpful comment into USE default.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 54 insertions, 37 deletions

diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index 22bde775f54d..6aaee4d4a02d 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/yaps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.31 2014/09/07 16:28:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.32 2014/09/15 08:48:46 jer Exp $
+
+  15 Sep 2014; Jeroen Roovers <jer@gentoo.org> yaps-0.96-r5.ebuild,
+  +files/yaps-0.96-string.patch:
+  Set S (bug #522700). Respect LDFLAGS. Convert sed script to patch. Convert
+  helpful comment into USE default.
 
   07 Sep 2014; Manuel Rüger <mrueg@gentoo.org> -yaps-0.96-r4.ebuild:
   Cleanup old.
diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest
index 898992b128b2..2a65564a8c88 100644
--- a/app-mobilephone/yaps/Manifest
+++ b/app-mobilephone/yaps/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX yaps-0.96-gentoo.diff 1554 SHA256 3ba28d9b6f527ed9fec12bb8ea35e46f33adb80bd8d5ca5bd81405bedea0574c SHA512 60dbe9b62f3fe1ee9bcc3ec43db953fe3f567ac995cb4b0c7dda4f7fa250fbf98c99e8684a6218213c46b89305df1cb5a57088bc9b56d0b143daa723d64e130d WHIRLPOOL b07af49cf0af86616a29803f6d7143b8ba8bd5a201975c01f5d8ebe9d623e268884afdce2f5b0706de06a52ebfb65f67f0492a491cf473b8a119ce6a56c3e2d8
 AUX yaps-0.96-gentoo.patch 10303 SHA256 49f90677f9b52fa2ac0335825da866c45e62c2098a1c527061e08af4c7ebbb05 SHA512 a28863e5ff942a6ab64a8746eb5f191411442e65b9be0710b3f96f6f844f710803ebf2497ef7cebdb17e5955c44f23f6d8441ea5ade0933e83a7bc976d4bac02 WHIRLPOOL c77f2b63be2e8eede53257fc82ca8aab17ebea20af3538acf30bc42a750243822264c8a3ff6f7bfede80c6d6b0c7931cc0b7e2744ecd3374afb48f71be1e4889
 AUX yaps-0.96-getline-rename.patch 2349 SHA256 ceb16d4f5c707a856fb88da1100640933e5d37a015430b2753543538bf25b47f SHA512 3708d6eb29a294a66dc90bcec47dcf046c8205afc4932a234b37c758321f1fb210b4ce2612ed89b00f8fb14c3b300607af99111854bf5fbe12ad6481ed92b2fe WHIRLPOOL 8c91921bea4d4e95abc53924f50be70acfac3317658c0ceb12d7b6d7ea7fa7aa08a348f5cb806b3eb549011558fe56acf4d7889f79f853161eed3482f6fdfbef
+AUX yaps-0.96-string.patch 172 SHA256 bbcf5efdc79b71633e8da553f7478a8e6e2aa1cb0bee6486237a081bb78e2479 SHA512 f3337b9a430e4995884285e3e0fedd377b3b0ecc8622e02d5d1c01e27614c677ec06632e99eaa2f087e474ef5afdcf87cc8d38194c314fd56f438f29220a4c69 WHIRLPOOL a9ddee5ce327204e2456fc91c01a656fb27239897903fdf885b6598cbda5c6cf051f5bd9cb34fc4623f996228f7aed6df6d2f7e9a7951cde7eaa8e8155f9c27d
 DIST yaps-0.96.c4.tgz 109682 SHA256 4afab43b8f0bed7c48d91cef56bc7aee44a1887c38efb8788be3ec761caf54c9 SHA512 16d326903c7aa54c9930f581d9ec6285fe51d52e8b03a0cff899745b41371e3ce939201f529e15c2473bb8917e3e45f0a3872355986ecd03df52079ec9c484ca WHIRLPOOL bf8e37fc2135dfb851af0e26ee508b286548e0b0b1d3d460263507585c580e5058c567013aac63283861dc79e26aa437ad2392b9061b1b083714b5d4b88a8554
 DIST yaps-0.96.tar.gz 91060 SHA256 6474a507d1f3d769c80562164ad38454c73fb49be043bab1128ca9eaf20c5b98 SHA512 799559af2726b669df08ad68de1f01b5b1a6ac8b332e5f8b54d82474b183ef7714abd4482aefdd5ccff6197a9da2b051fa94b38d84eb037b262d066fffc7d145 WHIRLPOOL d7f6de6c7aca320a95afc78aad1ae1b7d27a1b4ef1f6e40dd8ad02c4ba8ecb1138ef41b507672ccbfdc197e2c7591819c58311c9cff796e56f03ebe41594dcd8
-EBUILD yaps-0.96-r5.ebuild 2399 SHA256 543ce8e749693216a3a201d842d16f16bdbceabd8144297c0b41bd984ff095be SHA512 c18a03f8b94a4a7f7f51d435c764c589536f267a938f0ffc352c1596c088c9a97308c78c17d1e3db592d00d13298d12b87cbc81359cc9dfe52a0c4458e5f2f82 WHIRLPOOL 6b69ef47b23c0bc3b36e00e76073d537d12f10800fd8675f6c70aacee20fd30b8b240c1e78ee8c6b74e316b9c9434afee99b3a648cbb37c83d3afce6de5e8cc9
-MISC ChangeLog 4375 SHA256 1b6482605e1b7d2f2799534f5cd6bf308a569138c36f69e673a368279570f583 SHA512 8905f9056b679ebf42d9a83401df3becbb4ce3077025bd2a6ceab343c495b649a8e9df16f164be0e981d37f479780a93cc4251f287431685d1142fae423afa93 WHIRLPOOL 17c5e1df14d79d1510076d7c522db0ad856b07f0a89c7ce28580942b8c1c6b263cabcef64e72a01b10d2f5e36d30b4b18fc54d4b45474c278f656c2dc42b4a7a
+EBUILD yaps-0.96-r5.ebuild 1764 SHA256 cec8bed3d7081e6d4d803a8cfb1cda72294b12cf477c0ade073f988df381a3a5 SHA512 737945f655fedc7995432d65aa8a72edeb404255f61aeb2e79d49183cd71d1145bdfc279d321305e90f4b21b0de632d63ccece9be15fb1a26fa4a6512f40b443 WHIRLPOOL 6ad90248a93317a4002abe962c6e1fb04775dca1d5b24a8a9b1095d16caaed208420300cf2db0f748e8d216deba7970631d2da694ad3736f14ff3c0a70449e1f
+MISC ChangeLog 4588 SHA256 83d3dae911a177936d9c48d5741361702dfbfeee0aeb9b852f6e547857f9aa66 SHA512 30e1d5a1ba2be13277721e317d958094ef8710a800448b5db823ec0633cd1a77245a93d79dbf1d58d77f89b7a7225252a8c4bb19987c026af3556f3dd0fcdacb WHIRLPOOL 962732cc77daceb31c8c80a60a464f5cd6c5a276b549026bbce5506b285f49519d48e8395ee8279409f3c2859430da9a3bb5d539fc600cf8784be67b01e5e4a3
 MISC metadata.xml 374 SHA256 b0a1e70bdf2564573b170548a9555bba2b38a454331c040945f8cfa121ff1da5 SHA512 2bc440dca76991fa6c07b366dcf281c8922f381218e23fb52a1765d588e11055a610c5846525b09788910c8fe1ff381430e15027e138316d1d529ff6fe1cedbd WHIRLPOOL 1ce69fe10948d656f46e349e8ad657602fd48ba31989fb37c8f70e2369c865fa2c264760deade5ff27fde358a56dd2642d18323a9a191d92c4ea28d142d8a6eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQWp/AACgkQVWmRsqeSphMj+gCeLuERWBivfiwvJQQ/0zCyMZRN
+Sy0Amwd/pDDdXXAl8eyR3YWX7F4hQxCy
+=pkGd
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/yaps/files/yaps-0.96-string.patch b/app-mobilephone/yaps/files/yaps-0.96-string.patch
new file mode 100644
index 000000000000..6641e2f7d4e3
--- /dev/null
+++ b/app-mobilephone/yaps/files/yaps-0.96-string.patch
@@ -0,0 +1,10 @@
+--- a/scr.c
++++ b/scr.c
+@@ -2,6 +2,7 @@
+ # include	"config.h"
+ # include	<stdio.h>
+ # include	<stdlib.h>
++# include	<string.h>
+ # include	"pager.h"
+ # include	"script.h"
+ 
diff --git a/app-mobilephone/yaps/yaps-0.96-r5.ebuild b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
index bbc6e16b26cc..f25b14a2fa0c 100644
--- a/app-mobilephone/yaps/yaps-0.96-r5.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.2 2014/09/07 13:09:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.3 2014/09/15 08:48:46 jer Exp $
 
 EAPI=5
-
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Yet Another Pager Software (optional with CAPI support)"
@@ -14,41 +13,32 @@ SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz )
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="capi lua slang unicode"
+IUSE="+capi lua slang unicode"
 
-RDEPEND="capi? ( net-dialup/capi4k-utils )
+RDEPEND="
+	capi? ( net-dialup/capi4k-utils )
 	slang? ( >=sys-libs/slang-1.4 )
 	lua? ( dev-lang/lua )
-	!media-sound/abcmidi"  # also contains "yaps"
-DEPEND="${RDEPEND}
-	!capi? ( sys-apps/sed )
-	lua? ( virtual/pkgconfig )"
+	!media-sound/abcmidi
+"
+DEPEND="
+	${RDEPEND}
+	lua? ( virtual/pkgconfig )
+"
 
-pkg_setup() {
-	if ! use capi; then
-		ewarn
-		ewarn "You are now compiling some very old and unmaintained stuff!"
-		ewarn
-		ewarn "YAPS with CAPI 2.0 support is actively maintained, but needs"
-		ewarn "net-dialup/capi4k-utils installed. We recommend this"
-		ewarn "version, since it can still be used with an ordinary"
-		ewarn "modem (that's what you probably wanted). So just add 'capi'"
-		ewarn "to your USE flags to get the new and maintained version."
-		ewarn
-	fi
-}
+if use capi; then
+	S="${WORKDIR}"/${P}.c4
+fi
 
 src_prepare() {
-	use capi && mv -f "${S}.c4" "${S}"
-	cd "${S}"
-
 	# apply patches
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}-getline-rename.patch"
 
 	# fix compile warning
-	use capi || \
-	sed -i -e 's:^\(.*\)\(<stdlib.h>\):\1\2\n\1<string.h>:g' scr.c
+	if ! use capi; then
+		epatch "${FILESDIR}"/${P}-string.patch
+	fi
 
 	# if specified, convert all relevant files from latin1 to UTF-8
 	if use unicode; then
@@ -60,10 +50,13 @@ src_prepare() {
 }
 
 src_compile() {
-	local myconf=""
-	use lua && myconf="${myconf} LUA=True"
-	use slang && myconf="${myconf} SLANG=True"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" ${myconf} || die "emake failed"
+	emake \
+		$(usex lua LUA=true '') \
+		$(usex slang SLANG=true '') \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CXX="$(tc-getCXX)"
 }
 
 src_install() {
@@ -71,14 +64,12 @@ src_install() {
 	insinto /etc
 	doins yaps.rc
 	keepdir /usr/lib/yaps
+
 	doman yaps.1
 	dohtml yaps.html
 	dodoc BUGREPORT COPYRIGHT README yaps.lsm yaps.doc
 	newdoc contrib/README README.contrib
+
 	insinto /usr/share/doc/${PF}/contrib
 	doins contrib/{m2y.pl,tap.sl}
 }
-
-pkg_postinst() {
-	elog "Please edit /etc/yaps.rc to suit your needs."
-}