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

Package-Manager: portage-2.1.3.15

6 files changed, 22 insertions, 69 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/Manifest b/dev-embedded/uisp/Manifest
index d8b3b626edd9..b40e66259f60 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -2,31 +2,19 @@ AUX mega-48-88-168.patch 1723 RMD160 f159146aa5c16de9c8ca233fa636b7fc13da1873 SH
 MD5 41aa2cbce2f55b305d45fa51a76df4af files/mega-48-88-168.patch 1723
 RMD160 f159146aa5c16de9c8ca233fa636b7fc13da1873 files/mega-48-88-168.patch 1723
 SHA256 85a3d5a53c8493d93802962be0ba625977ab4e0b6e6ea19f4e82cef4416b3292 files/mega-48-88-168.patch 1723
-AUX uisp-gcc34.patch 239 RMD160 f8759e869b72c6e8c43beeb3672b95d372a65750 SHA1 1d8302e16bd59102c6f0789a5b5cdc844f838ae5 SHA256 e21a46de7a8bb0b74cc85e8b9e7368cc042137be55047a582a82bb12a7323926
-MD5 b286026a1895b223efeb016c526bc59b files/uisp-gcc34.patch 239
-RMD160 f8759e869b72c6e8c43beeb3672b95d372a65750 files/uisp-gcc34.patch 239
-SHA256 e21a46de7a8bb0b74cc85e8b9e7368cc042137be55047a582a82bb12a7323926 files/uisp-gcc34.patch 239
-DIST uisp-20040311.tar.bz2 142973 RMD160 4f45d375e942376a2508232cf787f94ab7f8995b SHA1 8e4c1e05d2f9a962b8969fc76d8b448c9e0751d4 SHA256 74121cc594e2e2e11fc4b3c9d9c395ccc224f5b1357b36e550a89710dc0a71b3
 DIST uisp-20050207.tar.gz 166745 RMD160 c0c1236912ac85515dc7f9d2851fa4aea621d525 SHA1 f1b5bf5bdd9597ae7fd8d8ae733d6f5cd31f9cf7 SHA256 7c43c5f34f00a7243bda87457e43dc9122b5a3837b1370b30f39c1eecbedccae
-EBUILD uisp-20040311.ebuild 720 RMD160 930d854b80edd7f60d4203f208da81435674e8b4 SHA1 d54b7025f919749a03599fa8476dca2f1044d8e0 SHA256 18ca90e7395bc7dcb529fa25fa26fbe8e9cf9cd304fbd8708e8b6f3886e1df83
-MD5 548e48d64c6672cedd597495ccde9ac2 uisp-20040311.ebuild 720
-RMD160 930d854b80edd7f60d4203f208da81435674e8b4 uisp-20040311.ebuild 720
-SHA256 18ca90e7395bc7dcb529fa25fa26fbe8e9cf9cd304fbd8708e8b6f3886e1df83 uisp-20040311.ebuild 720
-EBUILD uisp-20050207-r1.ebuild 833 RMD160 e623f79b9bbf0766839748fbb5b6ad6cdf99b334 SHA1 1866bd43b37d97db78055e801b01caf116ba2aca SHA256 cf075729ec24974bf01aa5b5e387dde71682814d9489451b7f592b6db907841c
-MD5 9a1006432940f677369e00783b896586 uisp-20050207-r1.ebuild 833
-RMD160 e623f79b9bbf0766839748fbb5b6ad6cdf99b334 uisp-20050207-r1.ebuild 833
-SHA256 cf075729ec24974bf01aa5b5e387dde71682814d9489451b7f592b6db907841c uisp-20050207-r1.ebuild 833
-MISC ChangeLog 1961 RMD160 6af8885431b125d5f4ffafa58b7d8d346a043841 SHA1 cdcd16c800b3ed130316027ff32eab981a72ae15 SHA256 8ac8a5723719a8a7ac45f50349f44f403a4429552a71e470562f1b2cdcd4f174
-MD5 e6d755d8125c497813206bbe32bc9523 ChangeLog 1961
-RMD160 6af8885431b125d5f4ffafa58b7d8d346a043841 ChangeLog 1961
-SHA256 8ac8a5723719a8a7ac45f50349f44f403a4429552a71e470562f1b2cdcd4f174 ChangeLog 1961
+EBUILD uisp-20050207-r1.ebuild 1001 RMD160 232806206f66cf04d1fe9ad20f808bde39c35b86 SHA1 c09055a7c8059edcc92c20bf12583d00e0b25b24 SHA256 3379ae08f6e745a294f4055996cc5cd422c0a8f8fd8aacd0dda2e635f76ea2ed
+MD5 c8dc56f49e0d7081849aa37e28f65bd2 uisp-20050207-r1.ebuild 1001
+RMD160 232806206f66cf04d1fe9ad20f808bde39c35b86 uisp-20050207-r1.ebuild 1001
+SHA256 3379ae08f6e745a294f4055996cc5cd422c0a8f8fd8aacd0dda2e635f76ea2ed uisp-20050207-r1.ebuild 1001
+MISC ChangeLog 2197 RMD160 5a8701153ee70b3e652d6ae70276b5231234a9de SHA1 76f8f31545d606cbf21cb62a2b272ec151c75683 SHA256 3b17ea8a763946709f68df34452e05ffd7db8fd89cbbc2080d32d580f6af3fa3
+MD5 338875e750a60f15e5a7da4072a25346 ChangeLog 2197
+RMD160 5a8701153ee70b3e652d6ae70276b5231234a9de ChangeLog 2197
+SHA256 3b17ea8a763946709f68df34452e05ffd7db8fd89cbbc2080d32d580f6af3fa3 ChangeLog 2197
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a metadata.xml 165
-MD5 9727eeebe738c10c191cd2e4da703129 files/digest-uisp-20040311 244
-RMD160 efa567cfe67b83595e6525f19155dcb092a232fa files/digest-uisp-20040311 244
-SHA256 e1073acd1cd1b5cc932b5ecfc54fb824377bb7341c461654301479ee920a1129 files/digest-uisp-20040311 244
 MD5 b62822f41e7741b88a2fc67daa8cb280 files/digest-uisp-20050207-r1 241
 RMD160 b7ee85695d32a8f39de6c900f574e22de9331bb5 files/digest-uisp-20050207-r1 241
 SHA256 81b3b6f748609bcb54546bf6e9183a61d851927b7ec21cd8965b48e6cdf7ad1d files/digest-uisp-20050207-r1 241
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
 }