Fix patch and autotools rebuilding, as reported also by Timothy Redaelli in bug #154280.

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 64 insertions, 31 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index dac68e3c61e8..534890efdb71 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/gpsim
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.25 2006/12/23 21:34:35 dertobi123 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.26 2007/01/05 06:45:54 flameeyes Exp $
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/gpsim-0.21.11-eXdbm.patch, gpsim-0.21.11-r1.ebuild:
+  Fix patch and autotools rebuilding, as reported also by Timothy Redaelli in
+  bug #154280.
 
   23 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   gpsim-0.21.11-r1.ebuild:
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index e28098e04019..1f70dbff1ad8 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gpsim-0.21.11-asneeded.patch 436 RMD160 4e03dc5d0c9aed67291e55f8222487ba07be2d7f SHA1 a1be878f5aabd18d560833dae32a8fcd6d4b037b SHA256 b7b348ba245c30f3dd4c6fa2852a045a7b22721a6c2f1a07657e1d8ffc7afb8c
 MD5 d96a6e4cab3496ffec2443635c142e49 files/gpsim-0.21.11-asneeded.patch 436
 RMD160 4e03dc5d0c9aed67291e55f8222487ba07be2d7f files/gpsim-0.21.11-asneeded.patch 436
 SHA256 b7b348ba245c30f3dd4c6fa2852a045a7b22721a6c2f1a07657e1d8ffc7afb8c files/gpsim-0.21.11-asneeded.patch 436
-AUX gpsim-0.21.11-eXdbm.patch 1338 RMD160 f36e0871b673867fdd3976dc92dfe9c6ca582dd7 SHA1 dbb55784b66caa6d3be96859f14bc9178c28e917 SHA256 40e6e1182a2a41ba554b34fc7e9ff1b750844d2b848fd6a8db1269da05b28c07
-MD5 fc4c24996476020a09ab6f9c3745c718 files/gpsim-0.21.11-eXdbm.patch 1338
-RMD160 f36e0871b673867fdd3976dc92dfe9c6ca582dd7 files/gpsim-0.21.11-eXdbm.patch 1338
-SHA256 40e6e1182a2a41ba554b34fc7e9ff1b750844d2b848fd6a8db1269da05b28c07 files/gpsim-0.21.11-eXdbm.patch 1338
+AUX gpsim-0.21.11-eXdbm.patch 1881 RMD160 0c11dda111220e3e449b3d96b79a2d2493df14a1 SHA1 b045829eae256fab792f87975fbc20cc3f1b4759 SHA256 3c906cd658568ea5c336a33fabf3c3207658134e5921a6e06d5e73584c9939e7
+MD5 0bb12f200183eac6827f67d35578a0f6 files/gpsim-0.21.11-eXdbm.patch 1881
+RMD160 0c11dda111220e3e449b3d96b79a2d2493df14a1 files/gpsim-0.21.11-eXdbm.patch 1881
+SHA256 3c906cd658568ea5c336a33fabf3c3207658134e5921a6e06d5e73584c9939e7 files/gpsim-0.21.11-eXdbm.patch 1881
 AUX gpsim-0.21.11-gcc41.patch 2573 RMD160 eb5e9eb9786c76b2f61b03cf7509edb17fcf7124 SHA1 d6f872b59b013714caa902f9e4b34f16a261786c SHA256 e6cb8d8d1eeb4adcdcf00814188b20d7380fa96357d46b430454f0abb86e9355
 MD5 2caf38f86f6b4155d37b3c70dc4edc22 files/gpsim-0.21.11-gcc41.patch 2573
 RMD160 eb5e9eb9786c76b2f61b03cf7509edb17fcf7124 files/gpsim-0.21.11-gcc41.patch 2573
@@ -25,10 +28,10 @@ SHA256 e29aeaaf2c22f5de7542ff8f6e68d958c2443d7010021eace17978feb1df9060 files/gp
 DIST gpsim-0.21.11.tar.gz 1218332 RMD160 36001180948fc2394043d8283dc1dd028ee4f922 SHA1 05337560a6b48a9afb7a3f4be1ba606709f6b30a SHA256 65d1a6a867cf0ee9a030e89b928d633ce7019b275b2683d6126fe8597e87fe84
 DIST gpsim-0.21.2.tar.gz 721817 RMD160 8dea42dbc76bd4e2f137da8217453f8517b3444a SHA1 9c16a1288f0c83923395d01e9749d56a087707f9 SHA256 92cda41865e748995d40f60274279fc60e4e1d33a448ccdf6566dc4de46746ea
 DIST gpsim-docs-0.21.2.tar.bz2 177642 RMD160 48f5914f898db2179f2abacee1054a57cb504d0a SHA1 b94584924e16091368666ea448dd347d1c90f552 SHA256 600ee25c937f2332e837fc84597139436ecb1a271ec578d0f96020f1e36fa459
-EBUILD gpsim-0.21.11-r1.ebuild 1528 RMD160 48802272328df8e931c6beb4864c50fde8b524d8 SHA1 b0bfec95e5e2cbea655e2f4aeae3a7d5eaefcdfc SHA256 7cd33074625482da6f15ed27314b1b4581cf4ce17dc3d743654cba22bec2a499
-MD5 8dd8a2bab7db943ebfc0a51008cee56c gpsim-0.21.11-r1.ebuild 1528
-RMD160 48802272328df8e931c6beb4864c50fde8b524d8 gpsim-0.21.11-r1.ebuild 1528
-SHA256 7cd33074625482da6f15ed27314b1b4581cf4ce17dc3d743654cba22bec2a499 gpsim-0.21.11-r1.ebuild 1528
+EBUILD gpsim-0.21.11-r1.ebuild 1500 RMD160 b41f6834bcff45e32b0d9ea54825e24caf54e482 SHA1 9bce578a1f91a596e99a03843595d48c72a48da1 SHA256 c389cb74afac255270bde576455c38e34d1f046b363a64eba8b2f27060bea1ec
+MD5 021393920d1c3ebdd8f7bc21895b41ee gpsim-0.21.11-r1.ebuild 1500
+RMD160 b41f6834bcff45e32b0d9ea54825e24caf54e482 gpsim-0.21.11-r1.ebuild 1500
+SHA256 c389cb74afac255270bde576455c38e34d1f046b363a64eba8b2f27060bea1ec gpsim-0.21.11-r1.ebuild 1500
 EBUILD gpsim-0.21.11.ebuild 1631 RMD160 2fccca141433ae8f2a6b2b30b6bde154d044014a SHA1 2fe42dfbfbe68357ec687f2efa24a826f0604968 SHA256 2caa2b895e97e13142af181cf1882ee678bb565284c5d5f0a7b93d23836e8d0c
 MD5 b5f3e9d09f5775cc99ce90828b3b3e23 gpsim-0.21.11.ebuild 1631
 RMD160 2fccca141433ae8f2a6b2b30b6bde154d044014a gpsim-0.21.11.ebuild 1631
@@ -37,10 +40,10 @@ EBUILD gpsim-0.21.2.ebuild 1100 RMD160 27b4382535a4341e76256cf68bf3c2c0fdb1d751
 MD5 5609291dc1290231ef64a053c507f147 gpsim-0.21.2.ebuild 1100
 RMD160 27b4382535a4341e76256cf68bf3c2c0fdb1d751 gpsim-0.21.2.ebuild 1100
 SHA256 7ae89df45b95880e06e9205d4ca4183ef26ffff41eea14582172b9d7412a9a3c gpsim-0.21.2.ebuild 1100
-MISC ChangeLog 3969 RMD160 b238c308b66535405fd27bb9e3ec6f2f82bf318f SHA1 d4b305963f123a97de6084dff37369741288a35d SHA256 aa5fdf9dea3e2c740d7ad73a0cfadb90f6edf427678c9eee5d0d76ba3a556131
-MD5 4b2092d1feea28c6fd2b32ea6298a97f ChangeLog 3969
-RMD160 b238c308b66535405fd27bb9e3ec6f2f82bf318f ChangeLog 3969
-SHA256 aa5fdf9dea3e2c740d7ad73a0cfadb90f6edf427678c9eee5d0d76ba3a556131 ChangeLog 3969
+MISC ChangeLog 4175 RMD160 188898afe3c7fb862280b8f12d88c9470efa15a3 SHA1 e7d9d583ee114dda51975182180f8f17bbff5c71 SHA256 be4ae0899170d9b264948fc3d309e5e3b9ca0737ddfec9b5aa529af053a65f2c
+MD5 b75c195046f76a4849c1a4b6e32d1138 ChangeLog 4175
+RMD160 188898afe3c7fb862280b8f12d88c9470efa15a3 ChangeLog 4175
+SHA256 be4ae0899170d9b264948fc3d309e5e3b9ca0737ddfec9b5aa529af053a65f2c ChangeLog 4175
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
@@ -54,3 +57,10 @@ SHA256 fa9caeb039a8f1c41ed7f817abf0ea46dfc32fdb9f8ed7c4e4008c5b7f52d19d files/di
 MD5 02644ae91d1a366531569b71107d7514 files/digest-gpsim-0.21.2 494
 RMD160 41a4189592664e576d414914c2c58cffdda38e5e files/digest-gpsim-0.21.2 494
 SHA256 da1ae15daada5fae3a9f40f48afeed8ca1968c5abc1bf0ac0e0513eb0958658d files/digest-gpsim-0.21.2 494
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnfRIAiZjviIA2XgRAkmVAJ9PNijlBkttOJsskW1V2vv20KahlwCffUhN
+aDcu+jTES8OHQCHbGbXCSJo=
+=o+n4
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
index a4d19bd35739..dd080f6f5f0d 100644
--- a/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
@@ -1,6 +1,8 @@
---- gpsim-0.21.11.orig/cli/Makefile.am	2005-04-27 10:55:13.000000000 +1000
-+++ gpsim-0.21.11/cli/Makefile.am	2006-11-04 14:00:26.000000000 +1100
-@@ -46,6 +46,7 @@
+Index: gpsim-0.21.11/cli/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/cli/Makefile.am
++++ gpsim-0.21.11/cli/Makefile.am
+@@ -46,6 +46,7 @@ libgpsimcli_la_SOURCES = \
  	cmd_version.h misc.h cmd_disasm.h  cmd_list.h  cmd_quit.h \
  	cmd_stimulus.h cmd_x.h symbol_t.h cmd_frequency.h cmd_icd.h \
  	cmd_macro.h ui_gpsim.h
@@ -8,19 +10,23 @@
  
  
  AM_YFLAGS = -dvt
---- gpsim-0.21.11.orig/gui/Makefile.am	2005-09-19 23:54:21.000000000 +1000
-+++ gpsim-0.21.11/gui/Makefile.am	2006-11-04 14:02:02.000000000 +1100
-@@ -17,6 +17,7 @@
+Index: gpsim-0.21.11/gui/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/gui/Makefile.am
++++ gpsim-0.21.11/gui/Makefile.am
+@@ -17,6 +17,7 @@ libgpsimgui_la_SOURCES =  gui_break.cc g
  	preferences.cc preferences.h \
  	settings.h settings_exdbm.h
  
-+libgpsimgui_la_LDADD = ../eXdbm/libgpsim_eXdbm.la
++libgpsimgui_la_LIBADD = ../eXdbm/libgpsim_eXdbm.la
  libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
  
  pixmapdir = $(datadir)/gpsim
---- gpsim-0.21.11/gpsim/Makefile.am.orig	2006-11-04 14:57:41.000000000 +1100
-+++ gpsim-0.21.11/gpsim/Makefile.am	2006-11-04 14:58:03.000000000 +1100
-@@ -9,6 +9,6 @@
+Index: gpsim-0.21.11/gpsim/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/gpsim/Makefile.am
++++ gpsim-0.21.11/gpsim/Makefile.am
+@@ -9,6 +9,6 @@ bin_PROGRAMS = gpsim
  gpsim_SOURCES = main.cc
  
  gpsim_LDFLAGS =  $(shell gtk-config --cflags)
@@ -29,3 +35,14 @@
 +gpsim_LDADD = ../src/libgpsim.la ../eXdbm/libgpsim_eXdbm.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
 +  @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
    @X_LDFLAGS@ @Y_LDFLAGS@ @LIBREADLINE@
+Index: gpsim-0.21.11/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/Makefile.am
++++ gpsim-0.21.11/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = cli xpms eXdbm gui src gpsim modules examples doc
++SUBDIRS = eXdbm cli xpms gui src gpsim modules examples doc
+ 
+ dist-hook:
+ 	cp gpsim.spec $(distdir)     
diff --git a/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild b/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild
index 2a6c6836a132..8731ef0eda18 100644
--- a/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild,v 1.3 2006/12/23 21:34:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild,v 1.4 2007/01/05 06:45:54 flameeyes Exp $
 
-inherit gnuconfig eutils autotools
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
 
 DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
 HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
@@ -28,19 +31,17 @@ RDEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	epatch "${FILESDIR}/${P}-eXdbm.patch"
-#        epatch "${FILESDIR}/${P}-asneeded.patch"
 	epatch "${FILESDIR}/gpsim-0.21.11-ktechlab.patch"
 	epatch "${FILESDIR}/gpsim-0.21.11-nogui.patch"
 	epatch "${FILESDIR}/gpsim-0.21.11-gtk2.diff"
-	eautoconf
+	eautoreconf
 }
 
 src_compile() {
-	gnuconfig_update
 	econf $(use_enable gtk gui) || die
 	emake || die
 }