preserve_home_in_writing_optionsfile clobbers random memory. Removed by Bernd request.

(Portage version: 2.1.3.5)

4 files changed, 10 insertions, 31 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 8793a3e88d47..4409a1e89787 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/uae
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.30 2007/08/13 09:58:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.31 2007/08/13 14:00:19 pva Exp $
+
+*uae-0.8.26-r1 (13 Aug 2007)
+
+  13 Aug 2007; <pva@gentoo.org>
+  -files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff,
+  -uae-0.8.26.ebuild, +uae-0.8.26-r1.ebuild:
+  preserve_home_in_writing_optionsfile clobbers random memory. Removed by
+  Bernd request.
 
   13 Aug 2007; <pva@gentoo.org> -files/uae-0.8.25-gtk-ui-cleanup.patch,
   -files/uae-0.8.25-uae_reset_args.diff, +files/sdlgfx.h,
diff --git a/app-emulation/uae/files/digest-uae-0.8.26 b/app-emulation/uae/files/digest-uae-0.8.26-r1
index fb066b85adbe..fb066b85adbe 100644
--- a/app-emulation/uae/files/digest-uae-0.8.26
+++ b/app-emulation/uae/files/digest-uae-0.8.26-r1
diff --git a/app-emulation/uae/files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff b/app-emulation/uae/files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff
deleted file mode 100644
index eee7658d0cd2..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Keep saving optionsfile to home dir, even if there is not one when reading
-config for the first time.
-
-Antonio Ospite <ospite@studenti.unina.it>
-
-diff -bpruN uae-0.8.25/src/main.c uae-0.8.25_patched/src/main.c
---- uae-0.8.25/src/main.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25_patched/src/main.c	2006-06-08 20:33:05.000000000 +0200
-@@ -357,6 +357,7 @@ void parse_cmdline (int argc, char **arg
- static void parse_cmdline_and_init_file (int argc, char **argv)
- {
-     char *home;
-+    char *pwd_optionsfile;
- 
-     strcpy (optionsfile, "");
- 
-@@ -374,8 +375,9 @@ static void parse_cmdline_and_init_file 
-     if (! cfgfile_load (&currprefs, optionsfile)) {
- #ifdef OPTIONS_IN_HOME
- 	/* sam: if not found in $HOME then look in current directory */
--	strcpy (optionsfile, OPTIONSFILENAME);
--	cfgfile_load (&currprefs, optionsfile);
-+  /* ao: but let's use a temporary name, so we save to home dir, yet :) */
-+	strcpy (pwd_optionsfile, OPTIONSFILENAME);
-+	cfgfile_load (&currprefs, pwd_optionsfile);
- #endif
-     }
- 
diff --git a/app-emulation/uae/uae-0.8.26.ebuild b/app-emulation/uae/uae-0.8.26-r1.ebuild
index 365343e13ea1..30fef0e9d624 100644
--- a/app-emulation/uae/uae-0.8.26.ebuild
+++ b/app-emulation/uae/uae-0.8.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.26.ebuild,v 1.3 2007/08/13 09:58:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.26-r1.ebuild,v 1.1 2007/08/13 14:00:19 pva Exp $
 
 inherit eutils
 
@@ -43,7 +43,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gtk-ui-cleanup.patch
 	epatch "${FILESDIR}"/uae-0.8.25-makefile_more_cleaning.diff
 	epatch "${FILESDIR}"/uae-0.8.25-memory_leaks_in_gui.diff
-	epatch "${FILESDIR}"/uae-0.8.25-preserve_home_in_writing_optionsfile.diff
 	epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
 	epatch "${FILESDIR}"/${P}-uae_reset_args.diff
 	cp "${FILESDIR}"/sdlgfx.h "${S}"/src