amd64 stable, restrict test suite for now

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

6 files changed, 9 insertions, 131 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index 2f48cae48e94..a17c87aa034c 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/ical
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.30 2010/04/11 12:20:14 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.31 2010/04/20 10:49:49 ssuominen Exp $
+
+  20 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild:
+  amd64 stable wrt #305295
 
   11 Apr 2010; <nixnut@gentoo.org> ical-3.0-r1.ebuild:
   ppc stable #305295
diff --git a/app-office/ical/files/ical-2.3.3-glibc210.patch b/app-office/ical/files/ical-2.3.3-glibc210.patch
deleted file mode 100644
index d57c916695f8..000000000000
--- a/app-office/ical/files/ical-2.3.3-glibc210.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/ical-2.3.3-tcl8.5.patch b/app-office/ical/files/ical-2.3.3-tcl8.5.patch
deleted file mode 100644
index 9471d74287b2..000000000000
--- a/app-office/ical/files/ical-2.3.3-tcl8.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig	2009-01-17 03:18:29.000000000 +0100
-+++ configure.in	2009-01-17 03:18:56.000000000 +0100
-@@ -68,8 +68,8 @@ fi
- # Find Tcl/Tk
- 
- AC_CHECKING(Tcl/Tk installation)
--legal_tk_versions="8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
--legal_tcl_versions="8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
-+legal_tk_versions="8.6 8.5 8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
-+legal_tcl_versions="8.6 8.5 8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
- 
- #### Find tclsh
- AC_ARG_WITH(tclsh,[  --with-tclsh=<path>     full path name of tclsh],
diff --git a/app-office/ical/ical-2.3.3.ebuild b/app-office/ical/ical-2.3.3.ebuild
deleted file mode 100644
index e84be57bbe54..000000000000
--- a/app-office/ical/ical-2.3.3.ebuild
+++ /dev/null
@@ -1,47 +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.3.3.ebuild,v 1.5 2009/09/27 14:58:25 nixnut Exp $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Tk-based Calendar program"
-HOMEPAGE="http://www.fnal.gov/docs/products/tktools/ical.html"
-SRC_URI="http://annexia.org/_file/${P}.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-lang/tcl
-	dev-lang/tk"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:mkdir:mkdir -p:" \
-		-e "/LIBDIR =/s:lib:$(get_libdir):" \
-		-e "/MANDIR =/s:man:share/man:" \
-		Makefile.in || die
-
-	epatch "${FILESDIR}"/${P}-tcl8.5.patch
-	epatch "${FILESDIR}"/${P}-glibc210.patch
-	eautoconf
-	cd "${S}/types"; eautoconf
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake OPTF="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake prefix="${D}/usr" install || die "emake install failed"
-
-	dodoc ANNOUNCE README *.txt
-	dohtml CHANGES.html doc/*.html
-}
diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild
index b8e8f727aa2e..128054f3ee12 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-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-r1.ebuild,v 1.3 2010/04/11 12:20:14 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.4 2010/04/20 10:49:49 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib virtualx
@@ -11,12 +11,15 @@ 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"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl
 	dev-lang/tk"
 
+# FIXME wrt bug #315949
+RESTRICT="test"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-newtcl.patch
diff --git a/app-office/ical/ical-3.0.ebuild b/app-office/ical/ical-3.0.ebuild
deleted file mode 100644
index 9cd94c83078f..000000000000
--- a/app-office/ical/ical-3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.5 2010/02/26 12:04:43 fauli Exp $
-
-EAPI=2
-inherit autotools eutils multilib virtualx
-
-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' \
-		-e 's:sys/utsname.h limits.h::' \
-		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_test() {
-	Xmake check || 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
-}