# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2008-12-05 08:54:03
# Node ID 5b2355db0c849c7c90ed04c11178c6b042a619c2
# Parent  e67128afe7108c3a3c4d9f4b84e8b8d219ff3b64
# Parent  4968961b913d822bff1434de9280726393d4e9e5

merged changes from external repo (new phidgets ebuilds) with this one. O0ops.

diff --git a/dev-embedded/phidget/ChangeLog b/dev-embedded/phidget/ChangeLog
new file mode 100644
--- /dev/null
+++ b/dev-embedded/phidget/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for dev-embedded/phidget
+# Copyright 1999-2008 Nathan Brink; Distributed under the GPL v2
+# $Header: $
+
+  01 Dec 2008; Cron Daemon for Nathan Phillip Brink
+  <ohnobinki@ohnopublishing.net> ChangeLog:
+  Automatically bumped to phidget-2.1.5.20081023.ebuild from
+  phidget-2.1.4.20080924.ebuild
+
+*phidget-2.1.4.20080924 (17 November 2008)
+
+  17 Nov 2008; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +phidget-2.1.4.20080924.ebuild, +Manifest, +files/phidget21-crosscompile.patch, +file/phidget21-java.patch, +file/phidget21-libdir.patch :
+  Initial import.  Ebuild submitted by Nathan Phillip Brink <ohnobinki@ohnopublishing.net>.
diff --git a/dev-embedded/phidget/Manifest b/dev-embedded/phidget/Manifest
--- a/dev-embedded/phidget/Manifest
+++ b/dev-embedded/phidget/Manifest
@@ -2,4 +2,8 @@ AUX phidget21-crosscompile.patch 709 RMD
 AUX phidget21-java.patch 785 RMD160 956f5913c5ca75e120de97796d2e6ac07b5f85be SHA1 4c44ef073ef75c70cd2b05892e0161930df0c21d SHA256 045ea70c94fe3a3f0e3b92b295ae643a20ee7e378cae1258ee1d14a7c2f8cb2f
 AUX phidget21-libdir.patch 562 RMD160 b4d98da1326708f13ec19a938c64e829431b975a SHA1 bbc770a37506753ce1c8cd5256c337db6ed64ac1 SHA256 12d90ad6ea8d4ca2faa0d533e321847241620d4cc4d624e816c4e69a22e6c726
 DIST Phidgetlinux_2.1.4.20080924.tar.gz 292176 RMD160 2360bc2ccc14d2afd30de11386eac3f4e3399cf0 SHA1 a296abee3f48d8126b521b10e487cd77fe07051d SHA256 7f60fc29147b45bbe0fa6cca769bf8a940839b13b8786bdfbca18bb54822cb25
+DIST Phidgetlinux_2.1.5.20081023.tar.gz 304986 RMD160 08819880bbf364cbf388c826f2dd8b4c3dba5933 SHA1 3f1e0ad9b610968ee0539093be76ff539cc66210 SHA256 a03c0c46fa2901cc536492933da30711f522cb9776fd15b3e556f3cba2cdd709
 EBUILD phidget-2.1.4.20080924.ebuild 1263 RMD160 4536aa3b392577048a20648948ec59378e39a4a1 SHA1 4452773b19938aabeb2b31d1557dbd66df13aac4 SHA256 8752907dc9ebccc2d19313e0197dac948ee6f050f33e7e27f0c4128ee1af8fb1
+EBUILD phidget-2.1.5.20081023.ebuild 1263 RMD160 4536aa3b392577048a20648948ec59378e39a4a1 SHA1 4452773b19938aabeb2b31d1557dbd66df13aac4 SHA256 8752907dc9ebccc2d19313e0197dac948ee6f050f33e7e27f0c4128ee1af8fb1
+MISC ChangeLog 458 RMD160 004eeb4801303dc7222ebb3e60a0463d0ce7f316 SHA1 5b56f9db211541f60d2899fa5a1b21a9c19fd5ba SHA256 f65c0096c64c8ffa174b7d865243d7701968356c8ce6e11dcca9f63d9f1c959b
+MISC Manifest.orig 1627 RMD160 9baafeb9e147eaccd134b25b7e52d637b87e21be SHA1 5880bb7f0fa519d04b934fd60a308800531ad399 SHA256 5853f31a83152c57f21f29857cf2b6b0e25b2d353ed65d3228e29be36bae21f9
diff --git a/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild b/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
new file mode 100644
--- /dev/null
+++ b/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit versionator eutils java-pkg-opt-2
+
+DESCRIPTION="Phidget USB hardware interface library"
+MY_PV="$(get_major_version)$(get_version_component_range 2)"
+LONGNAME="Phidgetlinux"
+SRC_URI="http://www.phidgets.com/downloads/libraries/${LONGNAME}_${PV}.tar.gz"
+HOMEPAGE="http://www.phidgets.com"
+
+SLOT="0"
+
+LICENSE="LGPL"
+KEYWORDS="x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
+
+RDEPEND="java? ( >=virtual/jre-1.4 )"
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+
+S=${WORKDIR}/${LONGNAME}/${PN}${MY_PV}
+
+src_unpack() {
+	unpack ${LONGNAME}_${PV}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}${MY_PV}-libdir.patch
+	epatch "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch
+	use java && epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
+}
+
+src_compile() {
+	echo cd "${S}"
+	cd "${S}"
+	if use java; then
+		emake CROSS_COMPILE=${CHOST}- JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
+	else
+		emake CROSS_COMPILE=${CHOST}- || die "emake failed"
+	fi
+}
+
+src_install() {
+
+	mkdir -p ${D}/usr/$(get_libdir)
+	mkdir -p ${D}/usr/include
+	make install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir)
+	java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
+}
diff --git a/net-nds/makeldif/Manifest b/net-nds/makeldif/Manifest
--- a/net-nds/makeldif/Manifest
+++ b/net-nds/makeldif/Manifest
@@ -1,2 +1,2 @@
-DIST makeldif-0.0.tar.bz2 229964 RMD160 e579044d0828ce3e27de47d65ac08143c9b86675 SHA1 fb0ca15141b25671af1841d2855a6eb8851cccde SHA256 011ba4104f36e8dddbaf7763390a6c50d2b1d9e495d4f58525f15db23e83784e
+DIST makeldif-0.0.tar.bz2 230008 RMD160 3d4def2ae769fcafddac8e49a6253d409df58a1d SHA1 1815eb80f606f426f06a117640911eed33d78121 SHA256 7a2a66542e9ba7f52aa1f62b35a9e594661bfe8ba15aa5342a8446f5544456b5
 EBUILD makeldif-0.0.ebuild 449 RMD160 c9985e4640ba479d7d780321f7cc748640a247fc SHA1 dad6ded602588fbcf6d84c98c265ec04a91724b6 SHA256 5f2d66a1c5530e08581e141d71c6eb46332219f2d00492f2fa5e6cfb26925610