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

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

3 files changed, 29 insertions, 29 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index f81ca2b4e3c3..6bb5a501f7b1 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tomoyo-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.12 2013/04/06 01:07:32 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.13 2014/11/23 10:09:06 jer Exp $
+
+  23 Nov 2014; Jeroen Roovers <jer@gentoo.org>
+  tomoyo-tools-2.5.0_p20130214.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #528358).
 
 *tomoyo-tools-2.5.0_p20130214 (06 Apr 2013)
 
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index 6b0d159d6c74..bd65c3b0197f 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -18,23 +18,13 @@ EBUILD tomoyo-tools-2.2.0_p20120414.ebuild 1610 SHA256 da51940c4abd6b8f0c53c234e
 EBUILD tomoyo-tools-2.3.0_p20120414.ebuild 1743 SHA256 87c76f08964e5ee81ead7eb8d0038b92d94d52ea0858db4c9584a7aadefce46f SHA512 0bd1c880b5004485369f7a9807381abb772960ce89768f42cbdb47b09f7839783e2ef90f673c45e0637a80af2b1dcd1f1473d3ff3fe5f183aadd877c06e56ee3 WHIRLPOOL d5e6c5d8ae43434ed3f44727b8fb42d7ed8da9cab89177188b914152dfd9b55e7f624a99cb2a82c9ff437729771a3afea3b893c07f82f185159d9e468f3e1050
 EBUILD tomoyo-tools-2.4.0_p20120414.ebuild 1449 SHA256 d50210ec1fbf8df1496971d94462fdcd3883111a8ed5e8b157502eb255585d95 SHA512 6ed707bfe6a463c5ae3894eef22f5f59bc52a04c1fbb2812ecb640e9f3ec31bcf3e3bb3dfd3aa9f816183e9a97e5dce7f6bc7fc8e6f6a34ebe413a7ea0f68699 WHIRLPOOL 5702bf3c05efe02fd51809aeb51bcf30abf0d315055cb6d0b1637b7f1cb648eb0735eb890b8e18a5bff4a1098a544a0a8d824277546039c7226f3cdea30cc1fb
 EBUILD tomoyo-tools-2.5.0_p20120414.ebuild 1432 SHA256 85bdf2e7c473771debde9627284ce33ec8da3e408a4eedb13a84d68873934d51 SHA512 45d3268c1aea2929ce3c3ca9452b1c59efd07aa7e0e9bfd8b56fa9baa1f63657f2273628bd04fbcbe0dd18638d042c84dc77d7ecbb9c6f5f080d994725805d41 WHIRLPOOL 569b76c9713e0ce7829462c68c003de772dc758e9247d0f8a87fe89933b9a88615225354b1a0b33d02ae7b481211e45991d3f9811d29f61c2a3c876c7035e844
-EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1426 SHA256 606f4d296e055498415e88f0ca9d2c1cdc6b91dd3a57d152619b7b55d359d257 SHA512 906f81eaffe0e193aee27847898cda7f46a78d8186989fb49e50d2d24d6b0442f2103ea8c71c5af2526a21ad60c3e023aec413e18839ad9cf030acedf483d6f6 WHIRLPOOL 264170cd9289821ecd27b6e701d6fb5f9c15b9a40c70cba3eda046d2a174668be8cb50b71763118cbf46610935cb9e8576e3de1bec4b361699f280ae0a8e92d7
-MISC ChangeLog 4060 SHA256 e76b697a89f51bc2ead9ac4045bd34c1cf01f1ff853f5e225ffcecb3cbfdcdf9 SHA512 2ad75484c712e5b3d045654fb6ca01e252421ab32d47b6546b25b11637e82101bce147f28b8dc97cb09a2b60ac00ffcaeab2130b2d074798cb7d2fb29d0866c6 WHIRLPOOL d914e9a52cfb97b218ce2e0a2a12efef31e004616b71bf7c9ceab6a93874c8a2ae217ba123346b3172ba3a4520675022de45b7663225d060c61171f13eb4147a
+EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1558 SHA256 5939f534c4bb03feb3abc711991cd43edfa02654da707c31fed3d16734d44630 SHA512 8c25a62fa6df0213a2a754c44fd41a9b296e0f2117874c4edcbf0733b20c2f640ad22de127745be1fab99d402d19d16947f6c1f4254c6abf77b3475d147ab5b4 WHIRLPOOL 02611e3c2adb0412dd8535a005cef8f0468ebda02219ab156d6a34846846807b7f9b7816bf0eae0434286a526732bcd29b428fdbbaf98a8d92a07b6981fd1510
+MISC ChangeLog 4207 SHA256 b2ff973f103c21cf8e1a627013fb683e5778cee60d04db366f88e970129ae928 SHA512 b46b2fe9a6ef4c60a40ff4659502b1b5093e77d341b4f2b43ab72581151b6c754e83a7c80ab06d12b28275a453344a1b08b5c051062cc75571fd32561c06bd87 WHIRLPOOL 590495b9215561220284d2c84cea16662aff96de7285a0c473fd5d4b766a2d6c1af95606ba516eb916be6e30a006451816b8f2f724f7a2fad5e9ac6862a5ffa4
 MISC metadata.xml 199 SHA256 cb9dd8161648bc46dbdaa6d37977c0e1c744c6b837dec81af95c9ebdb12534fb SHA512 863b0da90a846f120e430d307ee0c6c3644db7060c3129d300aba5433216dbe3392c61c872055d70798bdd46edcd69f9f80218c75cc319c0f683ded8bf6ee962 WHIRLPOOL d92ed163f816e4fe7d17ef477a05df717cb82365527d5396b3b1cc2aba25d091761da9f52c853e178310421ceda1dfa0e2074d7613f5da7918a7b1a4f9d888fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJRX3VVAAoJEDYO1FT4VRUUCR0P/115M9GVcA8MSwpKvHULquJF
-c2f6cNa11iOoLFr9PWkwvA7Ou3VtWQX5wGTbXIrr9VxW7Ip/9U9vVx2FAvzg7EGn
-XGoRlYuna3hix8M+i41b+XhouI7g0f7lawbOhQt0gz2z/1mj0RCXL4DOqIpeSGJm
-BwOMKragydL9j2ZFdOQFH36Dn/8Joq/tQdRCp6PCRI3d6SZ424rc7/BFGcy0GEJ6
-2+0RGPtxrPVNcoTr4VENIrK9+S5PnlKPPac15oq642MdmxsENibw/xW6oVw7nqMB
-zcQBsO7YsiVGfIwIeOluX4kzlCskgVGciFhcgP5IMvsAFf6zlk62Nh5Xy+TxIDg7
-G9tdifLfzkdTVj/RK+YyhLletnrl4ENfou7BQDutPBGj0SwK/pVOCaHBa58vhIHo
-IFPSX0xaNIPETG527C42ks7csnlRSlU0dD86zwz6M/uFqMG2azgZ+/sPyZae3w6j
-eJTiZd6OUL8n5RwWYF4V+WhJrIM+chghi8ZZ8blnXZONfx+afJpYqbLNYxbXYTSc
-0/dvoderVhVnP5Bghg0jwcuJNzmb2TmEh7xOGqBBY9lSmq+dMVxMgUSCQSx01nWB
-jMjw5XL4Q7qWb0twF7JGFCpBX6rGoXYE6Uieu83ALOL/eYzS4LGh9zxLtBzqMUup
-+cq98ZjgvRaVAlsYiUfN
-=j4Kb
+iEYEAREIAAYFAlRxskQACgkQVWmRsqeSphN8aACeIyhRXb+xsKHAUtY+hpwYnyQP
+B9cAn20T17bTHOhL2JzS/HC2RYEPEV3Z
+=U8SB
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
index b739320a385e..e1fb0036cee6 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild,v 1.1 2013/04/06 01:07:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild,v 1.2 2014/11/23 10:09:06 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils multilib toolchain-funcs
 
@@ -14,10 +14,11 @@ SRC_URI="mirror://sourceforge.jp/tomoyo/53357/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
+COMMON_DEPEND="sys-libs/ncurses"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
 	!sys-apps/ccs-tools"
 
 S="${WORKDIR}/${PN}"
@@ -28,19 +29,24 @@ src_prepare() {
 	# Fix libdir
 	sed -i \
 		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		Include.make || die "sed failed"
+		Include.make || die
+
+	# tinfo
+	sed -i \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \
+		usr_sbin/Makefile || die
 
 	echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}"
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	dodir /usr/"$(get_libdir)" || die
+	dodir /usr/"$(get_libdir)"
 
-	emake INSTALLDIR="${D}" install || die
+	emake INSTALLDIR="${D}" install
 
-	doenvd "${T}/50${PN}" || die
+	doenvd "${T}/50${PN}"
 
 	# Fix out-of-place readme and license
 	rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die