Fixed bug #196483. Fixed compilation failing on warnings due to -Werror in CXXFLAGS. Removed old ebuild.

(Portage version: 2.1.3.15)

5 files changed, 14 insertions, 49 deletions

diff --git a/dev-embedded/uisp/ChangeLog b/dev-embedded/uisp/ChangeLog
index a4c0d640f6f7..3503e22398e7 100644
--- a/dev-embedded/uisp/ChangeLog
+++ b/dev-embedded/uisp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/uisp
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.14 2007/09/19 15:46:47 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.15 2007/10/20 20:58:26 calchan Exp $
+
+  20 Oct 2007; Denis Dupeyron <calchan@gentoo.org> -files/uisp-gcc34.patch,
+  -uisp-20040311.ebuild, uisp-20050207-r1.ebuild:
+  Fixed bug #196483. Fixed compilation failing on warnings due to -Werror in
+  CXXFLAGS. Removed old ebuild.
 
   19 Sep 2007; Denis Dupeyron <calchan@gentoo.org> -uisp-20050103.ebuild:
   Removed useless uisp-20050103 which fixes bug #193017.
diff --git a/dev-embedded/uisp/files/digest-uisp-20040311 b/dev-embedded/uisp/files/digest-uisp-20040311
deleted file mode 100644
index 20ac24e6e7df..000000000000
--- a/dev-embedded/uisp/files/digest-uisp-20040311
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ddb3b742d96f85440dfe627d54797f6e uisp-20040311.tar.bz2 142973
-RMD160 4f45d375e942376a2508232cf787f94ab7f8995b uisp-20040311.tar.bz2 142973
-SHA256 74121cc594e2e2e11fc4b3c9d9c395ccc224f5b1357b36e550a89710dc0a71b3 uisp-20040311.tar.bz2 142973
diff --git a/dev-embedded/uisp/files/uisp-gcc34.patch b/dev-embedded/uisp/files/uisp-gcc34.patch
deleted file mode 100644
index 66d8f51978f1..000000000000
--- a/dev-embedded/uisp/files/uisp-gcc34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-20040311.ebuild b/dev-embedded/uisp/uisp-20040311.ebuild
deleted file mode 100644
index 4edd318b517b..000000000000
--- a/dev-embedded/uisp/uisp-20040311.ebuild
+++ /dev/null
@@ -1,30 +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-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"
-SRC_URI="http://savannah.nongnu.org/download/uisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-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/*
-	prepalldocs
-}
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 75a2e5949845..686cc0e9f04b 100644
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/uisp/uisp-20050207-r1.ebuild,v 1.2 2005/09/13 15:15:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20050207-r1.ebuild,v 1.3 2007/10/20 20:58:26 calchan Exp $
 
 inherit eutils
 
@@ -19,8 +19,9 @@ RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/mega-48-88-168.patch
+	cd "${S}"/src
+	epatch "${FILESDIR}"/mega-48-88-168.patch
+	sed -i -e 's: -Werror::' Makefile.in
 }
 
 src_compile() {
@@ -29,7 +30,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc doc/*
+	mv "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,CHANGES,TODO}* "${D}"/usr/share/doc/${PF}
+	rm -rf "${D}"/usr/share/doc/${P}
 	prepalldocs
 }