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

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 66 insertions, 58 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/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
+}