Bugs #99172, #113366, #118721, #119556, #126687 all fixed in both 0.21.2-r1 and 0.21.11. USE=gtkused to control GUI now instead of USE=X.

(Portage version: 2.1_pre6-r6)

6 files changed, 167 insertions, 6 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index fccde74029f6..46b0aa4a2265 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/gpsim
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.17 2005/06/05 12:20:51 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.18 2006/03/25 06:12:50 robbat2 Exp $
+
+*gpsim-0.21.11 (25 Mar 2006)
+*gpsim-0.21.2-r1 (25 Mar 2006)
+
+  25 Mar 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +gpsim-0.21.2-r1.ebuild, +gpsim-0.21.11.ebuild:
+  Bugs #99172, #113366, #118721, #119556, #126687 all fixed in both 0.21.2-r1
+  and 0.21.11. USE=gtk used to control GUI now instead of USE=X.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gpsim-0.21.2.ebuild:
   Stable on ppc.
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 92df2ecadc29..625abadec1ab 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,7 +1,33 @@
-MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 MD5 594ea7a79a1b5028af6500ba9564ac2c ChangeLog 2476
+RMD160 01c875032a2a4fd5af0e5a51549a43558cf6e584 ChangeLog 2476
+SHA256 e1fff26857338de8fa040ef4cae573ba2978f09c14c01252868fd20af6c48fdf ChangeLog 2476
+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 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 59f2bde6d2d21ab98d391d2be405b194 gpsim-0.21.11.ebuild 1604
+RMD160 edbe8f7de50f752fa27e5ea01fa9c273ae174b0c gpsim-0.21.11.ebuild 1604
+SHA256 1629aaf7d4f1844f70c04fcd71b25780a05c536ec2ea3df191105284e749a0a5 gpsim-0.21.11.ebuild 1604
+MD5 df8008eb865f685b4c1a236af1af4d20 gpsim-0.21.2-r1.ebuild 1313
+RMD160 05ff4a20ee340a672190e204f8d092ceb16e584d gpsim-0.21.2-r1.ebuild 1313
+SHA256 549a922835fcf126ce74b6534085081d4c5be182a752f82a587c652412f309dc gpsim-0.21.2-r1.ebuild 1313
 MD5 5609291dc1290231ef64a053c507f147 gpsim-0.21.2.ebuild 1100
-MD5 aad12da70389a0c7871624aadadeaa58 files/gpsim-0.20.14-gcc2_fix.patch 407
-MD5 936707e2f6868120b029358522a740df files/digest-gpsim-0.21.2 134
-MD5 de88a554b8897c4076fe1716a1299c08 files/digest-gpsim-0.20.14-r1 205
+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
diff --git a/dev-embedded/gpsim/files/digest-gpsim-0.21.11 b/dev-embedded/gpsim/files/digest-gpsim-0.21.11
new file mode 100644
index 000000000000..bf751dc95116
--- /dev/null
+++ b/dev-embedded/gpsim/files/digest-gpsim-0.21.11
@@ -0,0 +1,3 @@
+MD5 2acd268dc2dd69d1ad687253bde8dd21 gpsim-0.21.11.tar.gz 1218332
+RMD160 36001180948fc2394043d8283dc1dd028ee4f922 gpsim-0.21.11.tar.gz 1218332
+SHA256 65d1a6a867cf0ee9a030e89b928d633ce7019b275b2683d6126fe8597e87fe84 gpsim-0.21.11.tar.gz 1218332
diff --git a/dev-embedded/gpsim/files/digest-gpsim-0.21.2-r1 b/dev-embedded/gpsim/files/digest-gpsim-0.21.2-r1
new file mode 100644
index 000000000000..6ebb1b915e8b
--- /dev/null
+++ b/dev-embedded/gpsim/files/digest-gpsim-0.21.2-r1
@@ -0,0 +1,6 @@
+MD5 4a9b5890721266f7167bd76ba7ee99ba gpsim-0.21.2.tar.gz 721817
+RMD160 8dea42dbc76bd4e2f137da8217453f8517b3444a gpsim-0.21.2.tar.gz 721817
+SHA256 92cda41865e748995d40f60274279fc60e4e1d33a448ccdf6566dc4de46746ea gpsim-0.21.2.tar.gz 721817
+MD5 2ce9012fa4970ac64573d21e7d708cba gpsim-docs-0.21.2.tar.bz2 177642
+RMD160 48f5914f898db2179f2abacee1054a57cb504d0a gpsim-docs-0.21.2.tar.bz2 177642
+SHA256 600ee25c937f2332e837fc84597139436ecb1a271ec578d0f96020f1e36fa459 gpsim-docs-0.21.2.tar.bz2 177642
diff --git a/dev-embedded/gpsim/gpsim-0.21.11.ebuild b/dev-embedded/gpsim/gpsim-0.21.11.ebuild
new file mode 100644
index 000000000000..3c76ae4157f4
--- /dev/null
+++ b/dev-embedded/gpsim/gpsim-0.21.11.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2006/03/25 06:12:50 robbat2 Exp $
+
+inherit gnuconfig
+
+DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
+HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
+SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz"
+	#doc? ( http://dev.gentoo.org/~puggy/files/gpsim-docs-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="gtk doc"
+DEPEND="gtk? ( >=x11-libs/gtk+extra-2* )
+	=dev-libs/glib-1.2*
+	>=sys-libs/readline-2.0
+	sys-devel/flex"
+
+RDEPEND="${DEPEND}
+	>=dev-embedded/gputils-0.12.0"
+
+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
+}
+
+src_compile() {
+	gnuconfig_update
+	econf `use_enable gtk gui` || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# install boring documentation
+	dodoc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS PROCESSORS
+	dodoc README README.EXAMPLES README.MODULES TODO
+
+	# install interesting documentation
+	if use doc
+	then
+		cd ${WORKDIR}/gpsim-docs-${PV}
+		dodoc gpsim.pdf gui.pdf
+	fi
+}
diff --git a/dev-embedded/gpsim/gpsim-0.21.2-r1.ebuild b/dev-embedded/gpsim/gpsim-0.21.2-r1.ebuild
new file mode 100644
index 000000000000..3a4e91205023
--- /dev/null
+++ b/dev-embedded/gpsim/gpsim-0.21.2-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.2-r1.ebuild,v 1.1 2006/03/25 06:12:50 robbat2 Exp $
+
+inherit gnuconfig autotools
+
+DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
+HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
+SRC_URI="http://www.dattalo.com/gnupic/${P}.tar.gz
+	doc? ( http://dev.gentoo.org/~puggy/files/gpsim-docs-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="gtk doc"
+DEPEND="gtk? ( =x11-libs/gtk+extra-0.99* )
+	=dev-libs/glib-1.2*
+	>=sys-libs/readline-2.0
+	sys-devel/flex"
+
+RDEPEND="${DEPEND}
+	>=dev-embedded/gputils-0.12.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	for i in configure.in ; do
+		sed -i.orig \
+		-e 's,CFLAGS="-g -O2",:,g' \
+		-e 's,CXXFLAGS="-g -O2",:,g' \
+		${i} ;
+	done
+	eautoreconf
+	gnuconfig_update
+	elibtoolize
+}
+
+src_compile() {
+	econf `use_enable gtk gui` || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# install boring documentation
+	dodoc ANNOUNCE AUTHORS ChangeLog HISTORY INSTALL NEWS PROCESSORS
+	dodoc README README.EXAMPLES README.MODULES TODO
+
+	# install interesting documentation
+	if use doc ; then
+		cd ${WORKDIR}/gpsim-docs-${PV}
+		dodoc gpsim.pdf gui.pdf
+	fi
+}