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

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

4 files changed, 38 insertions, 9 deletions

diff --git a/dev-lang/blassic/ChangeLog b/dev-lang/blassic/ChangeLog
index 8c2eb7d522de..bc3f51950dcd 100644
--- a/dev-lang/blassic/ChangeLog
+++ b/dev-lang/blassic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/blassic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/ChangeLog,v 1.32 2014/07/04 08:29:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/ChangeLog,v 1.33 2014/11/10 11:07:43 jer Exp $
+
+  10 Nov 2014; Jeroen Roovers <jer@gentoo.org> blassic-0.10.2.ebuild,
+  +files/blassic-0.10.2-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #527112).
 
   04 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> blassic-0.10.2.ebuild:
   EAPI=5; simplify
diff --git a/dev-lang/blassic/Manifest b/dev-lang/blassic/Manifest
index fc1035f65654..317230b41da3 100644
--- a/dev-lang/blassic/Manifest
+++ b/dev-lang/blassic/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX blassic-0.10.2-tinfo.patch 398 SHA256 066ba7c35ff8af4868859e445d873301e4389d884191492bb7d4b381ada73cfe SHA512 362e5b0c1f3495b08ea15e78259a42eecc93875fb646c6cc198b89a14802e5bd0258b401ef2875c38f298d28247dcfc8971da916e2b0e89784302a1bd14f14c9 WHIRLPOOL 612d7710c86c3e7f44e3fefbd02383d1f04f12bcc921a39dbc08d9f18b1c484c825394e64615885438eb247a94249ff724656ec863896b68f49a6a5452862bcb
 DIST blassic-0.10.2.tgz 361603 SHA256 b0ef334d5c1c710643f1dd11e651ce091e7059aa5e9895b547dfa86c3638bdfa SHA512 20f7210fd42ff58e11d7238aee37c21f18b733faf11edeb1d1a3e78c8fb524e37f0c871a2ab6b6608daaf593c4b4e8da4e2f86cddb8ad5e23905b0ce081feffa WHIRLPOOL ba571518104e319c47a341654f241e0b53ece0b614f200a824440fd0e67795a375d4f1703ccaa42ac8c85572c0ee6b0d3c980379094bc836fc4d866e2678cf1a
-EBUILD blassic-0.10.2.ebuild 744 SHA256 7796b50c4a2b96b4461b471e75503c2a1e180be910e93f7784119641a9c7b908 SHA512 57f5ca21b58ac799a0aee559bc4c3af765bacfaa7fde96c03bc2a11fde6331ba35fcecf2b6a123462c88bc00199606501abaafa24c8ff463f69c741affc97f06 WHIRLPOOL 7debf0483bfefd788e889fb4300e518159e4ab0211dd9ea852c9b84efc832213b2786a1d56f41b106f3de9fc190e8debde364fc6b751f4fa380941ab994c89aa
-MISC ChangeLog 3751 SHA256 0f425c74566d310d390a4116f902a66ef7bae1e0a5be2af880bee53cbc338c53 SHA512 b9ec85ca184d6480f56d513de89138d9b8cbc2ae0549b9087c10c9e4282a8b1c3f99eac10fedb75372fdd5e1360316a6132700a9c87b9f20de153a3372fc03dd WHIRLPOOL cdaa138d3acb7a450fd4085fb93cf4d1fb3f62cf2ae2045d014c8b4269f5f8cc20f44a471fcd35974fbed1f50fab57325268c5541b4d279795a913691e2c92e8
+EBUILD blassic-0.10.2.ebuild 773 SHA256 f9f0abe82f50bcca5b076d092d79cffc6e9c1c353246b39ac5b14317e7a59555 SHA512 f80c0e37f42b26aeceb755c99f932b2d9b97339213e5258e62f3ec9a664df11bf2bdf0b1454a9ef06f884b858891246aa301e5b88d1d4799e34a5e846fbaa3d3 WHIRLPOOL 2ecfbcaaad46c3cfbe1f0649de09bc91e16bd4dc582c1b450d67b176c738c8deadab80f7c703fdd419d7c0a82004f084eb0188d9cc5bb68665139235cfa099c8
+MISC ChangeLog 3915 SHA256 73d892dd91f7e189c933d165f7e0bbf4dd64256d612435b6f0abf1cd094b9d4b SHA512 8b39d67f287b4657df7fc37971bf70132b03a58bb781a3aa593daae6e4c9f4dedc10aa65ab82fd327329863685b0518333fea64156346549a36c487c5a2f9554 WHIRLPOOL 74f78a902b67b45d64c35b36ece9d12c504ca13eef4c05aa60c79f3fea0d15574152fa97698da8c484621b1dc66fe0773d9c0852c1440b769a1002c9133f75f7
 MISC metadata.xml 544 SHA256 ce36b91a2a40f677847566ec98a43ffb4f904415f1b60632464180e655c43917 SHA512 3428c617f54b4ed808cb1cfad894415ef7bd408f0e8e4d5323f0ef4d1a6e7126ac6bb43ea3601dabaff7f1368ffb80d3322477e58b557e5ef99b735f80d3794f WHIRLPOOL 1e94343f84171c4b6a53cafebf2efe045f8e6649290efbf07ae44698047c372faa5717438138ece060d428e4205f4b650c6bd81506b552288272fa9692ee23f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRgnIAACgkQVWmRsqeSphMPwwCeL/zPgH1SoVyqqpcnreEL1eth
+22oAnibzYbuzYDXfK5PNOom8nUhaymHx
+=kQWZ
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/blassic/blassic-0.10.2.ebuild b/dev-lang/blassic/blassic-0.10.2.ebuild
index d9bc5c124c23..c25fe983a2b9 100644
--- a/dev-lang/blassic/blassic-0.10.2.ebuild
+++ b/dev-lang/blassic/blassic-0.10.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/blassic-0.10.2.ebuild,v 1.8 2014/07/04 08:29:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/blassic-0.10.2.ebuild,v 1.9 2014/11/10 11:07:43 jer Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="classic Basic interpreter"
 HOMEPAGE="http://blassic.org"
@@ -19,13 +19,15 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-svgalib \
 		$(use_with X x)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README THANKS TODO
-}
+DOCS=( AUTHORS NEWS README THANKS TODO )
diff --git a/dev-lang/blassic/files/blassic-0.10.2-tinfo.patch b/dev-lang/blassic/files/blassic-0.10.2-tinfo.patch
new file mode 100644
index 000000000000..3253532a6bc2
--- /dev/null
+++ b/dev-lang/blassic/files/blassic-0.10.2-tinfo.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -191,7 +191,8 @@
+ 			AC_CHECK_HEADERS([ncurses.h],,[ncurses_found=no])
+ 			if test "$ncurses_found" = yes
+ 			then
+-				AC_CHECK_LIB([ncurses],[tputs],,[ncurses_found=no])
++				AC_CHECK_LIB([tinfo],[tputs],,
++					AC_CHECK_LIB([ncurses],[tputs],,[ncurses_found=no]))
+ 				if test "$ncurses_found" = yes
+ 				then
+ 					AC_DEFINE(BLASSIC_CONFIG_USE_NCURSES)