Fixed up ebuild to play nice with tcl. Added patch for tcl-8.4. Closes bug #22924.

4 files changed, 19 insertions, 10 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index 8f9732355aca..73981c01c93f 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/ical
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.4 2003/02/12 05:13:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.5 2003/11/15 08:52:51 brandy Exp $
+
+  15 Nov 2003; Brandy Westcott brandy@gentoo.org ical-2.2.1.ebuild:
+  Fixed up ebuild to play nice with tcl. Added patch for tcl-8.4. Closes bug
+  #22924.
 
 *ical-2.2.1 (31 Jul 2002)
   03 Aug 2002; Chad Huneycutt <chadh@gentoo.org> ical-2.2.1.ebuild: added die
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index 538690098a75..ad547ff49266 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,3 +1,3 @@
-MD5 3303afc085e9e3b82aeb74af0cf17299 ChangeLog 532
-MD5 38564f4ab888645ecb41c88e9a60f690 ical-2.2.1.ebuild 1118
-MD5 04893519330aa7b1a3bf109d7f4aeeeb files/digest-ical-2.2.1 132
+MD5 54e10b104ab3e6346b7fa637f2a134bc ical-2.2.1.ebuild 1304
+MD5 80e3abdeec376ba1486b94b14260b631 ChangeLog 688
+MD5 d2bc892a42d09ce669a9fc5419279a6b files/digest-ical-2.2.1 136
diff --git a/app-office/ical/files/digest-ical-2.2.1 b/app-office/ical/files/digest-ical-2.2.1
index d30f420a65da..a9019e31f817 100644
--- a/app-office/ical/files/digest-ical-2.2.1
+++ b/app-office/ical/files/digest-ical-2.2.1
@@ -1,2 +1,2 @@
 MD5 246de6b4f477805db9b15239f4f85473 ical-2.2.1a.tar.bz2 221779
-MD5 b6f206d6ab622d5e5d37bcb207c4c466 ical-2.2.1a.patch.tar.bz2 1346
+MD5 13b925ed2c1f0df710157dc13a12bfb3 ical-2.2.1a.patch-0.1.tar.bz2 3712
diff --git a/app-office/ical/ical-2.2.1.ebuild b/app-office/ical/ical-2.2.1.ebuild
index e5e7aacd8258..bdf0907b7dad 100644
--- a/app-office/ical/ical-2.2.1.ebuild
+++ b/app-office/ical/ical-2.2.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.3 2003/02/13 09:16:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.2.1.ebuild,v 1.4 2003/11/15 08:52:51 brandy Exp $
 
+PATCH_VER="0.1"
 DESCRIPTION="Calendar program"
 HOMEPAGE="http://www.fnal.gov/docs/products/tktools/ical.html"
 SRC_URI="http://helios.dii.utk.edu/ftp/pub/tcl/apps/ical/${P}a.tar.bz2
-		 http://www.ibiblio.org/gentoo/distfiles/${P}a.patch.tar.bz2"
+		 http://www.ibiblio.org/gentoo/distfiles/${P}a.patch-${PATCH_VER}.tar.bz2"
 LICENSE="as-is GPL-2"
 SLOT="0"
 KEYWORDS="x86"
@@ -27,12 +28,16 @@ src_unpack() {
 	D=${S}/ dosed "s: \@TCL_LIBS\@::" Makefile.in
 	D=${S}/ dosed "s:mkdir:mkdir -p:" Makefile.in
 
+	if has_version '=dev-lang/tcl-8.4*' ; then
+		patch -p0 < ${P}a-tcl8.4.patch || die
+	fi
+
 }
 
 src_compile() {
 	autoconf
-	econf
-	emake || die
+	econf --with-tclsh=/usr/bin/tclsh
+	emake || die "parallel make failed"
 }
 
 src_install () {
@@ -41,5 +46,5 @@ src_install () {
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
-		install || die
+		install || die "install failed"
 }