Updated for java generation 2. Removing generation 1 ebuild.

(Portage version: 2.1.1_pre2-r4)

3 files changed, 74 insertions, 1 deletions

diff --git a/dev-tinyos/tos-getenv/ChangeLog b/dev-tinyos/tos-getenv/ChangeLog
index 5cc19f8d70d2..f146aa566f9b 100644
--- a/dev-tinyos/tos-getenv/ChangeLog
+++ b/dev-tinyos/tos-getenv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tinyos/tos-getenv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tinyos/tos-getenv/ChangeLog,v 1.2 2006/03/13 18:43:24 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tinyos/tos-getenv/ChangeLog,v 1.3 2006/07/07 22:18:10 sanchan Exp $
+
+*tos-getenv-1.1.15-r1 (07 Jul 2006)
+
+  07 Jul 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  -tos-getenv-1.1.15.ebuild, +tos-getenv-1.1.15-r1.ebuild:
+  Updated for java generation 2. Removing generation 1 ebuild.
 
   13 Mar 2006; Sandro Bonazzola <sanchan@gentoo.org> metadata.xml,
   tos-getenv-1.1.15.ebuild:
diff --git a/dev-tinyos/tos-getenv/files/digest-tos-getenv-1.1.15-r1 b/dev-tinyos/tos-getenv/files/digest-tos-getenv-1.1.15-r1
new file mode 100644
index 000000000000..a4d5cf882379
--- /dev/null
+++ b/dev-tinyos/tos-getenv/files/digest-tos-getenv-1.1.15-r1
@@ -0,0 +1,3 @@
+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-getenv/tos-getenv-1.1.15-r1.ebuild b/dev-tinyos/tos-getenv/tos-getenv-1.1.15-r1.ebuild
new file mode 100644
index 000000000000..a4dd5186f56a
--- /dev/null
+++ b/dev-tinyos/tos-getenv/tos-getenv-1.1.15-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tinyos/tos-getenv/tos-getenv-1.1.15-r1.ebuild,v 1.1 2006/07/07 22:18:10 sanchan Exp $
+
+CVS_MONTH="Dec"
+CVS_YEAR="2005"
+MY_P="tinyos"
+
+inherit eutils java-pkg-2 toolchain-funcs
+
+DESCRIPTION="TinyOS JNI getenv support library"
+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"
+DEPEND=">=dev-java/ibm-jdk-bin-1.4.0
+	dev-java/java-config"
+RDEPEND=">=dev-java/ibm-jdk-bin-1.4.0"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}-${PV}${CVS_MONTH}${CVS_YEAR}cvs/tools/java/jni
+
+pkg_setup() {
+	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-pkg-2_pkg_setup
+	java-pkg_ensure-vm-version-ge 1 4 0
+	local vendor="$(java-pkg_get-vm-vendor)"
+	einfo "${vendor} vm detected."
+	if ! [[ ${vendor} = "ibm" ]]; 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() {
+	# Quoting the Makefile:
+	# The install rules assume that JNI libraries should be placed in .../jre/bin
+	# This seems to be true on Windows, and IBM's Linux Java
+	# It's not true for Sun's Linux Java (but we don't have javax.comm for that, so...)
+	$(tc-getCC) ${CFLAGS} -I$(java-config-2 -O)/include $(java-pkg_get-jni-cflags) \
+		-shared -fpic -Wl,-z,now -o libgetenv.so net_tinyos_util_Env.c  \
+		|| die "Failed compiling libgetenv.so"
+}
+
+src_install() {
+	#local JNI=$(java-config-2 -O)/jre/bin
+	#the call to java-config-2 could be avoided if JAVA_HOME is set.
+	#actually don't work on my system so using java-config-2 is the only way.
+	#
+	#java-pkg_sointo ${JNI}
+	#java-pkg_doso libgetenv.so
+	#the above functions causes strange error on my system. Falling back to generic methods.
+
+	local JNI="$(java-config -O)/jre"
+	into ${JNI}
+	dobin libgetenv.so
+}