net-misc/mocha: Fix 1.1.1, bump to 1.1.2

3 files changed, 62 insertions, 5 deletions

diff --git a/net-misc/mocha/Manifest b/net-misc/mocha/Manifest
index 1065ce5..48fb231 100644
--- a/net-misc/mocha/Manifest
+++ b/net-misc/mocha/Manifest
@@ -1,5 +1,7 @@
 AUX mocha-1.1.1-gentoo.patch 1161 RMD160 4e62fb32b3dd9a017f288a220ef5c668d6b510d3 SHA1 4e04b3fe88389b93e1d6f25a90129336e8be1242 SHA256 bfa634634710d02bd4187ff16905ce55cb1eccb87d3b67a342bab3a3cee6ce7c
 AUX mocha-1.1.1-gtk.patch 456 RMD160 ae504f76b64b0b7517ecc22d6e5f25c270b06e23 SHA1 304f116e1e5dcb3b2ae2701fd96a782025e991a2 SHA256 98b76024df6d3dd615b061b2b5d7e918825f52d383b52d91d7bcf2a300150f5d
-DIST mocha-1.1.1.tar.gz 494192 RMD160 834644c848feeed651bd9b126fdc76a0e694ee90 SHA1 20ab2b39d1c94f3b0a7d6893657d8cdd1161f1e9 SHA256 d3f2d4b933a72250de5f1c9107183fd24a5f968918f68c27b7c74d2243d9962b
-EBUILD mocha-1.1.1.ebuild 1210 RMD160 805dd7cba40f55d2fbc2f8ec6ac7a5e84df28562 SHA1 2b0e8c8abaf3be6f892739c5dd5b2c315306bfae SHA256 629cc35133b280a9ece3ddc83c13d15a69f3fc5b9c47e1dcf0462b8bc4599262
+DIST mocha-1.1.1.tar.gz 494209 RMD160 40f4ccc1694aaad4aac106a54d86064d2fdee034 SHA1 509d338992b7202d00f32a0830cfc6d3cdd7b80c SHA256 b03dcd8a3049b9ccd77a4b8b2b375dc1116c28a234e017ac089d0d7352d2547c
+DIST mocha-1.1.2.tar.gz 495822 RMD160 25df61a1cd6b36d6dd61f928bb0fe6666fe58fec SHA1 4460c1ed88657630536c0e9969bb6378ed1d108b SHA256 8cfd46e5a4a39c5ccc6b169cf25c7f3e36854ee519ebd92b6ea1d0e4f7786bda
+EBUILD mocha-1.1.1.ebuild 1180 RMD160 7b7abe04fcb34c81e91b89b06cd518f3e1f030bf SHA1 b4ddd485fee7872fddf9548eb0c8fc6327617db0 SHA256 192f2fe3f67fbd2cec374e731342c3244ffaccfa8a19b86ac191aac1a9caf335
+EBUILD mocha-1.1.2.ebuild 1194 RMD160 5c45547a90756e5a7de78d63e09f069b939de988 SHA1 ea89e454a45fd0939142ab43b4dfc7aa8a49f827 SHA256 3c55dc95f740e18168ea66e1e077ebcb1938c5258b5cdf969cc9b9992e98887e
 MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index 70cb9f2..f76964b 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -25,14 +25,12 @@ RDEPEND=">=virtual/jre-1.5
 	sys-apps/net-tools
 	${COMMON_DEP}"
 
-S=${WORKDIR}/nakkaya-${PN}-e0200a7
+S=${WORKDIR}/nakkaya-${PN}-f3601d4
 
 java_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
diff --git a/net-misc/mocha/mocha-1.1.2.ebuild b/net-misc/mocha/mocha-1.1.2.ebuild
new file mode 100644
index 0000000..9f15160
--- /dev/null
+++ b/net-misc/mocha/mocha-1.1.2.ebuild
@@ -0,0 +1,57 @@
+# 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:0
+	java-virtuals/jaf:0
+	dev-java/swing-layout:1"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	sys-apps/net-tools
+	${COMMON_DEP}"
+
+S=${WORKDIR}/nakkaya-${PN}-914b1aa
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.1-gtk.patch \
+			"${FILESDIR}"/${PN}-1.1.1-gentoo.patch
+
+	cd extLibs || die
+	rm *.jar || die
+	java-pkg_jar-from javamail
+	java-pkg_jar-from jaf
+	java-pkg_jar-from swing-layout-1
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	eant linux || 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
+}