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

Package-Manager: portage-2.1.4.5

6 files changed, 24 insertions, 65 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/Manifest b/app-office/calcurse/Manifest
index 25720959fe44..7954f2cfd1c0 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,8 +1,6 @@
-AUX calcurse-2.1-cflags.patch 750 RMD160 aa19ba2a22ce206e79a0c0cf1285eed5b043e659 SHA1 ffd3e1d364b9231aa069d268a001d662bf2c7df5 SHA256 ec3081a538ff2cfa5cef38a4067a51f65f43d73abdc282e0c57fa1ccfeb60fe6
 AUX calcurse-2.3-cflags.patch 750 RMD160 c35ca24b6af823ae538f0b6e20cf80366d3e8ff7 SHA1 8732f00ad28dcc5aa87bce5216f70c7666c8bc20 SHA256 d600d9b6804d47cb6ab5ee2224350e276dd0159aaf10d62f5e2e693a76f7b15d
-DIST calcurse-2.1.tar.gz 481821 RMD160 cac4e9b579d0b40818ce2ae451e24a1cb228f360 SHA1 324c82f55e519259606ba871abc7c0590497a2ba SHA256 c578a720ad2572119fef4046a79426f216fd74d028ead998293e3297d1f40ab4
+AUX calcurse-2.3-locale.patch 333 RMD160 328b6d5764252f3d89e53eccc7753db26f246ec1 SHA1 e470466e693a4acd1c9137c02925b16df6e4362b SHA256 0151e015ce3a968e703d8ac7e7c36343539eb54a3ac62b76f8634707e94ff334
 DIST calcurse-2.3.tar.gz 516721 RMD160 680c40a4ddb54ddfec0af809e03166f2d8c372d7 SHA1 7fc5234e1f759bea2677e4d820ece825ea9e4822 SHA256 84ca8895e434f5717a12a579b0df45e663c4d6b2fdc041b78180a8434a5458bf
-EBUILD calcurse-2.1.ebuild 1171 RMD160 0c733a448f3350980a74d6c75349a44459126335 SHA1 4ac128bfc42e85b451531cba4b4269d1e18feda6 SHA256 7c3d7aa75904bca76ce1320dccb0cf24d9f272ead60ef460c8c56e61570519cc
-EBUILD calcurse-2.3.ebuild 1171 RMD160 3747ce0bde69dfa384bfd61dfb79668021cef33c SHA1 8c4fb5d1852f68ed12a6150f90294c7771989d0d SHA256 0fa6bff3db7578423614743601453d9582f981a41e464026391c89c82400444f
-MISC ChangeLog 1247 RMD160 03de822e7be777bbea439abfe0b0db9d7af5add5 SHA1 f9a36e1585485ed0625dd074759e3ad44b0c8d05 SHA256 d560bbfb4bcbf9b87d8be4e6ec63f58a199edf0ad0174befd6fb668797d57a07
+EBUILD calcurse-2.3.ebuild 1211 RMD160 b92ca0856b2fa6fa20eb326a7821f92f30d1a5f6 SHA1 e5460b0d1ecf4099a04ebc13fabcd57d5cb88452 SHA256 9ff0b60fcb44b888fbbd88ec147be628a2b1b55897d993754785f7515e9519ed
+MISC ChangeLog 1476 RMD160 30dcd76f40b01238696a9043de0e7f354fbb1a71 SHA1 1f919f1a93af6bc3c036cf2462cf860916ad9b58 SHA256 20e924f64099ddf46103757084f8158214102aeb2aedf572b5331adee1d99397
 MISC metadata.xml 596 RMD160 5a11c40687134d68fe1142cedac2ebdfbea19053 SHA1 1ea236eb94099c93e8b6cd92c329b5eb0b1bc618 SHA256 149abb6a321e970f8255678d698047c424f89fe0f932125b5d6705965c17db04
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
+ 
+ 
+ /*