diff options
| -rw-r--r-- | app-office/ical/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/ical/files/ical-3.0-ldflags.patch | 23 | ||||
| -rw-r--r-- | app-office/ical/ical-3.0-r1.ebuild | 22 |
3 files changed, 41 insertions, 12 deletions
diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog index a17c87aa034c..2f9bc54bc97b 100644 --- a/app-office/ical/ChangeLog +++ b/app-office/ical/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/ical -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.31 2010/04/20 10:49:49 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.32 2011/02/05 17:46:49 ssuominen Exp $ + + 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild, + +files/ical-3.0-ldflags.patch: + Respect LDFLAGS and fix src_test() logic wrt #351021 by Kevin McCarthy. 20 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild: amd64 stable wrt #305295 diff --git a/app-office/ical/files/ical-3.0-ldflags.patch b/app-office/ical/files/ical-3.0-ldflags.patch new file mode 100644 index 000000000000..36c1599f8ca7 --- /dev/null +++ b/app-office/ical/files/ical-3.0-ldflags.patch @@ -0,0 +1,23 @@ +Add LDFLAGS to linker calls + +Patch by Kevin McCarthy <signals42@gmail.com> + +--- Makefile.in ++++ Makefile.in +@@ -74,13 +74,13 @@ + all: $(CONFIGURED) ical + + ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o +- $(CXXLINKER) -o $@ $(OBJS) main.o $(LIBS) ++ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS) + + ical-bundle: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o +- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(BLIBS) ++ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(BLIBS) + + ical-tiny: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o +- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS) ++ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS) + + $(LIB1): FRC + @echo making in calendar diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild index 128054f3ee12..8a51d47f3d34 100644 --- a/app-office/ical/ical-3.0-r1.ebuild +++ b/app-office/ical/ical-3.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.4 2010/04/20 10:49:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.5 2011/02/05 17:46:49 ssuominen Exp $ -EAPI=2 +EAPI=3 inherit autotools eutils multilib virtualx DESCRIPTION="Tk-based Calendar program" @@ -14,15 +14,15 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -DEPEND="dev-lang/tcl +RDEPEND="dev-lang/tcl dev-lang/tk" - -# FIXME wrt bug #315949 -RESTRICT="test" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-newtcl.patch + epatch \ + "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-newtcl.patch \ + "${FILESDIR}"/${P}-ldflags.patch sed -i \ -e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \ @@ -43,7 +43,9 @@ src_compile() { } src_test() { - Xmake check || die + if [[ ${EUID} != 0 ]]; then + Xmake -j1 check || die + fi } src_install() { |