Added patch allowing compilation against glibc-2.10, closes bug #274307, Respecting CC variable

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 36 insertions, 23 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index ff35ef377c08..1155aefecaed 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/ical
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.19 2009/01/21 16:28:32 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.20 2009/07/30 19:39:29 vostorga Exp $
+
+  30 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> ical-2.2.1.ebuild,
+  ical-2.3.3.ebuild, +files/ical-2.3.3-glibc210.patch:
+  Added patch allowing compilation against glibc-2.10, closes bug #274307
+  Respecting CC variable.
 
   17 Jan 2009; Federico Ferri <mescalinum@gentoo.org> ChangeLog:
   closes bug #158621
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index 7625c5a61112..9f86bb97fabd 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ical-2.3.3-glibc210.patch 592 RMD160 f464ed35aceeb4510e9e0b9e03f54b9b116be8e2 SHA1 4b78caf2aedfe765c177d1dd569122ec6ff70874 SHA256 96c4ddaba71e4c9be979eaacfbb33584c45925aa35b6ecc59698041e8af4993d
 AUX ical-2.3.3-tcl8.5.patch 552 RMD160 e735b32b5d620deaf617865e33ee8e096e2b9ade SHA1 e0c0290b7a34dde81443327b5560f187e191f6ad SHA256 768516416c77651b84ab1b277ed91d4b593bc9395394a80d843650329716608a
-DIST ical-2.2.1a.patch-0.1.tar.bz2 3712 RMD160 6cdda6a10caf9544885c55522d97a0b87c4fe877 SHA1 545cf2dea4464ba252c61108bbc705c6ea549b9a SHA256 60cf9311ef2843b78e7d51ece90cdc71c75e8b0881c70c4b51bef3e558a996f7
+DIST ical-2.2.1a.patch-0.2.tar.bz2 3985 RMD160 c65ff8e45e1b1bbe531d9d7209a597eb29cdec61 SHA1 4ee80169206362e0dd1867032fe1e4eeaf667d5a SHA256 720e8524cf14773391943c9e3e0cf6da7045000eaa013f75a6e8d978880dc110
 DIST ical-2.2.1a.tar.bz2 221779 RMD160 ce598c14ea47a6cd4268db4685c899d13fa79500 SHA1 432b40e494e2de4fc969c37cf710e313f6764518 SHA256 dbcc7430178c13774b80f1ccb3e36ab918f3cbc37fd37e04fef457a158b58e52
 DIST ical-2.3.3.tar.gz 293932 RMD160 9141bec1497b49c1952d4814ad4b7cc0bda5d794 SHA1 4559ac395218642f0a479bd1bf1429c04d64cd25 SHA256 fa8659c3d5937629169ed34aeffa14df9ba12b825a8155cfb602bf63be0d84f2
-EBUILD ical-2.2.1.ebuild 1245 RMD160 a97631d426a743eb052329c50ba272fe4c93e321 SHA1 f138c11bf2658182205ffd04507cdeb9b992250a SHA256 f576a65abdcf0055977d1949a5f30e9d07c27dcd6e84af513a5f4cea347bb548
-EBUILD ical-2.3.3.ebuild 1065 RMD160 33d852cca565eb576019c6f5e48756c4d02b796f SHA1 9320705dbeceeeadd1bce22b24fbdd17e72151c3 SHA256 658de0668108a31713d882ddafaa15cbe1fe5ca8a38d175b2a61efe2b5e87137
-MISC ChangeLog 2307 RMD160 b69d81b34a2019071950476f21360dd5a1e2655c SHA1 cd1584777ea13fad6f1becfeee5c577272e3c901 SHA256 5cdbacaae1c3c7c0507168769bec45f2ed7d995d0f53ebd67f7237559b63dbfd
+EBUILD ical-2.2.1.ebuild 1296 RMD160 45b3e4d65723fa0b3b2ef9a3d44f061b884bdb1e SHA1 3a4c64a4158198e8bb03c95f61ac9772e21f1f24 SHA256 81c43088bf38eaf6dc42c86017caf2d7e81dfaacb2682f2500901bef8cf265d3
+EBUILD ical-2.3.3.ebuild 1103 RMD160 0acae01f87a0cc5892dd7901ef7aa40870776b09 SHA1 c58995d739906882b5f966aa4035496f51b1310d SHA256 03e92d68086322e441adb81c57783e8b9d456cb1fe907414f8a2c23abf52e389
+MISC ChangeLog 2539 RMD160 24da039254a6b9e009a8fe9e9a68f3a67f3c7bc3 SHA1 1a123cb9fd122e3008e7c97ed9ba2c9ae2bccbbd SHA256 bcd6fa30d867c8568602869af97103640abd0dd4c51e41529812621cfeba2c01
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl3TRYACgkQV3J2n04EauzVAwCdH14NTAhpMIjEP+nhCM6ulYkA
-soYAn3BbEtbOOimgtTXTO/hbhNnMDkoj
-=r6lW
------END PGP SIGNATURE-----
diff --git a/app-office/ical/files/ical-2.3.3-glibc210.patch b/app-office/ical/files/ical-2.3.3-glibc210.patch
new file mode 100644
index 000000000000..d57c916695f8
--- /dev/null
+++ b/app-office/ical/files/ical-2.3.3-glibc210.patch
@@ -0,0 +1,16 @@
+diff -NrU5 ical-2.3.3.original/calendar/calfile.C ical-2.3.3/calendar/calfile.C
+--- ical-2.3.3.original/calendar/calfile.C	2009-07-30 15:06:53.000000000 +0000
++++ ical-2.3.3/calendar/calfile.C	2009-07-30 15:10:14.000000000 +0000
+@@ -56,11 +56,11 @@
+     tmp = new char[len+2];
+     sprintf(tmp, "%s~", fileName);
+     backupName = tmp;
+ 
+     // Get directory name for access checks
+-    char* lastSlash = strrchr(name, '/');
++    const char* lastSlash = strrchr(name, '/');
+     if (lastSlash == 0) {
+ 	/* Calendar is in current directory */
+ 	tmp = new char[3];
+ 	strcpy(tmp, "./");
+     }
diff --git a/app-office/ical/ical-2.2.1.ebuild b/app-office/ical/ical-2.2.1.ebuild
index ebf0e7ed6844..be0607696bf3 100644
--- a/app-office/ical/ical-2.2.1.ebuild
+++ b/app-office/ical/ical-2.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.2.1.ebuild,v 1.16 2006/04/08 09:14:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.2.1.ebuild,v 1.17 2009/07/30 19:39:29 vostorga Exp $
 
 inherit eutils
 
-PATCH_VER="0.1"
+PATCH_VER="0.2"
 MY_P="${P}a"
 DESCRIPTION="Tk-based Calendar program"
 HOMEPAGE="http://www.fnal.gov/docs/products/tktools/ical.html"
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch ${MY_P}-hack.patch
 	epatch ${MY_P}-glibc22.patch
 	epatch ${MY_P}-print.patch
+	epatch ${MY_P}-glibc210.patch
 
 	sed -i \
 		-e "s: \@TCL_LIBS\@::" \
@@ -46,7 +47,7 @@ src_compile() {
 	# don't use autoconf, bug 101658
 	# autoconf
 	econf --with-tclsh=/usr/bin/tclsh || die
-	emake -j1 || die "make failed"
+	emake CXX=$(tc-getCXX) -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/app-office/ical/ical-2.3.3.ebuild b/app-office/ical/ical-2.3.3.ebuild
index ca9531d87ae7..260ce33ce48a 100644
--- a/app-office/ical/ical-2.3.3.ebuild
+++ b/app-office/ical/ical-2.3.3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.3.3.ebuild,v 1.1 2009/01/17 02:25:28 mescalinum Exp $
-
-WANT_AUTOCONF=latest
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.3.3.ebuild,v 1.2 2009/07/30 19:39:29 vostorga Exp $
 
 inherit autotools eutils multilib
 
@@ -18,6 +16,7 @@ RESTRICT="test"
 
 DEPEND="dev-lang/tcl
 	dev-lang/tk"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,6 +29,7 @@ src_unpack() {
 		Makefile.in || die
 
 	epatch "${FILESDIR}"/${P}-tcl8.5.patch
+	epatch "${FILESDIR}"/${P}-glibc210.patch
 	eautoconf
 	cd "${S}/types"; eautoconf
 }