diff options
| -rw-r--r-- | app-office/ical/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/ical/Manifest | 6 | ||||
| -rw-r--r-- | app-office/ical/files/ical-3.0-makefile.patch (renamed from app-office/ical/files/ical-3.0-ldflags.patch) | 10 | ||||
| -rw-r--r-- | app-office/ical/ical-3.0-r1.ebuild | 6 |
4 files changed, 21 insertions, 7 deletions
diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog index 2f9bc54bc97b..13d40f14ad34 100644 --- a/app-office/ical/ChangeLog +++ b/app-office/ical/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/ical # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.33 2011/02/10 17:22:25 ssuominen Exp $ + + 10 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild, + +files/ical-3.0-makefile.patch: + Fix check target to work with -j wrt #315949 by Kevin McCarthy. 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild, +files/ical-3.0-ldflags.patch: diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest index c1aba84bcacd..5c535206bfbf 100644 --- a/app-office/ical/Manifest +++ b/app-office/ical/Manifest @@ -1,7 +1,7 @@ AUX ical-3.0-gcc44.patch 329 RMD160 d04d78e4673f9d3d00694784d42e97234324f36f SHA1 6e6a29edead16866a041aaf0f08eb1cbef2c8708 SHA256 6450b45e18a63a34aaf32c28b55b8f49abed585d8ba8276f5992719b38769821 -AUX ical-3.0-ldflags.patch 681 RMD160 2575abc5288bf56a9ce989d319471dd5293e2075 SHA1 749bf68059a1073dd325985c8012c367b369cc34 SHA256 a4a7c658f8a6dc734a5ab3d60f8fce49d17c303497ff749c90aecd26b824337e +AUX ical-3.0-makefile.patch 965 RMD160 a727d5fc87101a92db81a890bbe1bde52396a45a SHA1 7f15f838a6139bded93088d13f2532288e4d48c8 SHA256 25a727b9a4a240f332bba5641c1adbf42d9cdb13efb69406b6322c4aad10b3b5 AUX ical-3.0-newtcl.patch 12767 RMD160 bd5f7eb7b368a9b983b4e4eff05f8d90e42c267c SHA1 e7f700cdbac1ae026a6bfb56f02c154f178c9517 SHA256 75ff4f6683dc0d913f1bbe694958f1f1d108445e2a25da52eed922380dda9a28 DIST ical-3.0.tar.gz 373891 RMD160 ff0724c1cda6de8cbde0762fb84931455abef73b SHA1 a2d2efe5bd93ea63045f3dd4a7d2e0922849c727 SHA256 d290fa484a8fe5e8f70a397e9c12b61bb82c6ca517464390171fe3b06d203bbb -EBUILD ical-3.0-r1.ebuild 1274 RMD160 919e25ee4745dba8697520adc3973545eca1629f SHA1 b6bdd4e65b5404ff0b8a187b94ef2bee93f73530 SHA256 48cf7ccd1ee9deb88f11b36498549aeb213e8dc74575868706ad635b7a73735b -MISC ChangeLog 4031 RMD160 a973734bb7afd3a2e7ef3b5131f10fdda5f1fea3 SHA1 f6ede3e28f21763dd182cbd445d114aa0eab1281 SHA256 7600b7c28ca6bc9af7705f347f4969b5f1187345478ce7c4b9c0b4cc52d9c050 +EBUILD ical-3.0-r1.ebuild 1272 RMD160 aa589725c94b4b9413adfaabe8fc9660d05d355e SHA1 91ee8998d10b65ce9952b674aebc6ab6e753c910 SHA256 9d337158d7083e151d679bd777dcfe4f84bf9b440ae8dc80bc4569ee9ca121bd +MISC ChangeLog 4206 RMD160 49a5a160307f61683f02d95012c39ab8f5f87f70 SHA1 2109ec7a843eb9164fad14362057d626b8f6311b SHA256 3e70aa92c400deb66614facc7d52d10397d41c71d9ed7fd06ab543537644ad3b MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a diff --git a/app-office/ical/files/ical-3.0-ldflags.patch b/app-office/ical/files/ical-3.0-makefile.patch index 36c1599f8ca7..ecc911c16908 100644 --- a/app-office/ical/files/ical-3.0-ldflags.patch +++ b/app-office/ical/files/ical-3.0-makefile.patch @@ -1,4 +1,5 @@ Add LDFLAGS to linker calls +Fix deps on check targets for parallel tests Patch by Kevin McCarthy <signals42@gmail.com> @@ -21,3 +22,12 @@ Patch by Kevin McCarthy <signals42@gmail.com> $(LIB1): FRC @echo making in calendar +@@ -195,7 +195,7 @@ + check_text: + @ICAL_LIBRARY=$(srcdir) ./ical -nodisplay -f $(srcdir)/tests/no_x.tcl + +-check_x: ++check_x: check_text + @ICAL_LIBRARY=$(srcdir) ./ical -f $(srcdir)/tests/x.tcl + + # Rules for shipping html documentation diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild index 8a51d47f3d34..dba52ee4d75a 100644 --- a/app-office/ical/ical-3.0-r1.ebuild +++ b/app-office/ical/ical-3.0-r1.ebuild @@ -1,6 +1,6 @@ # 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.5 2011/02/05 17:46:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.6 2011/02/10 17:22:25 ssuominen Exp $ EAPI=3 inherit autotools eutils multilib virtualx @@ -22,7 +22,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc44.patch \ "${FILESDIR}"/${P}-newtcl.patch \ - "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-makefile.patch sed -i \ -e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \ @@ -44,7 +44,7 @@ src_compile() { src_test() { if [[ ${EUID} != 0 ]]; then - Xmake -j1 check || die + Xemake check || die fi } |