Removed 2003 version. Patched 2004 version as per bug #74216. Version bump commited

8 files changed, 88 insertions, 27 deletions

diff --git a/dev-embedded/uisp/ChangeLog b/dev-embedded/uisp/ChangeLog
index cf14dadc56cc..3c5c674d59ac 100644
--- a/dev-embedded/uisp/ChangeLog
+++ b/dev-embedded/uisp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/uisp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.7 2005/01/01 17:57:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.8 2005/01/02 23:39:50 dragonheart Exp $
+
+*uisp-20050103 (03 Jan 2005)
+
+  03 Jan 2005; Daniel Black <dragonheart@gentoo.org> +files/uisp-gcc34.patch,
+  -uisp-20030618.ebuild, uisp-20040311.ebuild, +uisp-20050103.ebuild:
+  Removed 2003 version. Patched 2004 version as per bug #74216 with patch by Ian
+  Hubbertz <gentoo2@hubbertz.de>. Version bump commited
 
   18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> uisp-20040311.ebuild:
   stable on x86.
diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
index c5564f93179f..d339a9b0d7e6 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -1,6 +1,17 @@
-MD5 028d006ac0002e30e256443bd5f1cc76 ChangeLog 884
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e3e543d0ffb8309f68a45d5ed11b7392 ChangeLog 1201
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
-MD5 2d0bfe2487c9fe939ec0b1ea92729ac6 uisp-20030618.ebuild 582
-MD5 bd2ad9c4402969f8286892d51c5a4d4c uisp-20040311.ebuild 622
-MD5 5a2a3165035f52176c6df5371c7faff5 files/digest-uisp-20030618 65
+MD5 9259c61ab41089948b45f878c399ed97 uisp-20050103.ebuild 1177
+MD5 548e48d64c6672cedd597495ccde9ac2 uisp-20040311.ebuild 720
+MD5 b286026a1895b223efeb016c526bc59b files/uisp-gcc34.patch 239
+MD5 43d51e70f4081f26b45f71d513c757f8 files/digest-uisp-20050103 65
 MD5 340231b36e7605c3932670c55256a850 files/digest-uisp-20040311 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB2IZMmdTrptrqvGERAnqpAJ0UvepyONzNMg+dZ8GhUC5tp/H+qACcCFkB
+f9yCpRf0opo7HbcXF8sJkcI=
+=2DaV
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/uisp/files/digest-uisp-20030618 b/dev-embedded/uisp/files/digest-uisp-20030618
deleted file mode 100644
index c11262a6c6a2..000000000000
--- a/dev-embedded/uisp/files/digest-uisp-20030618
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d5d475a5e5f7bb2bfa45e85c3b94af4 uisp-20030618.tar.gz 123877
diff --git a/dev-embedded/uisp/files/digest-uisp-20050103 b/dev-embedded/uisp/files/digest-uisp-20050103
new file mode 100644
index 000000000000..199d84e65f65
--- /dev/null
+++ b/dev-embedded/uisp/files/digest-uisp-20050103
@@ -0,0 +1 @@
+MD5 ed1e7b29251d8f281ee4a162d6cb436e uisp-20050103.tar.bz2 92769
diff --git a/dev-embedded/uisp/files/uisp-gcc34.patch b/dev-embedded/uisp/files/uisp-gcc34.patch
new file mode 100644
index 000000000000..66d8f51978f1
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-gcc34.patch
@@ -0,0 +1,10 @@
+--- Global.h.orig	2003-02-18 02:46:14.000000000 +0930
++++ Global.h	2005-01-03 08:36:31.379803544 +0930
+@@ -29,6 +29,7 @@
+ #define __GLOBAL
+ 
+ #include <assert.h>
++#include <stdio.h>
+ 
+ typedef unsigned char TByte;
+ typedef unsigned TAddr;
diff --git a/dev-embedded/uisp/uisp-20030618.ebuild b/dev-embedded/uisp/uisp-20030618.ebuild
deleted file mode 100644
index 20296641a187..000000000000
--- a/dev-embedded/uisp/uisp-20030618.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20030618.ebuild,v 1.6 2005/01/01 17:57:04 eradicator Exp $
-
-DESCRIPTION="tool for AVR microcontrollers which can interface to many hardware in-system programmers"
-HOMEPAGE="http://savannah.nongnu.org/projects/uisp"
-SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc doc/*
-	prepalldocs
-}
diff --git a/dev-embedded/uisp/uisp-20040311.ebuild b/dev-embedded/uisp/uisp-20040311.ebuild
index 4c8a41bc93c5..4edd318b517b 100644
--- a/dev-embedded/uisp/uisp-20040311.ebuild
+++ b/dev-embedded/uisp/uisp-20040311.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20040311.ebuild,v 1.6 2005/01/01 17:57:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20040311.ebuild,v 1.7 2005/01/02 23:39:50 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="tool for AVR microcontrollers which can interface to many hardware in-system programmers"
 HOMEPAGE="http://savannah.nongnu.org/projects/uisp"
@@ -15,6 +17,12 @@ DEPEND="sys-apps/gawk
 	sys-devel/gcc"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/uisp-gcc34.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc doc/*
diff --git a/dev-embedded/uisp/uisp-20050103.ebuild b/dev-embedded/uisp/uisp-20050103.ebuild
new file mode 100644
index 000000000000..9745abcbc62e
--- /dev/null
+++ b/dev-embedded/uisp/uisp-20050103.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20050103.ebuild,v 1.1 2005/01/02 23:39:50 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="tool for AVR microcontrollers which can interface to many hardware in-system programmers"
+HOMEPAGE="http://savannah.nongnu.org/projects/uisp"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+#SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+S=${WORKDIR}/${PN}
+
+DEPEND="sys-apps/gawk
+	sys-devel/gcc
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.57"
+RDEPEND=""
+
+#src_unpack() {
+#	unpack ${A}
+#	cd ${S}/src
+#	epatch ${FILESDIR}/uisp-gcc34.patch
+#}
+
+src_compile() {
+	rm -rf autom4te.cache
+	export WANT_AUTOCONF=2.57 WANT_AUTOMAKE=1.7
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+	automake --foreign --add-missing --copy || die "automake failed"
+	econf || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+	dodoc doc/*
+	prepalldocs
+}