jer 14/11/23 10:09:06 Modified: tomoyo-tools-2.5.0_p20130214.ebuild ChangeLog Log: Fix building against sys-libs/ncurses[tinfo] (bug #528358). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild?r1=1.1&r2=1.2 Index: tomoyo-tools-2.5.0_p20130214.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomoyo-tools-2.5.0_p20130214.ebuild 6 Apr 2013 01:07:31 -0000 1.1 +++ tomoyo-tools-2.5.0_p20130214.ebuild 23 Nov 2014 10:09:06 -0000 1.2 @@ -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 @@ 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 @@ # 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 1.13 sys-apps/tomoyo-tools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog?r1=1.12&r2=1.13 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ChangeLog 6 Apr 2013 01:07:32 -0000 1.12 +++ ChangeLog 23 Nov 2014 10:09:06 -0000 1.13 @@ -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 <[email protected]> + 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)
