preserve_home_in_writing_optionsfile clobbers random memory. Removed by Bernd request.

Package-Manager: portage-2.1.3.5

5 files changed, 21 insertions, 46 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/Manifest b/app-emulation/uae/Manifest
index 537fcedbe74e..b75c26c80399 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -30,10 +30,6 @@ AUX uae-0.8.25-memory_leaks_in_gui.diff 1213 RMD160 15f15bf0d47d846c848569116aa0
 MD5 c01bd6eab1edbb452beb8f7ff8050214 files/uae-0.8.25-memory_leaks_in_gui.diff 1213
 RMD160 15f15bf0d47d846c848569116aa0ffe3cfa14c41 files/uae-0.8.25-memory_leaks_in_gui.diff 1213
 SHA256 e744f79882a7679ec09e63c8bef4ae8095660d9582d74a73a91fc304424cef3c files/uae-0.8.25-memory_leaks_in_gui.diff 1213
-AUX uae-0.8.25-preserve_home_in_writing_optionsfile.diff 1022 RMD160 9e861a120af5ce2fcbf9efd6bb82acba76fba2e7 SHA1 ddcce4690ff12d8b7ed32634f301c7914b6978f9 SHA256 f62edf3d7b8d353481f66634ba5429625cdd4481cc46b07cf76da3bb76b0cff2
-MD5 99fe09e146314d44021c72688542077a files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff 1022
-RMD160 9e861a120af5ce2fcbf9efd6bb82acba76fba2e7 files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff 1022
-SHA256 f62edf3d7b8d353481f66634ba5429625cdd4481cc46b07cf76da3bb76b0cff2 files/uae-0.8.25-preserve_home_in_writing_optionsfile.diff 1022
 AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 RMD160 21d0e159961c5e7b5a527db59dd787fdb481171f SHA1 cc2c22c508fa4b316061e2133b364629a16e099e SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a
 MD5 eb2c157fe7240609563c436dc2ca5b69 files/uae-0.8.25-struct_uae_wrong_fields_name.diff 613
 RMD160 21d0e159961c5e7b5a527db59dd787fdb481171f files/uae-0.8.25-struct_uae_wrong_fields_name.diff 613
@@ -47,18 +43,18 @@ MD5 f94f4f2bc52f8b00e2b1e7aecce6b09b files/uae-0.8.26-uae_reset_args.diff 3216
 RMD160 a4c87ae59a5c0e12683600d4eaf4b14ffdaae35f files/uae-0.8.26-uae_reset_args.diff 3216
 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 files/uae-0.8.26-uae_reset_args.diff 3216
 DIST uae-0.8.26.tar.gz 1013196 RMD160 8394b85b4ea2c74a758984e89b2793157c585da1 SHA1 3e705798f3a9089578902a853b41c991b9d4b2f7 SHA256 9da8f71f9fe1bfaf18f6ea227f31baadb89d12ba78cb7ac9ce6132f35055f868
-EBUILD uae-0.8.26.ebuild 6005 RMD160 a4090b8cb3cadebcd7bf4d41b4314c70ff21c866 SHA1 a6bdcd9d3a4263f79d76d6d59a266799dc1e61d2 SHA256 0159304ff16a37c0300c573ab53bdf14e056933782f0bac31def85c4dfbf57e8
-MD5 5cf658ac319cfe4322c37d20f42c253c uae-0.8.26.ebuild 6005
-RMD160 a4090b8cb3cadebcd7bf4d41b4314c70ff21c866 uae-0.8.26.ebuild 6005
-SHA256 0159304ff16a37c0300c573ab53bdf14e056933782f0bac31def85c4dfbf57e8 uae-0.8.26.ebuild 6005
-MISC ChangeLog 5619 RMD160 0210d602c3959e44e969f5d2bbf6127be52bcefb SHA1 13e55d039ba6eb6fd0cdb2ea36c035c6d321d9db SHA256 20bcfefbe5dab6953144680d6417b10559d2303ebaa12b2a945aa4fdea329641
-MD5 fba2991b6c6b87bbade5d06be78f0c03 ChangeLog 5619
-RMD160 0210d602c3959e44e969f5d2bbf6127be52bcefb ChangeLog 5619
-SHA256 20bcfefbe5dab6953144680d6417b10559d2303ebaa12b2a945aa4fdea329641 ChangeLog 5619
+EBUILD uae-0.8.26-r1.ebuild 5933 RMD160 bbd6852ecee0ad39242fd697f55f9731df599cb4 SHA1 38c431048a07ffd762cfcd31eef33fa9aad806eb SHA256 02047a5f23c34eca49d911c67e69db75eae0e2e3575bd55cb7b44ac1aea9c26c
+MD5 7ca3463a4c086b2512eead06279ebed0 uae-0.8.26-r1.ebuild 5933
+RMD160 bbd6852ecee0ad39242fd697f55f9731df599cb4 uae-0.8.26-r1.ebuild 5933
+SHA256 02047a5f23c34eca49d911c67e69db75eae0e2e3575bd55cb7b44ac1aea9c26c uae-0.8.26-r1.ebuild 5933
+MISC ChangeLog 5881 RMD160 1cd6d065db798cd26e9ba01540e24aed4c1e8db3 SHA1 c1ffd074fece5956c18b40a246a03deda885aafd SHA256 a8ca0ffb9eb72fc29f54e61a4a8b7d093080dc4428b42072573c356683659843
+MD5 48b58a8bd1441621ddaa82783bab88e8 ChangeLog 5881
+RMD160 1cd6d065db798cd26e9ba01540e24aed4c1e8db3 ChangeLog 5881
+SHA256 a8ca0ffb9eb72fc29f54e61a4a8b7d093080dc4428b42072573c356683659843 ChangeLog 5881
 MISC metadata.xml 668 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 SHA1 910d7f0379c233559cb51ebca71a2fe8009689fa SHA256 afa4747772ac1eaa54ff9a14804f1b466500192c932d6849ce1a27ff2af29bcc
 MD5 800d59bca6b74f54268ca8c63af928ee metadata.xml 668
 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 metadata.xml 668
 SHA256 afa4747772ac1eaa54ff9a14804f1b466500192c932d6849ce1a27ff2af29bcc metadata.xml 668
-MD5 8fc08da35100e708f469e9c3147aa563 files/digest-uae-0.8.26 235
-RMD160 9a733a6e86ce3ee5ceb4c8b34fe057d400035ec3 files/digest-uae-0.8.26 235
-SHA256 3cefc5d1aa8e4128bf01a0730614cebe08304f468fd43950ddaf530bb4e2c84d files/digest-uae-0.8.26 235
+MD5 8fc08da35100e708f469e9c3147aa563 files/digest-uae-0.8.26-r1 235
+RMD160 9a733a6e86ce3ee5ceb4c8b34fe057d400035ec3 files/digest-uae-0.8.26-r1 235
+SHA256 3cefc5d1aa8e4128bf01a0730614cebe08304f468fd43950ddaf530bb4e2c84d files/digest-uae-0.8.26-r1 235
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