Remove unneeded dependency on sys-libs/ncurses.

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

3 files changed, 22 insertions, 25 deletions

diff --git a/app-shells/esh/ChangeLog b/app-shells/esh/ChangeLog
index 9ddac6a9c840..6f81bc5036ff 100644
--- a/app-shells/esh/ChangeLog
+++ b/app-shells/esh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/esh
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/ChangeLog,v 1.29 2012/09/07 13:28:02 johu Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/ChangeLog,v 1.30 2015/01/16 11:20:02 jer Exp $
+
+  16 Jan 2015; Jeroen Roovers <jer@gentoo.org> esh-0.8.5-r2.ebuild:
+  Remove unneeded dependency on sys-libs/ncurses.
 
   07 Sep 2012; Johannes Huber <johu@gentoo.org> -esh-0.8.5-r1.ebuild:
   Remove old.
diff --git a/app-shells/esh/Manifest b/app-shells/esh/Manifest
index 6d77ce6559ab..80e139d6829b 100644
--- a/app-shells/esh/Manifest
+++ b/app-shells/esh/Manifest
@@ -2,17 +2,13 @@
 Hash: SHA256
 
 DIST esh-0.8.5.tar.gz 214040 SHA256 8801c8ffacc07240da20425728bd69897fc26f07839e7e8d5ee9059097961744 SHA512 2473cc2418f70533136305f47dfe59bee560206a8b58c080e2113297dd82483e867937bda1b015069a7220552b4d03346a3b71026a24a2795b0b499e355490a0 WHIRLPOOL c75b59102d6b4bfdc64802016b1af96598d541d75efeb5e255a3d61a4245b0980b5e7d83b453f47eb366aab26a832870e6049cf52ad912e68aaf73b577f22114
-EBUILD esh-0.8.5-r2.ebuild 1250 SHA256 40f45128d1a96114d10e05bc0761dbbf91b30fc6f3f0815b6c9e765dde1e3703 SHA512 52dce1311e11ddcad54ef0c6596049118ec38828c8c11107d2c778400d1642234dd854a3c94d1eb31e6433e5313e00aae3d0e1e76e8c4e89fd77062ff9494093 WHIRLPOOL 6c6dcdddcc3e116ede602363fd34c8fb83952d4df1f7a0d6a643b527b1e263b544f73623a86dd6138d0b97df1c03c0f871c9e2133a22addd0edc0a6bef928892
-MISC ChangeLog 3466 SHA256 8722eab3fc2d2d7e95c5b9d0475731af42f09d40b2368723a3d3fef9ee1dec61 SHA512 b8276bea5033641e591e1d0f69ef45b345ec07be93318e58161b0d2405508f8b4dc96d550392d3884e8a80e760061398f2a1fbad3bac8b271aeb525d44d1439a WHIRLPOOL 9faf17317121fe0616d1a6f185039c7bddd67b5adc6552a1c0960b98ef6030a86e36d076b13a6f7583aad6ec9b97a6d47ce64f1c76dadd4f634ae0f74782eaaf
+EBUILD esh-0.8.5-r2.ebuild 1141 SHA256 a289b8936d28f99acff40e5b61aa42aa0e00fdf4942765a3d8dcc30566136a0e SHA512 4998a1b54ebda2852c16cd539a90d12cf98d7427500ea5c694df80046bc97dd0bf7cde3505bc9c0d887213831b42b1bf2aa17d343db1df514e2587c49f88ff14 WHIRLPOOL 7169ff76d79b47bf7de43f40775bbadd7f931410de2e50e36df0e18c1195bb3c6a23c1180402b387ccb23e0e80c89b4540e46da20d441e9128af5f5b5abd8b54
+MISC ChangeLog 3584 SHA256 03d75ca794c945c48c90d634d52ffc4421d56d8db46e94b4762d6bc580e44d5f SHA512 c113d26e8ea619631695ab0bc7587848ca50ed47abc4164b28c5a4db55bbcaf324bb3643fe75ff0a3475c2860d78f4374a5692e77f125df0b1f391082ba3fbfc WHIRLPOOL 665f50a8881885865a996b1d7e99d32a67d1aad1567cba03fdae341da86e111816cc0f35ce90bf1d9d7e8712bd0dc45f676e5961c6c7807d5eac826e79e57cfc
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQSfZnAAoJEO+t9ga+3I3aCYMIAIhHCx4WN/t195+LFY+M2OuJ
-w+q1AB8aHF+jd6RficwQpilbZFMgFYU1GqL27g5qjtleuna4SNl02R4F2gVtmFvX
-hSCN5gM7rboTEzam796DMkgOLJrntJkA8LJn5Rh3xg4q/hk53F7IPtovwbW5oZI8
-vE++kr95E3wgXDGcODv6zZX05SbNtLva4ImMtlhIjMh3HgnuhhiHQbcJhcOn1Kuj
-Y4APmfrdbhXrdz9qRXXHlRKERorKlMedBdQ3/R9Qjq4keVFdcCYjWCrRPLwCvI6s
-dWVvQ1wzsrhyu7OAfAI3JQiOAw/0W7GG4xPh5+VXloFTbRVGn9oP5oFhWSEbzSo=
-=sSJf
+iEYEAREIAAYFAlS48+QACgkQVWmRsqeSphP/lACfUaN/C0fPrIEpcNVtAMyX5SmO
+OyYAn0WUmpBrL2XDpt1aPjUeDcwPfNSC
+=lR3H
 -----END PGP SIGNATURE-----
diff --git a/app-shells/esh/esh-0.8.5-r2.ebuild b/app-shells/esh/esh-0.8.5-r2.ebuild
index 297f20176e6c..2ae349f3e3ca 100644
--- a/app-shells/esh/esh-0.8.5-r2.ebuild
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r2.ebuild,v 1.4 2012/09/07 13:26:57 johu Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r2.ebuild,v 1.5 2015/01/16 11:20:02 jer Exp $
 
+EAPI=5
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A UNIX Shell with a simplified Scheme syntax"
@@ -15,37 +14,36 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1"
+DEPEND=">=sys-libs/readline-4.1"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	emake clean
+
 	sed -i \
 		-e 's|-g ||' \
 		-e 's|-DMEM_DEBUG ||' \
 		-e 's|^CFLAGS|&+|g' \
-		-e 's|^LIB=|LIB= -lncurses |' \
 		-e 's|$(CC) |&$(CFLAGS) $(LDFLAGS) |g' \
 		-e 's:-ltermcap::' \
-		Makefile || die "sed Makefile"
-	}
+		Makefile || die
+}
+
 src_compile() {
 	# For some reason, this tarball has binary files in it for x86.
 	# Make clean so we can rebuild for our arch and optimization.
-	emake clean
 
 	use debug && append-flags -DMEM_DEBUG
 
 	emake \
 		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin esh || die
+	dobin esh
 	doinfo doc/esh.info
 	dodoc CHANGELOG CREDITS GC_README HEADER READLINE-HACKS TODO
 	dohtml doc/*.html