Ebuild bump, moving to java generation 2.

Package-Manager: portage-2.1.1

3 files changed, 15 insertions, 122 deletions

diff --git a/dev-tinyos/tos-scripts/Manifest b/dev-tinyos/tos-scripts/Manifest
index 418710d2a7c4..fea98d35c8f2 100644
--- a/dev-tinyos/tos-scripts/Manifest
+++ b/dev-tinyos/tos-scripts/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA1
 
 DIST tinyos-1.1.15Dec2005cvs.tar.gz 10273122 RMD160 cddbcf32e53352d04be2eda49852540650e73088 SHA1 98b63826ff85272e43e10fa88db71ba46f0bdbe0 SHA256 78f985eb83293cf10f23013f771c7f5d130f9a240a4dcda02321e10c3b5a341f
-EBUILD tos-scripts-1.1.15.ebuild 3223 RMD160 9453933e83879b8a82d48c7dbee87971cc27f178 SHA1 a3a57c412b449b838c25f0bc049fa4d9590ac1c3 SHA256 cad965ef7a087327d3d8afc105450c6c4ffcdc521bde30cea320c43aa21c64aa
-MD5 a4217849981ff5d95cb3452a7cad7bbd tos-scripts-1.1.15.ebuild 3223
-RMD160 9453933e83879b8a82d48c7dbee87971cc27f178 tos-scripts-1.1.15.ebuild 3223
-SHA256 cad965ef7a087327d3d8afc105450c6c4ffcdc521bde30cea320c43aa21c64aa tos-scripts-1.1.15.ebuild 3223
-MISC ChangeLog 681 RMD160 086e1d88b92289778d47986aef133b1b4541a9a2 SHA1 7519811b17d81854b46faf572add1d314f09e914 SHA256 cbd5974673982ac80a88c1bdedcc64b94f140bb2ac4fb1fa749686c0b1f68b24
-MD5 9d354d24d77628660b6264dc90128f78 ChangeLog 681
-RMD160 086e1d88b92289778d47986aef133b1b4541a9a2 ChangeLog 681
-SHA256 cbd5974673982ac80a88c1bdedcc64b94f140bb2ac4fb1fa749686c0b1f68b24 ChangeLog 681
+EBUILD tos-scripts-1.1.15-r1.ebuild 3215 RMD160 ff96c15da258971713fac395a99bc80995dc7674 SHA1 98b2d1cb1963de0b784545251b21d46855470129 SHA256 3d54a922f3d7470c79caf96e303f30663f691cac1df8ea68d8a5a556e2e354b8
+MD5 afe3b2f3fd2b85719220fd577be739ea tos-scripts-1.1.15-r1.ebuild 3215
+RMD160 ff96c15da258971713fac395a99bc80995dc7674 tos-scripts-1.1.15-r1.ebuild 3215
+SHA256 3d54a922f3d7470c79caf96e303f30663f691cac1df8ea68d8a5a556e2e354b8 tos-scripts-1.1.15-r1.ebuild 3215
+MISC ChangeLog 878 RMD160 ce62c589010d1f632e3bd646e74f88309c0b4a28 SHA1 7a7c53c67bea7c68aa007fb4e22512f1b0e76601 SHA256 169572524f0b4c39fc2bd7a6cdb8f9506a68f41f681468c2ad2190d65b321064
+MD5 986af48747a13086b7d8305c851bf569 ChangeLog 878
+RMD160 ce62c589010d1f632e3bd646e74f88309c0b4a28 ChangeLog 878
+SHA256 169572524f0b4c39fc2bd7a6cdb8f9506a68f41f681468c2ad2190d65b321064 ChangeLog 878
 MISC metadata.xml 227 RMD160 a958b58873c5c9a4dca4a74f523d6ffe3363ff86 SHA1 87b3d0d899669b2ae3a15e2c3fa782a7f4387bb8 SHA256 837920571bd6cb9ad69f40d4a0e3bf9c05193c9a134e591b9385def736e572fa
 MD5 102c36628237463257df1d3a2f20711f metadata.xml 227
 RMD160 a958b58873c5c9a4dca4a74f523d6ffe3363ff86 metadata.xml 227
 SHA256 837920571bd6cb9ad69f40d4a0e3bf9c05193c9a134e591b9385def736e572fa metadata.xml 227
-MD5 ee3e227f1140637c0a2902237487307a files/digest-tos-scripts-1.1.15 277
-RMD160 a1216e8d4d893cb0269dc46144906b0fcfd86148 files/digest-tos-scripts-1.1.15 277
-SHA256 283d09d9ff408b822f0e756457cbfe2c9c9bfaf6456e0c912375245ef978ac5b files/digest-tos-scripts-1.1.15 277
+MD5 ee3e227f1140637c0a2902237487307a files/digest-tos-scripts-1.1.15-r1 277
+RMD160 a1216e8d4d893cb0269dc46144906b0fcfd86148 files/digest-tos-scripts-1.1.15-r1 277
+SHA256 283d09d9ff408b822f0e756457cbfe2c9c9bfaf6456e0c912375245ef978ac5b files/digest-tos-scripts-1.1.15-r1 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2jqvwmS/YhfgUiURAgsjAKCg89nZW3t0BKSUp96654WWJZ+CnwCcC8Fc
-gOYup/Rxy3RBGFPbcVDGeHE=
-=tkY4
+iD8DBQFFBcMvwmS/YhfgUiURAlNZAJ4ryLCF8yI9mrM0q6cuH2UldwA/5wCfT1CK
+Cv3YgT6bpkfDDKkRVGhQuQo=
+=pWR/
 -----END PGP SIGNATURE-----
diff --git a/dev-tinyos/tos-scripts/files/digest-tos-scripts-1.1.15 b/dev-tinyos/tos-scripts/files/digest-tos-scripts-1.1.15
deleted file mode 100644
index a4d5cf882379..000000000000
--- a/dev-tinyos/tos-scripts/files/digest-tos-scripts-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-scripts/tos-scripts-1.1.15.ebuild b/dev-tinyos/tos-scripts/tos-scripts-1.1.15.ebuild
deleted file mode 100644
index 04d00822c4fb..000000000000
--- a/dev-tinyos/tos-scripts/tos-scripts-1.1.15.ebuild
+++ /dev/null
@@ -1,104 +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-scripts/tos-scripts-1.1.15.ebuild,v 1.3 2006/08/09 19:46:17 sanchan Exp $
-
-inherit eutils java-utils
-
-CVS_MONTH="Dec"
-CVS_YEAR="2005"
-MY_P="tinyos"
-
-DESCRIPTION="The TinyOS Make System"
-HOMEPAGE="http://www.tinyos.net/"
-SRC_URI="http://www.tinyos.net/dist-1.1.0/tinyos/source/${MY_P}-${PV}${CVS_MONTH}${CVS_YEAR}cvs.tar.gz"
-LICENSE="Intel"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-tinyos/tos-1.1.15"
-RDEPEND=">=dev-tinyos/ncc-1.1.15
-	>=dev-java/ibm-jdk-bin-1.4.0"
-
-S=${WORKDIR}/${MY_P}-${PV}${CVS_MONTH}${CVS_YEAR}cvs/tools
-
-pkg_setup() {
-	if [ -z "${TOSROOT}" ]
-	then
-		# best to make an assumption
-		export TOSDIR=/usr/src/tinyos-1.x/tos
-	fi
-
-	if [ ! -d "${TOSROOT}" ]
-	then
-		eerror "In order to compile nesc 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-scripts for ${TOSROOT}"
-	fi
-
-	if ! built_with_use dev-java/ibm-jdk-bin javacomm ; then
-		eerror "javacomm is required! Add javacomm to your use flag then re-emerge ibm-jdk-bin."
-		eerror "Then re-emerge this package."
-		die "setup failed due to missing prerequisite: javacomm"
-	fi
-
-	java-utils_setup-vm
-	java-utils_ensure-vm-version-ge 1 4 0
-	local vendor=`java-utils_get-vm-vendor`
-	einfo "${vendor} vm detected."
-	if ! [[ ${vendor} = "ibm-jdk-bin" ]]; then
-		eerror "ibm-jdk-bin is required!"
-		eerror "Please use java-config -S to set your system vm to a ibm-jdk."
-		die "setup failed due to missing prerequisite: ibm-jdk-bin"
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	local EXES="mote-key toscheck tinyos-serial-configure set-mote-id locate-jre"
-	local TSCRIPT=${TOSROOT}/tools/scripts
-	local PTOSSIM=${TSCRIPT}/PowerTOSSIM
-	local CODEGEN=${TSCRIPT}/codeGeneration
-	insinto ${TOSROOT}/tools
-	doins -r scripts
-	for i in bb2asm.pl bb2cycle.pl cilly.asm.exe compile.pl counter.ml cpuprof.py fixnames.pl mypp.pl postprocess.py
-	do
-		fperms 755 ${PTOSSIM}/${i}
-	done
-	for i in generateHood.pl generateNescDecls.pl generateRegistry.pl generateRpc.pl
-	do
-		fperms 755 ${CODEGEN}/${i}
-	done
-	for i in ${EXES} write_tos_image taskCount.pl prepare-ChangeLog.pl ident_flags
-	do
-		fperms 755 ${TSCRIPT}/${i}
-	done
-	cd scripts
-	into /usr
-	dobin ${EXES}
-	newdoc PowerTOSSIM/README README.PowerTOSSIM
-	newdoc codeGeneration/README README.codeGeneration
-}
-
-pkg_postinst() {
-	elog "In order to automatically use codeGeneration emerge tos-make,"
-	elog "add in your Makefile something like:"
-	elog "TOSMAKE_PATH += \${TOSROOT}/tools/scripts/codeGeneration"
-	elog "and add registy, hood or rpc to your make target eg.: make pc hood"
-
-	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"
-	elog "You also need >=dev-tinyos/tos-uisp-1.1.14 in order to flash your mote."
-
-	ebeep 5
-	epause 5
-}
-