Rename .pdb file with bad char.

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

3 files changed, 114 insertions, 2 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 5a196e2c4be7..178a715ef14d 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/jpilot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.39 2010/08/01 14:22:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.40 2010/08/21 11:55:08 ssuominen Exp $
+
+  21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> jpilot-1.8.0.ebuild,
+  +files/jpilot-1.8.0-char.patch:
+  Rename .pdb file with bad char.
 
   01 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> jpilot-1.8.0.ebuild:
   Fix testsuite wrt #330709 by Diego E. Pettenò.
diff --git a/app-pda/jpilot/files/jpilot-1.8.0-char.patch b/app-pda/jpilot/files/jpilot-1.8.0-char.patch
new file mode 100644
index 000000000000..5cbed53b57e9
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.0-char.patch
@@ -0,0 +1,102 @@
+--- empty/Makefile.am
++++ empty/Makefile.am
+@@ -9,7 +9,7 @@
+            ContactsDB-PAdd.pdb \
+            ToDoDB.pdb \
+            TasksDB-PTod.pdb \
+-           MañanaDB.pdb \
++           MananaDB.pdb \
+            MemoDB.pdb \
+            MemosDB-PMem.pdb \
+            Memo32DB.pdb \
+--- sync.c
++++ sync.c
+@@ -1146,7 +1146,7 @@
+       "ToDoDB",
+       "MemoDB",
+ #ifdef ENABLE_MANANA
+-      "MañanaDB",
++      "MananaDB",
+ #endif
+       "Saved Preferences",
+       ""
+@@ -2899,7 +2899,7 @@
+ 	"ToDoDB",
+ 	"MemoDB",
+ #ifdef ENABLE_MANANA
+-	"MañanaDB",
++	"MananaDB",
+ #endif
+ 	""
+    };
+--- todo.c
++++ todo.c
+@@ -77,7 +77,7 @@
+ #ifdef ENABLE_MANANA
+    get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+    if (ivalue) {
+-      strcpy(DBname, "MañanaDB");
++      strcpy(DBname, "MananaDB");
+    } else {
+       strcpy(DBname, "ToDoDB");
+    }
+@@ -163,7 +163,7 @@
+ #ifdef ENABLE_MANANA
+    get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+    if (ivalue) {
+-      num = jp_read_DB_files("MañanaDB", &records);
++      num = jp_read_DB_files("MananaDB", &records);
+       if (-1 == num)
+         return 0;
+    } else {
+@@ -315,7 +315,7 @@
+ #ifdef ENABLE_MANANA
+    get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+    if (ivalue) {
+-      jp_pc_write("MañanaDB", &br);
++      jp_pc_write("MananaDB", &br);
+    } else {
+       jp_pc_write("ToDoDB", &br);
+    }
+--- todo_gui.c
++++ todo_gui.c
+@@ -1029,8 +1029,8 @@
+ #ifdef ENABLE_MANANA
+    get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+    if (ivalue) {
+-      strcpy(pdb_name, "MañanaDB.pdb");
+-      strcpy(db_name, "MañanaDB");
++      strcpy(pdb_name, "MananaDB.pdb");
++      strcpy(db_name, "MananaDB");
+    } else {
+       strcpy(pdb_name, "ToDoDB.pdb");
+       strcpy(db_name, "ToDoDB");
+--- utils.c
++++ utils.c
+@@ -550,7 +550,7 @@
+       "ContactsDB-PAdd.pdb",
+       "ToDoDB.pdb",
+       "TasksDB-PTod.pdb",
+-      "MañanaDB.pdb",
++      "MananaDB.pdb",
+       "MemoDB.pdb",
+       "MemosDB-PMem.pdb",
+       "Memo32DB.pdb",
+@@ -983,7 +983,7 @@
+ #ifdef ENABLE_MANANA
+       get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+       if (ivalue) {
+-	 strcpy(filename, "MañanaDB.pc3");
++	 strcpy(filename, "MananaDB.pc3");
+       } else {
+ 	 strcpy(filename, "ToDoDB.pc3");
+       }
+@@ -3478,7 +3478,7 @@
+ #ifdef ENABLE_MANANA
+       get_pref(PREF_MANANA_MODE, &ivalue, NULL);
+       if (ivalue) {
+-	 strcpy(filename, "MañanaDB.pc3");
++	 strcpy(filename, "MananaDB.pc3");
+       } else {
+ 	 strcpy(filename, dbname[2]);
+       }
diff --git a/app-pda/jpilot/jpilot-1.8.0.ebuild b/app-pda/jpilot/jpilot-1.8.0.ebuild
index eb1ec8a74bed..6d41f1880c80 100644
--- a/app-pda/jpilot/jpilot-1.8.0.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-1.8.0.ebuild,v 1.2 2010/08/01 14:22:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-1.8.0.ebuild,v 1.3 2010/08/21 11:55:08 ssuominen Exp $
 
 EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
 HOMEPAGE="http://www.jpilot.org/"
@@ -22,11 +23,16 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-char.patch
+	mv -vf empty/Ma*anaDB.pdb empty/MananaDB.pdb || die
+
 	sed -i \
 		-e '/^Icon/s:jpilot.xpm:/usr/share/pixmaps/jpilot/jpilot-icon1.xpm:' \
 		jpilot.desktop || die
 
 	echo calendar.c > po/POTFILES.skip
+
+	eautoreconf
 }
 
 src_configure() {