jer 14/10/28 22:11:40 Modified: ChangeLog pal-0.4.3-r1.ebuild Log: Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug #483478). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.38 app-misc/pal/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?r1=1.37&r2=1.38 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ChangeLog 21 Nov 2012 13:25:13 -0000 1.37 +++ ChangeLog 28 Oct 2014 22:11:40 -0000 1.38 @@ -1,6 +1,12 @@ # ChangeLog for app-misc/pal -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.37 2012/11/21 13:25:13 kensington Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.38 2014/10/28 22:11:40 jer Exp $ + + 28 Oct 2014; Jeroen Roovers <[email protected]> pal-0.4.3-r1.ebuild, + files/0.4.3-ldflags.patch, +files/pal-0.4.3-pkg_config.patch, + files/0.4.3-strip.patch, files/pal-0.4.3-prefix.patch: + Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug + #483478). 21 Nov 2012; Michael Palimaka <[email protected]> -files/0.3.4-ldflags.patch, -files/0.3.4-strip.patch, -pal-0.4.3.ebuild: 1.5 app-misc/pal/pal-0.4.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?r1=1.4&r2=1.5 Index: pal-0.4.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pal-0.4.3-r1.ebuild 20 Nov 2012 20:45:40 -0000 1.4 +++ pal-0.4.3-r1.ebuild 28 Oct 2014 22:11:40 -0000 1.5 @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v 1.4 2012/11/20 20:45:40 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v 1.5 2014/10/28 22:11:40 jer Exp $ -EAPI=4 -inherit toolchain-funcs eutils prefix +EAPI=5 +inherit eutils prefix toolchain-funcs DESCRIPTION="pal command-line calendar program" HOMEPAGE="http://palcal.sourceforge.net/"; @@ -12,28 +12,32 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos" -IUSE="nls unicode" +IUSE="nls" -RDEPEND=">=dev-libs/glib-2.0 +RDEPEND=" + >=dev-libs/glib-2.0 + nls? ( virtual/libintl ) + sys-libs/ncurses sys-libs/readline - sys-libs/ncurses[unicode?] - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) virtual/pkgconfig - nls? ( sys-devel/gettext )" +" S=${WORKDIR}/${P}/src src_prepare() { epatch "${FILESDIR}"/${PV}-strip.patch epatch "${FILESDIR}"/${PV}-ldflags.patch - if use unicode; then - sed -i "/^LIBS/s/-lncurses/&w/" "${S}"/Makefile || die - fi - + epatch "${FILESDIR}"/${P}-pkg_config.patch epatch "${FILESDIR}"/${P}-prefix.patch + eprefixify Makefile.defs input.c Makefile sed -i -e 's/ -o root//g' {.,convert}/Makefile || die + + tc-export PKG_CONFIG } src_compile() {
