Fixed bug #128813 and cleaned up a bit.

Package-Manager: portage-2.0.54-r2

3 files changed, 17 insertions, 55 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index fcdc12f42f45..f2aaa8686212 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,9 @@
 # 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.20 2006/04/15 22:57:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.21 2006/05/27 08:11:27 calchan Exp $
+
+  27 May 2006; Denis Dupeyron <calchan@gentoo.org> gpsim-0.21.11.ebuild:
+  Fixed bug #128813 and cleaned up a bit.
 
   15 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/gpsim-0.21.11-asneeded.patch, gpsim-0.21.11.ebuild:
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 69c0e8ee3fc3..c5ece44d030a 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,49 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 91b939a9e4e2bac64a252b6e3de5ee2a ChangeLog 3124
-RMD160 298cdc11826e209a97c2b23a7f0720d950288802 ChangeLog 3124
-SHA256 b6e9d0c7d54fab6cf7c60775ed34b37cc13aa649e7deaa2de04dcffb24e8dea5 ChangeLog 3124
+MD5 7faea70f9f6ebece99925bd7f74816fb ChangeLog 3238
 MD5 de88a554b8897c4076fe1716a1299c08 files/digest-gpsim-0.20.14-r1 205
-RMD160 792d94a559feaadd51bb1d4900095ef9b43378dd files/digest-gpsim-0.20.14-r1 205
-SHA256 a64c0c2fd32e3618cdf5c088fb74e21402907cb74dd8395c0dfd7c83e0bdf7cf files/digest-gpsim-0.20.14-r1 205
 MD5 3229269171c2c859f372e57727827c09 files/digest-gpsim-0.21.11 244
-RMD160 4a1a32434a183eb39f4566f87c7b3d0d0fd91864 files/digest-gpsim-0.21.11 244
-SHA256 76750ef56362259aeffbcdad0041cac65471732e608763484ef7ce8666a36c85 files/digest-gpsim-0.21.11 244
 MD5 936707e2f6868120b029358522a740df files/digest-gpsim-0.21.2 134
-RMD160 f7bf3e39f7188242f78c92f425c666dd2d5a53e8 files/digest-gpsim-0.21.2 134
-SHA256 1174b90c517142f809d3c2d2b390c463c7b1cc39af153b1eae988d14503916c5 files/digest-gpsim-0.21.2 134
 MD5 02644ae91d1a366531569b71107d7514 files/digest-gpsim-0.21.2-r1 494
-RMD160 41a4189592664e576d414914c2c58cffdda38e5e files/digest-gpsim-0.21.2-r1 494
-SHA256 da1ae15daada5fae3a9f40f48afeed8ca1968c5abc1bf0ac0e0513eb0958658d files/digest-gpsim-0.21.2-r1 494
 MD5 aad12da70389a0c7871624aadadeaa58 files/gpsim-0.20.14-gcc2_fix.patch 407
-RMD160 57b7083fc136d660d480a44f24c3cd81cc993f3c files/gpsim-0.20.14-gcc2_fix.patch 407
-SHA256 0628471d4a1f781e408ea53f5b763d58b098d50525a00ab3d2d61994046ebcd1 files/gpsim-0.20.14-gcc2_fix.patch 407
 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
 MD5 2caf38f86f6b4155d37b3c70dc4edc22 files/gpsim-0.21.11-gcc41.patch 2573
-RMD160 eb5e9eb9786c76b2f61b03cf7509edb17fcf7124 files/gpsim-0.21.11-gcc41.patch 2573
-SHA256 e6cb8d8d1eeb4adcdcf00814188b20d7380fa96357d46b430454f0abb86e9355 files/gpsim-0.21.11-gcc41.patch 2573
 MD5 15e8057f7f12113a704b8d9fbfdad2bb gpsim-0.20.14-r1.ebuild 1106
-RMD160 6bf4de6bc13c33b3aacabde3b66e4f846335888c gpsim-0.20.14-r1.ebuild 1106
-SHA256 1db0703f58aaeed41436fa6535ca9a485831ce69aab4fbc1de32d816284ed185 gpsim-0.20.14-r1.ebuild 1106
-MD5 78adeacffa083ff45b7651914d5291a6 gpsim-0.21.11.ebuild 1751
-RMD160 b90091562c0cabb7b4763b5ffc374eef8c88da81 gpsim-0.21.11.ebuild 1751
-SHA256 4019bf8eb873f8bd12e1b2e47cbe291e60c1d5e39eb5b6f31170c43dd3b0f773 gpsim-0.21.11.ebuild 1751
+MD5 c08914d19d1fc672e26c30606c279555 gpsim-0.21.11.ebuild 1624
 MD5 0f3ec324a68710b4f9b1d952dec1f079 gpsim-0.21.2-r1.ebuild 1321
-RMD160 d71312d4ed475219ba5c5716ddf70734d6f8b448 gpsim-0.21.2-r1.ebuild 1321
-SHA256 ce013379d7084f0e5ae8601b0506448e903207e64927ce1fa72590e89009ef2d gpsim-0.21.2-r1.ebuild 1321
 MD5 5609291dc1290231ef64a053c507f147 gpsim-0.21.2.ebuild 1100
-RMD160 27b4382535a4341e76256cf68bf3c2c0fdb1d751 gpsim-0.21.2.ebuild 1100
-SHA256 7ae89df45b95880e06e9205d4ca4183ef26ffff41eea14582172b9d7412a9a3c gpsim-0.21.2.ebuild 1100
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
-RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
-SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a metadata.xml 165
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEQXmaAiZjviIA2XgRArI9AJ4jhVEqNkFr+Fo5jwhFFo1qAzhWlgCg2u55
-0Z7IypUjgTdKbLkpw0n7i+k=
-=W+kl
------END PGP SIGNATURE-----
diff --git a/dev-embedded/gpsim/gpsim-0.21.11.ebuild b/dev-embedded/gpsim/gpsim-0.21.11.ebuild
index 43fa9f78fb71..ef20583abb7f 100644
--- a/dev-embedded/gpsim/gpsim-0.21.11.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.21.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.4 2006/04/15 22:57:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.21.11.ebuild,v 1.5 2006/05/27 08:11:27 calchan Exp $
 
 inherit gnuconfig eutils libtool autotools
 
@@ -24,22 +24,17 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	sed -i.orig \
-	-e '864s,&& defined HAVE_GUI,,g' \
-	-e '774s,#ifdef HAVE_GUI,,g' \
-	-e '793s,#endif,,g' \
-	${S}/cli/input.cc
-	#for i in ${S}/gpsim/Makefile.{in,am} ; do
-	#	sed -i.orig -e '/^gpsim_LDFLAGS/s,$, -lpthread,g' $i
-	#done
-	for i in ${S}/cli/Makefile.{in,am} ; do
-		sed -i.orig -e '/^libgpsimcli_la_LDFLAGS/s,$, -lpthread,g' $i
-	done
-	for i in ${S}/src/Makefile.{in,am} ; do
-		sed -i.orig -e '/^libgpsim_la_LDFLAGS/s,$, -lpthread,g' $i
-	done
+	cd ${S}
+
+	sed -i \
+		-e '864s,&& defined HAVE_GUI,,g' \
+		-e '774s,#ifdef HAVE_GUI,,g' \
+		-e '793s,#endif,,g' \
+		cli/input.cc
+	sed -i -e '/^gpsim_LDFLAGS/s,$, -lpthread -ldl,g' gpsim/Makefile.am
+	sed -i -e '/^libgpsimcli_la_LDFLAGS/s,$, -lpthread,g' cli/Makefile.am
+	sed -i -e '/^libgpsim_la_LDFLAGS/s,$, -lpthread,g' src/Makefile.am
 
-	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	epatch "${FILESDIR}/${P}-asneeded.patch"