Version bump wrt #257285, thanks to Sergei Golubchik for reporting.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 70 insertions, 62 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index fc8b1a7ddd9f..761d9de6b3df 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/ical
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.23 2009/09/27 14:58:25 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.24 2010/01/15 17:20:23 ssuominen Exp $
+
+*ical-3.0 (15 Jan 2010)
+
+  15 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> +ical-3.0.ebuild,
+  +files/ical-3.0-gcc44.patch:
+  Version bump wrt #257285, thanks to Sergei Golubchik for reporting.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> ical-2.3.3.ebuild:
   ppc stable #281422
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index 1be6b2939d27..4ed308768999 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,9 +1,9 @@
 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.2.tar.bz2 3985 RMD160 c65ff8e45e1b1bbe531d9d7209a597eb29cdec61 SHA1 4ee80169206362e0dd1867032fe1e4eeaf667d5a SHA256 720e8524cf14773391943c9e3e0cf6da7045000eaa013f75a6e8d978880dc110
-DIST ical-2.2.1a.tar.bz2 221779 RMD160 ce598c14ea47a6cd4268db4685c899d13fa79500 SHA1 432b40e494e2de4fc969c37cf710e313f6764518 SHA256 dbcc7430178c13774b80f1ccb3e36ab918f3cbc37fd37e04fef457a158b58e52
+AUX ical-3.0-gcc44.patch 329 RMD160 d04d78e4673f9d3d00694784d42e97234324f36f SHA1 6e6a29edead16866a041aaf0f08eb1cbef2c8708 SHA256 6450b45e18a63a34aaf32c28b55b8f49abed585d8ba8276f5992719b38769821
 DIST ical-2.3.3.tar.gz 293932 RMD160 9141bec1497b49c1952d4814ad4b7cc0bda5d794 SHA1 4559ac395218642f0a479bd1bf1429c04d64cd25 SHA256 fa8659c3d5937629169ed34aeffa14df9ba12b825a8155cfb602bf63be0d84f2
-EBUILD ical-2.2.1.ebuild 1296 RMD160 45b3e4d65723fa0b3b2ef9a3d44f061b884bdb1e SHA1 3a4c64a4158198e8bb03c95f61ac9772e21f1f24 SHA256 81c43088bf38eaf6dc42c86017caf2d7e81dfaacb2682f2500901bef8cf265d3
+DIST ical-3.0.tar.gz 373891 RMD160 ff0724c1cda6de8cbde0762fb84931455abef73b SHA1 a2d2efe5bd93ea63045f3dd4a7d2e0922849c727 SHA256 d290fa484a8fe5e8f70a397e9c12b61bb82c6ca517464390171fe3b06d203bbb
 EBUILD ical-2.3.3.ebuild 1098 RMD160 186b663be3990629ea11604411b0c62893ae450e SHA1 75c97737bfb7d8332192db8e00022e7221ff53bc SHA256 247c32e4ce9bfdbc77ad687acf3247bd2c7c99ab9b5578de0da613d8ede2ceac
-MISC ChangeLog 2816 RMD160 fcdc73beeadc3b571de74e1554fc6904dfd37cd2 SHA1 622d15c9928f0f373619d3435242c9cd40d025b4 SHA256 03270adb92a0e5ed311c210e5e3e83e9d87f29e91cae2487850b86d149d47527
+EBUILD ical-3.0.ebuild 1058 RMD160 a1250678f868975f76331c816b4efc29b8aa30a6 SHA1 de3ccf4253a3b1ce2c16c15e84c6764f84d1509b SHA256 2ab9dcf1c0de8d85dab00579909989293be1b2afe2a481f34da6205956e0b402
+MISC ChangeLog 3018 RMD160 649f8d0a0a86934e2634b4c4d6247cff5c9e0863 SHA1 c6363a7528b617c7e8646e95a0c9edc3c7a7210f SHA256 b8b6b904456bae26c250fb823fdfe0106324e5e9424600c8e76958d09d428e17
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-office/ical/files/ical-3.0-gcc44.patch b/app-office/ical/files/ical-3.0-gcc44.patch
new file mode 100644
index 000000000000..8088be8815e5
--- /dev/null
+++ b/app-office/ical/files/ical-3.0-gcc44.patch
@@ -0,0 +1,11 @@
+--- calendar/calfile.C
++++ calendar/calfile.C
+@@ -58,7 +58,7 @@
+     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];
diff --git a/app-office/ical/ical-2.2.1.ebuild b/app-office/ical/ical-2.2.1.ebuild
deleted file mode 100644
index be0607696bf3..000000000000
--- a/app-office/ical/ical-2.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.17 2009/07/30 19:39:29 vostorga Exp $
-
-inherit eutils
-
-PATCH_VER="0.2"
-MY_P="${P}a"
-DESCRIPTION="Tk-based Calendar program"
-HOMEPAGE="http://www.fnal.gov/docs/products/tktools/ical.html"
-SRC_URI="http://helios.dii.utk.edu/ftp/pub/tcl/apps/ical/${MY_P}.tar.bz2
-	 	mirror://gentoo/${MY_P}.patch-${PATCH_VER}.tar.bz2"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/tcl
-	dev-lang/tk"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/autoconf"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	epatch ${MY_P}-newtcl.patch
-	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\@::" \
-		-e "s:mkdir:mkdir -p:" \
-		"${S}"/Makefile.in \
-		|| die "sed Makefile.in failed"
-
-	has_version '=dev-lang/tcl-8.4*' && epatch ${MY_P}-tcl8.4.patch
-}
-
-src_compile() {
-	# don't use autoconf, bug 101658
-	# autoconf
-	econf --with-tclsh=/usr/bin/tclsh || die
-	emake CXX=$(tc-getCXX) -j1 || die "make failed"
-}
-
-src_install() {
-	einstall \
-		MANDIR="${D}/usr/share/man" || die "install failed"
-}
diff --git a/app-office/ical/ical-3.0.ebuild b/app-office/ical/ical-3.0.ebuild
new file mode 100644
index 000000000000..8ecf979d3aa1
--- /dev/null
+++ b/app-office/ical/ical-3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0.ebuild,v 1.1 2010/01/15 17:20:23 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+DESCRIPTION="Tk-based Calendar program"
+HOMEPAGE="http://launchpad.net/ical-tcl"
+SRC_URI="http://launchpad.net/ical-tcl/3.x/${PV}/+download/${P}.tar.gz"
+
+LICENSE="as-is GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tcl
+	dev-lang/tk"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+
+	sed -i \
+		-e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \
+		configure.in || die
+
+	sed -i \
+		-e 's:mkdir:mkdir -p:' \
+		-e "/LIBDIR =/s:lib:$(get_libdir):" \
+		-e '/MANDIR =/s:man:share/man:' \
+		Makefile.in || die
+	
+	eautoconf
+}
+
+src_compile() {
+	emake OPTF="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_install() {
+	emake prefix="${D}/usr" install || die
+
+	dodoc ANNOUNCE *README RWMJ-release-notes.txt TODO
+	dohtml {.,doc}/*.html
+
+	rm -f "${D}"/usr/$(get_libdir)/ical/v3.0/contrib/README
+}