Fix building against sys-libs/ncurses[-tinfo] (bug #531764).

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

diff --git a/app-editors/moe/ChangeLog b/app-editors/moe/ChangeLog
index 7dc13874a1ff606cbb6c1fe2064d3481508dc490..3e23dd97f372c93ff8062409c8c21bba739a9f55 100644 (file)
--- 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.8 2014/11/02 22:08:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/ChangeLog,v 1.9 2014/12/06 08:21:12 jer Exp $
+
+  06 Dec 2014; Jeroen Roovers <jer@gentoo.org> moe-1.6.ebuild,
+  files/moe-1.6-tinfo.patch:
+  Fix building against sys-libs/ncurses[-tinfo] (bug #531764).
 
   02 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> +files/moe-1.6-tinfo.patch,
   -moe-1.5.ebuild, moe-1.6.ebuild:

diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 71c5679460f5ece57ea87a8a0b80bf498b649fda..fc41efee42da687f1cb53ec4acb6fff05b1b811b 100644 (file)
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX moe-1.6-tinfo.patch 355 SHA256 ae8d50c536c0aa7c093ad19a90cacdc4e4fdb197969ad54452ac411eb4b0ec15 SHA512 b3b93895eb5be95d18e5b96a8a13157f4d43397e834f15023b2631bc87d8e30c6189328dfe034fa4152b4fd77f1feb5972e8d30af9622099489f725f886429c3 WHIRLPOOL 5a608392daf74aac7ce83045530db5080523af6c7738415a2a978ae2efba72509d41b88f39627be773b005d3e37c18417f629e1606cb0eb66a023a87b686a010
+AUX moe-1.6-tinfo.patch 375 SHA256 a728fcb78a41007bc91f1a1fccf5dd4b5157ca8716f1ded70c2dba653406b43f SHA512 38e64527e1970f8586ae94e15295d79fdb427daa21e079c6bf6434e515285bc3de35cb7d966eecfd0cbc33b73bcc1550cdd8d29646c373e710553f26f32ced5b WHIRLPOOL 347498c69b91959e930d59ce952863b310648558150f387fd993076414fc921831e0f0b6120a24084a56eacd188ec52024912af60f9e458ce0bb67e013916219
 DIST moe-1.6.tar.lz 75108 SHA256 8cafd9c97b40ff002b4cb66f63eb149f5fd9b9b964c5b6306458d0a68f89dcb1 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b WHIRLPOOL b7e55d187185f9eccea731619f4a6c4816125b2514eec68a202d00c33efb687945f025ef45ad5c49af67719486283b35a5f4639f476f86be7c5f9d58580f31ae
-EBUILD moe-1.6.ebuild 770 SHA256 cd65b078ab08f6f64fbf3a38168ac41a65bb47a33360d738be9e86d8f1a91122 SHA512 9fd04b4d1176156e52d48126952da4167ccf42794fcf6d9f737d2b2bcfe8b773d2b88901db3c903cd5c4f488233fe723f75412a062b4395383bd5b2ec33c973f WHIRLPOOL e04cc09c65b8f157b569fffd61440b9a622d235fb1731feda9610f8d76f85c53d673dcd7faf76f5d950731eee44fb05899d0c21dfefbbaed3b340acda0e958b2
-MISC ChangeLog 1250 SHA256 609791bcd36200954ff6833bc53815fa78bdd06526b16a00dc38f982e5a017f2 SHA512 8d77aedfaa7fae0fa62ce4e42e5cd4201797ab0cb13b25f13682cb14306537d66bda59ba27d24bc02153e83acb5b42aed3b6511846a119c251d004fee1557295 WHIRLPOOL b1dfb3bcf04462062108c4e1a22c99fc7238dcb9b8c2041ea66ee02c06dc5bf30ccf9e9386e6eb79a2d3754de46790a712289c862ab5b7667960fe754d735830
+EBUILD moe-1.6.ebuild 802 SHA256 61cac7815cbc9b91f939eb00c9580523298e54fd3f67fc5b0314a882e1679c49 SHA512 65ba2b248e5c85ab991e410566b427ec1e678ecb98d98d730ce0cfe5459c057126eb082f41f36c8754953c5e6ebafec94219a9bb4db697fb8599f3087794b021 WHIRLPOOL a66ce6b60860e8f1ac0c955aa0033b023ed985d09c5422bc6d483fb372f7926c37b69980bd303ec7344e511faa10ab6686583c2d73ce58c4f8f72f774afed991
+MISC ChangeLog 1402 SHA256 11958f7e7459bdf688a23bc4de18792a93f7dd431688befefc53b50f9df1ba61 SHA512 6df7919c3f64b81c417e438ede4c36339c5ba30fdf746fc25b9a79f0073ec02b5d96d8eeacce54d3abc15d12ac354f2968c0101c2026b92c485c38523fe8b2a2 WHIRLPOOL 17e7653073cd23795dbcfe6e302b4a20c2694b69e87228b16238970f1d4d2be30281528f10edeb708dd7ae8fc65a876e62232684e15ef1107c97c5b26e4c577e
 MISC metadata.xml 327 SHA256 9ce81471fc97a3518c41227e76f281105d88b6cab340fcea51999764d5203f37 SHA512 172dca345d1dcec9a911e3d99a062179ed3c1273fe4d2b7e88489d4a6248acf66475a70734fcd205b5011a628e392fa31ef2e984009116d12d858cd82952d069 WHIRLPOOL 9ec04acebcd4281f63b08acc4e67b99533363cbb858860ada0df43d971689eb9846dd6e39fb66f93342a8be6c22143d534a5bdf07957542dde35649b0910c3cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlRWqxQACgkQG9wOWsQutda8xwQAmkn7B3GNMI950DF7sGEMH16N
-XNLtWVOr2N9Qz4KlgmHCunHaPEbsU0iOfrf/6HdGXJUPjfPPZYHv5JYbKTJbGagu
-rB8RfqubH0bpGMMkWI9V37TgTj8BX1ljaaY1rEhrt2n8IkuinxmHeDzzPNmZGVHX
-ZPvJLJ0KWp+EKJm6AHk=
-=ZGUS
+iEYEAREIAAYFAlSCvHkACgkQVWmRsqeSphN7FgCfSBJQMzcpg94PtZN8tH6TThLI
+05gAnimtnv+mWJTW4n1A5T9GthuQZ2ut
+=9WM/
 -----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
index 916f1935da0d0f982a0adb2981c89870e9d8f68b..6b91460e8e53e33db9a3f0e3b675fb9feb817ae1 100644 (file)
--- a/app-editors/moe/files/moe-1.6-tinfo.patch
+++ b/app-editors/moe/files/moe-1.6-tinfo.patch
@@ -5,7 +5,7 @@
  INSTALL_DATA = $(INSTALL) -m 644
  INSTALL_DIR = $(INSTALL) -d -m 755
 -LIBS = -lncurses
-+LIBS = -lncurses -ltinfo
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
  SHELL = /bin/sh
  
  edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \

diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild
index cbf764efd7bf3ec3d69b38f69fa8709df4e50e1d..414217cfdbbbc00a968cf175558daf9c4a0a45bf 100644 (file)
--- 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.3 2014/11/02 22:08:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/moe/moe-1.6.ebuild,v 1.4 2014/12/06 08:21:12 jer Exp $
 
 EAPI=5
 
@@ -14,13 +14,17 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 
-DEPEND="$(unpacker_src_uri_depends)
-       sys-libs/ncurses"
-
-RDEPEND="${DEPEND}"
+RDEPEND="
+       sys-libs/ncurses
+"
+DEPEND="
+       $(unpacker_src_uri_depends)
+       ${RDEPEND}
+       virtual/pkgconfig
+"
 
 src_prepare() {
-       tc-export CXX
+       tc-export CXX PKG_CONFIG
        sed -i \
                -e "/^CXXFLAGS=/d" \
                -e "/^LDFLAGS=/d" \