Update libdsk to generation 2 java eclasses

Package-Manager: portage-2.1.2.5

5 files changed, 130 insertions, 16 deletions

diff --git a/app-emulation/libdsk/ChangeLog b/app-emulation/libdsk/ChangeLog
index 422ba32dda89..4abd2f201464 100644
--- a/app-emulation/libdsk/ChangeLog
+++ b/app-emulation/libdsk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libdsk
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.17 2006/11/07 09:12:13 dragonheart Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.18 2007/04/29 01:34:21 ali_bush Exp $
+
+*libdsk-1.1.10-r1 (29 Apr 2007)
+
+  29 Apr 2007; Alistair John Bush <ali_bush@gentoo.org>
+  +files/java-make-fix.patch, +libdsk-1.1.10-r1.ebuild:
+  Updated libdsk to use latest java eclasses, Added patch to support JAVACFLAGS
 
   07 Nov 2006; Daniel Black <dragonheart@gentoo.org> libdsk-1.1.10.ebuild:
   propper java support - bug #145930 thanks to Robin Bankhead(reporter), and
diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index 2c9b927da9f4..35dfe17c83c4 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1,9 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX java-make-fix.patch 2110 RMD160 a927ee25514b4c479ad32f65165a64bfbdb71a69 SHA1 09bb9319cf79a050f7af074ed0b7285bfe13ff1b SHA256 2fb811df86023e38dc75f6c1ec6fd3990d7d53f13afb5faa746d87936e0d6a0d
+MD5 084a86cd936822c862581bef48c50d7a files/java-make-fix.patch 2110
+RMD160 a927ee25514b4c479ad32f65165a64bfbdb71a69 files/java-make-fix.patch 2110
+SHA256 2fb811df86023e38dc75f6c1ec6fd3990d7d53f13afb5faa746d87936e0d6a0d files/java-make-fix.patch 2110
 DIST libdsk-1.1.10.tar.gz 802326 RMD160 e8356fdc3d6c49cdd2e1720883cd59e5f3dc3085 SHA1 ff25b8db40e7e6a0de77b4ef9f7eed70c612febf SHA256 bdd11105aa2235209795200c37f782e37d8798b74b173b31516f2b47a964a8e6
 DIST libdsk-1.1.5.tar.gz 773995 RMD160 09ff2f58b6e982238eeb5449b10ffa6c22ece327 SHA1 2870a600fbc453230671756de036cdae06eff194 SHA256 b08c5a0b2f1f00a9a4eca0ba6c0169d813782b9e140df363333b24290ec74281
 DIST libdsk-1.1.9.tar.gz 790019 RMD160 4e4aa11bc3768bbc1aee079f1bc89eb3e8dfdd41 SHA1 90481ea997d0d4597c889d778f7ed4f47d4ae3fe SHA256 9c69053ce1da2fc0381e6e0cafc175e41d8f7ef707a377b54cc5ebd552edddae
+EBUILD libdsk-1.1.10-r1.ebuild 1256 RMD160 ba3df37ff96284d702d2325611dcccb903f9b332 SHA1 c9504c1b300cd1f8549bc7379368dcb3b20fe666 SHA256 4c65ab645b89391b44fe33dc7822e48806a8a21f475e7aac932c36e481a0943f
+MD5 90db33b35359ecbdebeb584052438c03 libdsk-1.1.10-r1.ebuild 1256
+RMD160 ba3df37ff96284d702d2325611dcccb903f9b332 libdsk-1.1.10-r1.ebuild 1256
+SHA256 4c65ab645b89391b44fe33dc7822e48806a8a21f475e7aac932c36e481a0943f libdsk-1.1.10-r1.ebuild 1256
 EBUILD libdsk-1.1.10.ebuild 979 RMD160 99bc15b80610adac61cddaac33fe41100fb39611 SHA1 ea15681fe476bbc7a4507afab2d8806a6802a4d5 SHA256 1084f7a2da63df8bd5d8904ae6a1d121d7f7e0d03f5da1e13b4a907889f5233d
 MD5 850a1530518a288b79ae1b1e62dd721b libdsk-1.1.10.ebuild 979
 RMD160 99bc15b80610adac61cddaac33fe41100fb39611 libdsk-1.1.10.ebuild 979
@@ -16,10 +21,10 @@ EBUILD libdsk-1.1.9.ebuild 802 RMD160 5001aa91fee87e948f0d9ec757f40619276b46c8 S
 MD5 41aa09bebc2a6edbfefe4fb8a641c9bf libdsk-1.1.9.ebuild 802
 RMD160 5001aa91fee87e948f0d9ec757f40619276b46c8 libdsk-1.1.9.ebuild 802
 SHA256 d273fef9de9b024a38c4e241d64ff01701d50c16c8a364bd4d4a64a1294d0087 libdsk-1.1.9.ebuild 802
-MISC ChangeLog 2195 RMD160 8ccfe7eebbfdd0500b04faa9afbc4f251b5fbe21 SHA1 87379f9958dba00de4bf54cc137db93298af32e2 SHA256 4d2ff4fbdd281c32d7d626c7003b4572819383e85b7ca87ef2466a5f402b9a90
-MD5 03cde83a9a7eec789bff76c84ff0644b ChangeLog 2195
-RMD160 8ccfe7eebbfdd0500b04faa9afbc4f251b5fbe21 ChangeLog 2195
-SHA256 4d2ff4fbdd281c32d7d626c7003b4572819383e85b7ca87ef2466a5f402b9a90 ChangeLog 2195
+MISC ChangeLog 2418 RMD160 fa08b91d1b9025d2150baf1553cb3f47ce72ddd7 SHA1 3a27cd04153fc38e5de892e411a95ed0e8548304 SHA256 3427036b708693fed30a7d776571d57ccace693f5e7c176a1c19ab442695663b
+MD5 a903a3e11b3c94c3952750a56e2169e7 ChangeLog 2418
+RMD160 fa08b91d1b9025d2150baf1553cb3f47ce72ddd7 ChangeLog 2418
+SHA256 3427036b708693fed30a7d776571d57ccace693f5e7c176a1c19ab442695663b ChangeLog 2418
 MISC metadata.xml 314 RMD160 6c07bf6beb7a80688cab14b2c325d3d0e046babc SHA1 7378ee22485e7181284c4c38a145c3d08f73fe19 SHA256 f58e7d74e43d9d1375de6ee5d65fccdba45afc50f81ba6fa7b3e51f346805e74
 MD5 a92ccc9109f3bb8c36e7597064966708 metadata.xml 314
 RMD160 6c07bf6beb7a80688cab14b2c325d3d0e046babc metadata.xml 314
@@ -27,16 +32,12 @@ SHA256 f58e7d74e43d9d1375de6ee5d65fccdba45afc50f81ba6fa7b3e51f346805e74 metadata
 MD5 5866bff317408eb6b924ed79bde065d1 files/digest-libdsk-1.1.10 241
 RMD160 97b9415b7c2e08691ac8e2dc1d4caba310bb99ea files/digest-libdsk-1.1.10 241
 SHA256 385b9bf0510e06448fac896555d83da2e0c49792d162380e4f18649484d057e8 files/digest-libdsk-1.1.10 241
+MD5 5866bff317408eb6b924ed79bde065d1 files/digest-libdsk-1.1.10-r1 241
+RMD160 97b9415b7c2e08691ac8e2dc1d4caba310bb99ea files/digest-libdsk-1.1.10-r1 241
+SHA256 385b9bf0510e06448fac896555d83da2e0c49792d162380e4f18649484d057e8 files/digest-libdsk-1.1.10-r1 241
 MD5 ec066f631a5044722e0cb5a7d1ef8083 files/digest-libdsk-1.1.5 238
 RMD160 61ed53e087416d17965bd7b9dd3982601ac0616b files/digest-libdsk-1.1.5 238
 SHA256 03805ca3d537575f247cc71c3941d7a0c63c57dfa4ecf9d6eb9a388fa8277519 files/digest-libdsk-1.1.5 238
 MD5 ec7bcc55ebb6ad9ca9c70a07bc1151d1 files/digest-libdsk-1.1.9 238
 RMD160 b052b119831efd95ad71eb2673064f16ee29feff files/digest-libdsk-1.1.9 238
 SHA256 a5d0e9b1948624a1d0fc0d940b9e87d3d32f780e3b42dbc1926207a54432f66c files/digest-libdsk-1.1.9 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFUE61mdTrptrqvGERAv0oAJ49nJD4NlZEuOrldv04f7u7QSVTMgCfSsWS
-lqapoBojIB9LrEs8zAacmXM=
-=F/ns
------END PGP SIGNATURE-----
diff --git a/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1 b/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1
new file mode 100644
index 000000000000..2b1b1a08149b
--- /dev/null
+++ b/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1
@@ -0,0 +1,3 @@
+MD5 18bb6e7a69c3db691b94f5e37f977317 libdsk-1.1.10.tar.gz 802326
+RMD160 e8356fdc3d6c49cdd2e1720883cd59e5f3dc3085 libdsk-1.1.10.tar.gz 802326
+SHA256 bdd11105aa2235209795200c37f782e37d8798b74b173b31516f2b47a964a8e6 libdsk-1.1.10.tar.gz 802326
diff --git a/app-emulation/libdsk/files/java-make-fix.patch b/app-emulation/libdsk/files/java-make-fix.patch
new file mode 100644
index 000000000000..a1f399c3f8dc
--- /dev/null
+++ b/app-emulation/libdsk/files/java-make-fix.patch
@@ -0,0 +1,50 @@
+diff -Naur libdsk-1.1.10.orig/lib/Makefile.am libdsk-1.1.10/lib/Makefile.am
+--- libdsk-1.1.10.orig/lib/Makefile.am	2006-04-16 00:48:10.000000000 +1200
++++ libdsk-1.1.10/lib/Makefile.am	2007-04-29 12:45:10.000000000 +1200
+@@ -5,6 +5,7 @@
+ JAVAH=@JAVAH@
+ JAVA=@JAVA@
+ JAVADOC=@JAVADOC@
++JAVACFLAGS=@JAVACFLAGS@
+ JAR=@JAR@
+ CLASSCPRE=uk.co.demon.seasip.libdsk
+ CLASSDPRE=uk/co/demon/seasip/libdsk
+@@ -83,10 +84,10 @@
+ 	$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
+ 
+ $(CLASSDPRE)/%.class:   $(srcdir)/$(CLASSDPRE)/%.java
+-	here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++	here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+ 
+ %.class:        $(srcdir)/%.java
+-	here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++	here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+ 
+ 
+ $(HEADERPRE)_%.h:         $(CLASSDPRE)/%.class
+diff -Naur libdsk-1.1.10.orig/lib/Makefile.in libdsk-1.1.10/lib/Makefile.in
+--- libdsk-1.1.10.orig/lib/Makefile.in	2006-04-20 09:12:10.000000000 +1200
++++ libdsk-1.1.10/lib/Makefile.in	2007-04-29 12:50:50.000000000 +1200
+@@ -488,10 +488,10 @@
+ 	$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
+ 
+ $(CLASSDPRE)/%.class:   $(srcdir)/$(CLASSDPRE)/%.java
+-	here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++	here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+ 
+ %.class:        $(srcdir)/%.java
+-	here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++	here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+ 
+ $(HEADERPRE)_%.h:         $(CLASSDPRE)/%.class
+ 	$(JAVAH) -jni $(CLASSCPRE).`basename $< .class`
+diff -Naur libdsk-1.1.10.orig/tools/Makefile.am libdsk-1.1.10/tools/Makefile.am
+--- libdsk-1.1.10.orig/tools/Makefile.am	2006-04-12 10:05:09.000000000 +1200
++++ libdsk-1.1.10/tools/Makefile.am	2007-04-29 12:23:32.000000000 +1200
+@@ -32,5 +32,5 @@
+ CLEANFILES=*.class
+ 
+ %.class:        $(srcdir)/%.java
+-	here=`pwd` && cd $(srcdir) && $(JAVAC) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $<
++	here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $<
+ 
diff --git a/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild b/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..fb7a8bf91d12
--- /dev/null
+++ b/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild,v 1.1 2007/04/29 01:34:21 ali_bush Exp $
+
+inherit java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Disk emulation library"
+HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
+SRC_URI="http://www.seasip.demon.co.uk/Unix/LibDsk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="java"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+CDEPEND="sys-libs/zlib
+		app-arch/bzip2"
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.5 )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/java-make-fix.patch"
+}
+
+src_compile() {
+	use java && sed -i -e "s!_JINC=\"\$_JTOPDIR/i!_JINC=\"${JAVA_HOME}/i!" configure
+
+	local java_options=""
+	if use java; then
+		java_options="--with-javac-flags=\"$(java-pkg_javac-args)\""
+	fi
+
+	econf \
+		--with-zlib \
+		--with-bzlib \
+		--enable-floppy \
+		$(use_with java jni) \
+		--with-java-prefix=${JAVA_HOME} \
+		${java_options} \
+		|| die
+	emake || die "libdsk make failed!"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	if use java; then
+		java-pkg_dojar "lib/${PN}.jar"
+	fi
+
+	dodoc ChangeLog README TODO doc/libdsk.*
+}