Fix bug #146580, thanks to Aurélien Francillon for the patch.

(Portage version: 2.1.1_rc1-r4)
 (Signed Manifest commit)

3 files changed, 19 insertions, 77 deletions

diff --git a/dev-tinyos/tos-apps/Manifest b/dev-tinyos/tos-apps/Manifest
index 924d47742344..836c53a414e9 100644
--- a/dev-tinyos/tos-apps/Manifest
+++ b/dev-tinyos/tos-apps/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tos-apps-1.1.15-TOSBase-types-conflict-fix.patch 638 RMD160 a95e5df18dba1fa61ad5300724eaf63989791778 SHA1 364b866acc7f3ef1d8fa7e5efcf5321da4612d9f SHA256 adc684e62936080da0b77b42b7ad5b2febfe6b458c5b4455ba2cfb045a457cb3
+MD5 2bd0d6d02d80f27519e23525beb4a243 files/tos-apps-1.1.15-TOSBase-types-conflict-fix.patch 638
+RMD160 a95e5df18dba1fa61ad5300724eaf63989791778 files/tos-apps-1.1.15-TOSBase-types-conflict-fix.patch 638
+SHA256 adc684e62936080da0b77b42b7ad5b2febfe6b458c5b4455ba2cfb045a457cb3 files/tos-apps-1.1.15-TOSBase-types-conflict-fix.patch 638
 DIST tinyos-1.1.15Dec2005cvs.tar.gz 10273122 RMD160 cddbcf32e53352d04be2eda49852540650e73088 SHA1 98b63826ff85272e43e10fa88db71ba46f0bdbe0 SHA256 78f985eb83293cf10f23013f771c7f5d130f9a240a4dcda02321e10c3b5a341f
-EBUILD tos-apps-1.1.15.ebuild 1488 RMD160 b93f9ffd877697fe7c06c960242a0df7acba82e8 SHA1 78cf2a66364d8d906af45e6af9692b6b404ee5c7 SHA256 ac35d75cd54b6900a5dafecb87292a0762cecf2b64cc86fce1a3a281f70919c2
-MD5 33576f031f97980b2749bde8d975e348 tos-apps-1.1.15.ebuild 1488
-RMD160 b93f9ffd877697fe7c06c960242a0df7acba82e8 tos-apps-1.1.15.ebuild 1488
-SHA256 ac35d75cd54b6900a5dafecb87292a0762cecf2b64cc86fce1a3a281f70919c2 tos-apps-1.1.15.ebuild 1488
-MISC ChangeLog 493 RMD160 6ef876bbeb8fd4d1be354ecaa90551e13a27c5c2 SHA1 a36ed5e1644562d8f89bab44abb5b6c76627c480 SHA256 66feab0f1c248a0a7bd9282ba0e24fe27a42e5b1f10afd3f8973027a38b3ee14
-MD5 c269eb29b2c66fa3846f79dc5a720597 ChangeLog 493
-RMD160 6ef876bbeb8fd4d1be354ecaa90551e13a27c5c2 ChangeLog 493
-SHA256 66feab0f1c248a0a7bd9282ba0e24fe27a42e5b1f10afd3f8973027a38b3ee14 ChangeLog 493
+EBUILD tos-apps-1.1.15-r1.ebuild 1654 RMD160 f5959f2d3598b2b718203e4b84e9df06f9e2424d SHA1 5b199208e3233ff85f1c3f1e7381f973e77d14ce SHA256 736ced2d7bb34f447f76e55ded18ee75bd7cbe538625fc778419ea97e2d47ef0
+MD5 ce7ce9576bbf283d1106bb2ebc326a5d tos-apps-1.1.15-r1.ebuild 1654
+RMD160 f5959f2d3598b2b718203e4b84e9df06f9e2424d tos-apps-1.1.15-r1.ebuild 1654
+SHA256 736ced2d7bb34f447f76e55ded18ee75bd7cbe538625fc778419ea97e2d47ef0 tos-apps-1.1.15-r1.ebuild 1654
+MISC ChangeLog 761 RMD160 6893a262559a4139508d2f9ef4efcb128408a432 SHA1 805084a91e5bc3e5381f8104a971af00006c5423 SHA256 55db7f533117cd6cac65898eae0287cad2fcbd00a74bf29797e018344178aced
+MD5 f320e946e8e6c92acd6c91416b24add9 ChangeLog 761
+RMD160 6893a262559a4139508d2f9ef4efcb128408a432 ChangeLog 761
+SHA256 55db7f533117cd6cac65898eae0287cad2fcbd00a74bf29797e018344178aced ChangeLog 761
 MISC metadata.xml 228 RMD160 422142af30c07b83b0f15244a5b2cf2568c132a3 SHA1 ee534184a671e3f88808f6758bb4d6054a30de12 SHA256 730540c3fad44d91d51566db3eaa8e4de6291633c1a58831ae66a962ec272ed0
 MD5 3a58fa6647ba829aae8377165129480e metadata.xml 228
 RMD160 422142af30c07b83b0f15244a5b2cf2568c132a3 metadata.xml 228
 SHA256 730540c3fad44d91d51566db3eaa8e4de6291633c1a58831ae66a962ec272ed0 metadata.xml 228
-MD5 ee3e227f1140637c0a2902237487307a files/digest-tos-apps-1.1.15 277
-RMD160 a1216e8d4d893cb0269dc46144906b0fcfd86148 files/digest-tos-apps-1.1.15 277
-SHA256 283d09d9ff408b822f0e756457cbfe2c9c9bfaf6456e0c912375245ef978ac5b files/digest-tos-apps-1.1.15 277
+MD5 ee3e227f1140637c0a2902237487307a files/digest-tos-apps-1.1.15-r1 277
+RMD160 a1216e8d4d893cb0269dc46144906b0fcfd86148 files/digest-tos-apps-1.1.15-r1 277
+SHA256 283d09d9ff408b822f0e756457cbfe2c9c9bfaf6456e0c912375245ef978ac5b files/digest-tos-apps-1.1.15-r1 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2jtIwmS/YhfgUiURAvOqAJ9OuIUC9Jx13jIM5CSKQyJq60acrACfW9SV
-ynS66hmZY6cpzeX5/XWTNrI=
-=vszg
+iD8DBQFE/ydCwmS/YhfgUiURAt0ZAKCdG2knbBMrpmqWZvEZakZP3mxw2QCcDMmL
+ldDYdeoh6fg3P3EVO7xdfGI=
+=+/cb
 -----END PGP SIGNATURE-----
diff --git a/dev-tinyos/tos-apps/files/digest-tos-apps-1.1.15 b/dev-tinyos/tos-apps/files/digest-tos-apps-1.1.15
deleted file mode 100644
index a4d5cf882379..000000000000
--- a/dev-tinyos/tos-apps/files/digest-tos-apps-1.1.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e9535229eab02ee1f198b244c04bcd6 tinyos-1.1.15Dec2005cvs.tar.gz 10273122
-RMD160 cddbcf32e53352d04be2eda49852540650e73088 tinyos-1.1.15Dec2005cvs.tar.gz 10273122
-SHA256 78f985eb83293cf10f23013f771c7f5d130f9a240a4dcda02321e10c3b5a341f tinyos-1.1.15Dec2005cvs.tar.gz 10273122
diff --git a/dev-tinyos/tos-apps/tos-apps-1.1.15.ebuild b/dev-tinyos/tos-apps/tos-apps-1.1.15.ebuild
deleted file mode 100644
index c81e99473ec9..000000000000
--- a/dev-tinyos/tos-apps/tos-apps-1.1.15.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tinyos/tos-apps/tos-apps-1.1.15.ebuild,v 1.2 2006/08/09 19:48:55 sanchan Exp $
-inherit eutils
-
-CVS_MONTH="Dec"
-CVS_YEAR="2005"
-MY_PN="tinyos"
-MY_P=${MY_PN}-${PV}${CVS_MONTH}${CVS_YEAR}cvs
-
-DESCRIPTION="TinyOS apps: TinyOS bundled applications."
-HOMEPAGE="http://www.tinyos.net/"
-SRC_URI="http://www.tinyos.net/dist-1.1.0/tinyos/source/${MY_P}.tar.gz"
-LICENSE="Intel"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-tinyos/tos-1.1.15"
-RDEPEND=">=dev-tinyos/tos-make-1.1.15"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if [ -z "${TOSROOT}" ]
-	then
-		export TOSROOT=/usr/src/tinyos-1.x
-	fi
-
-	if [ ! -d "${TOSROOT}" ]
-	then
-		eerror "In order to emerge tos-apps you have to set the"
-		eerror "\$TOSROOT environment properly."
-		eerror ""
-		eerror "You can achieve this by emerging >=dev-tinyos/tos-1.1.15"
-		eerror "or by exporting TOSDIR=\"path to your tinyos dir\""
-		die "Couldn't find a valid TinyOS home"
-	else
-		einfo "Building tos-apps for ${TOSROOT}"
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	insinto ${TOSROOT}
-	doins -r apps
-	chown -R root:0 "${D}"
-}
-
-pkg_postinst() {
-	elog "If you want to use TinyOS on real hardware you need a cross compiler."
-	elog "You should emerge sys-devel/crossdev and compile any toolchain you need"
-	elog "Example: for Mica2 and Mica2 Dot: crossdev --target avr"
-	ebeep 5
-	epause 5
-}
-