Fix build against sys-libs/ncurses[tinfo] (bug #527590); Drop old.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

5 files changed, 27 insertions, 40 deletions

diff --git a/app-editors/moe/ChangeLog b/app-editors/moe/ChangeLog
index 351a0db10e42..7dc13874a1ff 100644
--- a/app-editors/moe/ChangeLog
+++ b/app-editors/moe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/moe
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/ChangeLog,v 1.7 2014/10/11 21:13:41 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/ChangeLog,v 1.8 2014/11/02 22:08:35 zlogene Exp $
+
+  02 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> +files/moe-1.6-tinfo.patch,
+  -moe-1.5.ebuild, moe-1.6.ebuild:
+  Fix build against sys-libs/ncurses[tinfo] (bug #527590); Drop old.
 
   11 Oct 2014; Mikle Kolyada <zlogene@gentoo.org> moe-1.6.ebuild:
   Stable for all
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index ad68211632bf..71c5679460f5 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST moe-1.5.tar.gz 94386 SHA256 fa40d611fb36dd2145bbec5d35258be94247963cd6ec106395c87421007a0a43 SHA512 7f5abbfd3f5701d31f148d52bdbd06d01cdf08865c601bcf342b37210981b244519b4a12c40f4f6da887ac48e497287d43255771f259432ac1f30136ec4c1061 WHIRLPOOL fddd475386b260e3e2b0b7b712cf5b8210aaa46cad8b16ce9effb0fd5a7f146360876f387621c1f2b8c16b4f83d55a0cdbf2bbc5d8b06d2a5668d1070de16169
+AUX moe-1.6-tinfo.patch 355 SHA256 ae8d50c536c0aa7c093ad19a90cacdc4e4fdb197969ad54452ac411eb4b0ec15 SHA512 b3b93895eb5be95d18e5b96a8a13157f4d43397e834f15023b2631bc87d8e30c6189328dfe034fa4152b4fd77f1feb5972e8d30af9622099489f725f886429c3 WHIRLPOOL 5a608392daf74aac7ce83045530db5080523af6c7738415a2a978ae2efba72509d41b88f39627be773b005d3e37c18417f629e1606cb0eb66a023a87b686a010
 DIST moe-1.6.tar.lz 75108 SHA256 8cafd9c97b40ff002b4cb66f63eb149f5fd9b9b964c5b6306458d0a68f89dcb1 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b WHIRLPOOL b7e55d187185f9eccea731619f4a6c4816125b2514eec68a202d00c33efb687945f025ef45ad5c49af67719486283b35a5f4639f476f86be7c5f9d58580f31ae
-EBUILD moe-1.5.ebuild 691 SHA256 8070cf5ec2bda25b1dd0f1a95cc5c4a15cc4c896643d266fd6b38d4f8e60e8eb SHA512 464e15cb9227c802cd1af33d22357be4db6e0134b16e960339b717b4306f810b6f8dfff23577ef6d6272efe08b5540815059bb973263aa0880b9b6957a2205ba WHIRLPOOL eb8f63c86f97245e019bbc26e4e6b15dd484273b2178a8c426516500a6f220d205c7ebf782ebdb9d1f2ab86d9ecb757e132f1fa3eb66378665434e86f8153ae9
-EBUILD moe-1.6.ebuild 730 SHA256 1431575a96f68509682835ee25927a62066c0ebaa9e4219fd5cba8aff5cb72fd SHA512 ef13fc2cc1256dde4287831ff5a50ecd8c17877cd4f012e1203e5a386ab8401e26405b2d4c0718dc07be5060f98e0303650bde7ff1435f867f36020972bdc99a WHIRLPOOL 5402e7f23374e4685e5cbc8db23ca5b6ba51fec75c4d2b87211ffbbc7f951dd512f29021464ecc436bd1964def79d072c9c7370992050d624c15d5302c2f5924
-MISC ChangeLog 1067 SHA256 118dff8e255482c311c54f20d018cdfeac6a478ef7653050367e41aef796b199 SHA512 acd5bb607bca88bb5bd70eeb959eaa2b78c6a4cce5ef16142e5dcbf8587554bc54f4967942accbaf7989d92e65e339df13886f5ce7f248fc537eb5a53504bc8b WHIRLPOOL 0d77cc7cea3e6de066317e3c4469eec789bbe627341ad7b56e763d80fb951e36cfb2073d89d32f277bd7932f5d2914f08ede3bdf2f2b2ea60609ba84d8483cd8
+EBUILD moe-1.6.ebuild 770 SHA256 cd65b078ab08f6f64fbf3a38168ac41a65bb47a33360d738be9e86d8f1a91122 SHA512 9fd04b4d1176156e52d48126952da4167ccf42794fcf6d9f737d2b2bcfe8b773d2b88901db3c903cd5c4f488233fe723f75412a062b4395383bd5b2ec33c973f WHIRLPOOL e04cc09c65b8f157b569fffd61440b9a622d235fb1731feda9610f8d76f85c53d673dcd7faf76f5d950731eee44fb05899d0c21dfefbbaed3b340acda0e958b2
+MISC ChangeLog 1250 SHA256 609791bcd36200954ff6833bc53815fa78bdd06526b16a00dc38f982e5a017f2 SHA512 8d77aedfaa7fae0fa62ce4e42e5cd4201797ab0cb13b25f13682cb14306537d66bda59ba27d24bc02153e83acb5b42aed3b6511846a119c251d004fee1557295 WHIRLPOOL b1dfb3bcf04462062108c4e1a22c99fc7238dcb9b8c2041ea66ee02c06dc5bf30ccf9e9386e6eb79a2d3754de46790a712289c862ab5b7667960fe754d735830
 MISC metadata.xml 327 SHA256 9ce81471fc97a3518c41227e76f281105d88b6cab340fcea51999764d5203f37 SHA512 172dca345d1dcec9a911e3d99a062179ed3c1273fe4d2b7e88489d4a6248acf66475a70734fcd205b5011a628e392fa31ef2e984009116d12d858cd82952d069 WHIRLPOOL 9ec04acebcd4281f63b08acc4e67b99533363cbb858860ada0df43d971689eb9846dd6e39fb66f93342a8be6c22143d534a5bdf07957542dde35649b0910c3cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlQ5nTsACgkQG9wOWsQutdaaGAP/ZqBdxUTeno+59poqc6CRY5TX
-Nszo6NSOoe2vimu/POahUkphyw4a1p1M/FnjX6wS4ytIcct5UVwXzxUfZzmOjB26
-4JleYz2DgjrNPkCSm4EUNH38dKkypiWijEZs8vIJpggELUVxERcjncrG20mi4pc4
-BRYDUjBKAPFhR8FmpxM=
-=YXt7
+iJwEAQEIAAYFAlRWqxQACgkQG9wOWsQutda8xwQAmkn7B3GNMI950DF7sGEMH16N
+XNLtWVOr2N9Qz4KlgmHCunHaPEbsU0iOfrf/6HdGXJUPjfPPZYHv5JYbKTJbGagu
+rB8RfqubH0bpGMMkWI9V37TgTj8BX1ljaaY1rEhrt2n8IkuinxmHeDzzPNmZGVHX
+ZPvJLJ0KWp+EKJm6AHk=
+=ZGUS
 -----END PGP SIGNATURE-----
diff --git a/app-editors/moe/files/moe-1.6-tinfo.patch b/app-editors/moe/files/moe-1.6-tinfo.patch
new file mode 100644
index 000000000000..916f1935da0d
--- /dev/null
+++ b/app-editors/moe/files/moe-1.6-tinfo.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2014-11-03 00:33:57.152593136 +0300
++++ Makefile.in	2014-11-03 00:34:21.121592519 +0300
+@@ -4,7 +4,7 @@
+ INSTALL_PROGRAM = $(INSTALL) -m 755
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_DIR = $(INSTALL) -d -m 755
+-LIBS = -lncurses
++LIBS = -lncurses -ltinfo
+ SHELL = /bin/sh
+ 
+ edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \
diff --git a/app-editors/moe/moe-1.5.ebuild b/app-editors/moe/moe-1.5.ebuild
deleted file mode 100644
index 90b2f4aa4b9a..000000000000
--- a/app-editors/moe/moe-1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.5.ebuild,v 1.4 2013/06/07 13:05:32 zlogene Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="http://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	tc-export CXX
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	epatch_user
-}
diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild
index 3dac40c10c37..cbf764efd7bf 100644
--- a/app-editors/moe/moe-1.6.ebuild
+++ b/app-editors/moe/moe-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.2 2014/10/11 21:13:41 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.3 2014/11/02 22:08:35 zlogene Exp $
 
 EAPI=5
 
@@ -28,4 +28,6 @@ src_prepare() {
 		configure || die "sed on configure failed"
 
 	epatch_user
+
+	epatch "${FILESDIR}/${P}-tinfo.patch"
 }