From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PqcOQ-0001Qn-8W for garchives@archives.gentoo.org; Sat, 19 Feb 2011 02:17:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EF6CE04CB; Sat, 19 Feb 2011 02:17:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BA77CE00C2 for ; Sat, 19 Feb 2011 02:17:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2703A1B4077 for ; Sat, 19 Feb 2011 02:17:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6A7298006A for ; Sat, 19 Feb 2011 02:17:43 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <46f767faf1c52e0e07590264ff8bde36da4076bc.sping@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/, net-misc/mocha/files/ X-VCS-Repository: proj/betagarden X-VCS-Files: net-misc/mocha/files/mocha-1.1.1-gentoo.patch net-misc/mocha/files/mocha-1.1.1-gtk.patch net-misc/mocha/metadata.xml net-misc/mocha/mocha-1.1.1.ebuild X-VCS-Directories: net-misc/mocha/ net-misc/mocha/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 46f767faf1c52e0e07590264ff8bde36da4076bc Date: Sat, 19 Feb 2011 02:17:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d8971163b4e19fefbe786dab3da35f3f commit: 46f767faf1c52e0e07590264ff8bde36da4076bc Author: Sebastian Pipping pipping org> AuthorDate: Sat Feb 19 02:16:23 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat Feb 19 02:16:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3D46f767fa 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/moc= ha/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.ja= va +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 =3D true; + public static final boolean mocha_suppress_newhost =3D true; +=20 +- public static final String mocha_arp_command=3D"arp"; ++ public static final String mocha_arp_command=3D"/sbin/arp"; + public static final int mocha_arp_interval =3D 5; +=20 + public static final int mocha_log_size =3D 100; +diff --git a/com/nakkaya/lib/network/NetworkWatcher.java b/com/nakkaya/l= ib/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{ +=20 + public void findGateway(){ + try{ +- Process result =3D Runtime.getRuntime().exec("netstat -rn"); ++ Process result =3D Runtime.getRuntime().exec("/bin/netstat -rn"); + =20 + BufferedReader output =3D 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") =3D=3D true){ +=20 + preferences.put( "mocha.operatingSystem", "Linux" ); +- +- //look and feel +- try{ +- UIManager.setLookAndFeel +- ("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); +- }catch( Exception e ) {=20 +- sysLogger.warning(e.toString()); +- } + } + } +=20 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 @@ + + + + no-herd + + sping@gentoo.org + Sebastian Pipping + + 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=3D"2" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION=3D"Keeps a record of IP/MAC address pairings" +HOMEPAGE=3D"http://nakkaya.com/mocha.html" +SRC_URI=3D"https://github.com/nakkaya/${PN}/tarball/${PV} -> ${P}.tar.gz= " + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"" + +COMMON_DEP=3D"java-virtuals/javamail + java-virtuals/jaf + dev-java/swing-layout" + +COMMON_DEP=3D"${COMMON_DEP} dev-java/sun-jaf" # FIXME + +DEPEND=3D">=3Dvirtual/jdk-1.5 + ${COMMON_DEP}" +RDEPEND=3D">=3Dvirtual/jre-1.5 + sys-apps/net-tools + ${COMMON_DEP}" + +S=3D${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 =20 + + eant jar || die +} + +src_install() { + java-pkg_dojar build/${PN}.jar + java-pkg_dolauncher +}