[gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/, net-misc/mocha/files/

[gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/, net-misc/mocha/files/

[Sebastian Pipping]

commit:     46f767faf1c52e0e07590264ff8bde36da4076bc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 02:16:23 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 02:16:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=46f767fa

net-misc/mocha: 1.1.1

---
 net-misc/mocha/files/mocha-1.1.1-gentoo.patch |   26 ++++++++++
 net-misc/mocha/files/mocha-1.1.1-gtk.patch    |   17 +++++++
 net-misc/mocha/metadata.xml                   |    9 ++++
 net-misc/mocha/mocha-1.1.1.ebuild             |   62 +++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 0 deletions(-)

diff --git a/net-misc/mocha/files/mocha-1.1.1-gentoo.patch b/net-misc/mocha/files/mocha-1.1.1-gentoo.patch
new file mode 100644
index 0000000..70d5609
--- /dev/null
+++ b/net-misc/mocha/files/mocha-1.1.1-gentoo.patch
@@ -0,0 +1,26 @@
+diff --git a/com/nakkaya/lib/Defaults.java b/com/nakkaya/lib/Defaults.java
+index e5995ca..e30820b 100644
+--- a/com/nakkaya/lib/Defaults.java
++++ b/com/nakkaya/lib/Defaults.java
+@@ -6,7 +6,7 @@ public class Defaults{
+     public static final boolean mocha_suppress_incomplete = true;
+     public static final boolean mocha_suppress_newhost = true;
+ 
+-    public static final String mocha_arp_command="arp";
++    public static final String mocha_arp_command="/sbin/arp";
+     public static final int mocha_arp_interval = 5;
+ 
+     public static final int mocha_log_size = 100;
+diff --git a/com/nakkaya/lib/network/NetworkWatcher.java b/com/nakkaya/lib/network/NetworkWatcher.java
+index 12c6690..52e40bc 100644
+--- a/com/nakkaya/lib/network/NetworkWatcher.java
++++ b/com/nakkaya/lib/network/NetworkWatcher.java
+@@ -101,7 +101,7 @@ public class NetworkWatcher extends Observable{
+ 
+     public void findGateway(){
+ 	try{
+-	    Process result = Runtime.getRuntime().exec("netstat -rn");
++	    Process result = Runtime.getRuntime().exec("/bin/netstat -rn");
+ 	    
+ 	    BufferedReader output = new BufferedReader
+ 		(new InputStreamReader(result.getInputStream()));

diff --git a/net-misc/mocha/files/mocha-1.1.1-gtk.patch b/net-misc/mocha/files/mocha-1.1.1-gtk.patch
new file mode 100644
index 0000000..81a1090
--- /dev/null
+++ b/net-misc/mocha/files/mocha-1.1.1-gtk.patch
@@ -0,0 +1,17 @@
+--- mocha.java	2011-02-19 02:12:05.200096787 +0100
++++ mocha.java	2011-02-19 02:12:31.928925120 +0100
+@@ -40,14 +40,6 @@
+ 	}else if (System.getProperty("os.name").equals("Linux") == true){
+ 
+ 	    preferences.put( "mocha.operatingSystem", "Linux" );
+-
+-	    //look and feel
+-	    try{
+-		UIManager.setLookAndFeel
+-		    ("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+-	    }catch( Exception e ) { 
+-		sysLogger.warning(e.toString());
+-	    }
+ 	}
+     }
+ 

diff --git a/net-misc/mocha/metadata.xml b/net-misc/mocha/metadata.xml
new file mode 100644
index 0000000..328fbd1
--- /dev/null
+++ b/net-misc/mocha/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
new file mode 100644
index 0000000..d7d6cc7
--- /dev/null
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Keeps a record of IP/MAC address pairings"
+HOMEPAGE="http://nakkaya.com/mocha.html"
+SRC_URI="https://github.com/nakkaya/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="java-virtuals/javamail
+	java-virtuals/jaf
+	dev-java/swing-layout"
+
+COMMON_DEP="${COMMON_DEP} dev-java/sun-jaf"  # FIXME
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	sys-apps/net-tools
+	${COMMON_DEP}"
+
+S=${WORKDIR}/nakkaya-${PN}-e0200a7
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch \
+			"${FILESDIR}"/${P}-gentoo.patch
+
+	mkdir build  # or ant fails
+
+	cd extLibs || die
+	rm *.jar || die
+	java-pkg_jar-from javamail
+	java-pkg_jar-from sun-jaf  # FIXME
+	java-pkg_jar-from swing-layout-1
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	eant linux || die
+	rm -Rf build/{com/sun/,javax} || die
+
+	# Make sure that only mocha code goes into the .jar
+	rm -Rf build/{com/sun,javax} || die
+
+	# FIXME: Currently bundling system's dev-java/swing-layout
+	# rm -Rf build/org || die  
+
+	eant jar || die
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dolauncher
+}