Fix for missing locale.h include for bug #244739 and remove old

(Portage version: 2.1.4.5)

5 files changed, 21 insertions, 60 deletions

diff --git a/app-office/calcurse/ChangeLog b/app-office/calcurse/ChangeLog
index 50f287167fd7..b3042958b8dd 100644
--- a/app-office/calcurse/ChangeLog
+++ b/app-office/calcurse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calcurse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/ChangeLog,v 1.7 2008/10/25 12:58:41 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/ChangeLog,v 1.8 2008/11/01 16:14:13 cedk Exp $
+
+  01 Nov 2008; Cédric Krier <cedk@gentoo.org>
+  -files/calcurse-2.1-cflags.patch, +files/calcurse-2.3-locale.patch,
+  -calcurse-2.1.ebuild, calcurse-2.3.ebuild:
+  Fix for missing locale.h include for bug #244739 and remove old
 
 *calcurse-2.3 (25 Oct 2008)
 
diff --git a/app-office/calcurse/calcurse-2.1.ebuild b/app-office/calcurse/calcurse-2.1.ebuild
deleted file mode 100644
index 76ac07adfc37..000000000000
--- a/app-office/calcurse/calcurse-2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-2.1.ebuild,v 1.3 2008/10/25 12:58:41 cedk Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="a text-based personal organizer"
-HOMEPAGE="http://culot.org/calcurse/index.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linguas_en linguas_fr linguas_de linguas_es linguas_nl"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm po/LINGUAS
-
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_compile() {
-	local ALL_LINGUAS=""
-
-	use linguas_en && ALL_LINGUAS="${ALL_LINGUAS} en"
-	use linguas_fr && ALL_LINGUAS="${ALL_LINGUAS} fr"
-	use linguas_de && ALL_LINGUAS="${ALL_LINGUAS} de"
-	use linguas_es && ALL_LINGUAS="${ALL_LINGUAS} es"
-	use linguas_nl && ALL_LINGUAS="${ALL_LINGUAS} nl"
-
-	ALL_LINGUAS="${ALL_LINGUAS}" econf || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*.html
-}
diff --git a/app-office/calcurse/calcurse-2.3.ebuild b/app-office/calcurse/calcurse-2.3.ebuild
index 8b7126524785..c15e163c6f17 100644
--- a/app-office/calcurse/calcurse-2.3.ebuild
+++ b/app-office/calcurse/calcurse-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-2.3.ebuild,v 1.1 2008/10/25 12:58:41 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-2.3.ebuild,v 1.2 2008/11/01 16:14:13 cedk Exp $
 
 inherit eutils autotools
 
@@ -22,6 +22,7 @@ src_unpack() {
 	rm po/LINGUAS
 
 	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-locale.patch
 	eautoreconf
 }
 
diff --git a/app-office/calcurse/files/calcurse-2.1-cflags.patch b/app-office/calcurse/files/calcurse-2.1-cflags.patch
deleted file mode 100644
index ebc28d29c329..000000000000
--- a/app-office/calcurse/files/calcurse-2.1-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru calcurse-2.1~/configure.ac calcurse-2.1/configure.ac
---- calcurse-2.1~/configure.ac	2008-10-25 14:41:09.000000000 +0200
-+++ calcurse-2.1/configure.ac	2008-10-25 14:41:51.000000000 +0200
-@@ -56,7 +56,7 @@
- #-------------------------------------------------------------------------------
- #                                                            Compilation options
- #-------------------------------------------------------------------------------
--CFLAGS="-O2 -Wall -g"
-+CFLAGS += "-Wall -g"
- #-------------------------------------------------------------------------------
- #                                                               Create Makefiles
- #-------------------------------------------------------------------------------
diff --git a/app-office/calcurse/files/calcurse-2.3-locale.patch b/app-office/calcurse/files/calcurse-2.3-locale.patch
new file mode 100644
index 000000000000..e207aa350f58
--- /dev/null
+++ b/app-office/calcurse/files/calcurse-2.3-locale.patch
@@ -0,0 +1,13 @@
+diff -ru calcurse-2.1~/src/calcurse.c calcurse-2.1/src/calcurse.c
+--- calcurse-2.1~/src/calcurse.c	2008-11-01 17:06:33.000000000 +0100
++++ calcurse-2.1/src/calcurse.c	2008-11-01 17:07:19.000000000 +0100
+@@ -41,6 +41,9 @@
+ #include "todo.h"
+ #include "args.h"
+ #include "notify.h"
++#if ENABLE_NLS
++#include <locale.h>
++#endif
+ 
+ 
+ /*