version bump as suggested in bug #177273 and fixed a compile problem too. Thanks to Francisco for the bug report

(Portage version: 2.1.4.4)

4 files changed, 116 insertions, 7 deletions

diff --git a/app-emulation/libdsk/ChangeLog b/app-emulation/libdsk/ChangeLog
index 3f61860dd2eb..52d0ef8b7218 100644
--- a/app-emulation/libdsk/ChangeLog
+++ b/app-emulation/libdsk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/libdsk
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.19 2007/11/01 20:30:04 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.20 2008/04/02 07:41:42 dragonheart Exp $
+
+*libdsk-1.2.1 (02 Apr 2008)
+
+  02 Apr 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/libdsk-1.2.1-java-make-fix.patch, libdsk-1.1.10-r1.ebuild,
+  +libdsk-1.2.1.ebuild:
+  version bump as suggested in bug #177273 and fixed a compile problem too.
+  Thanks to Francisco for the bug report
 
   01 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> -libdsk-1.1.9.ebuild,
   -libdsk-1.1.10.ebuild:
diff --git a/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch b/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch
new file mode 100644
index 000000000000..07aa58c9a93e
--- /dev/null
+++ b/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch
@@ -0,0 +1,47 @@
+--- libdsk-1.2.1/lib/Makefile.am.orig	2008-04-02 13:27:24.000000000 +1100
++++ libdsk-1.2.1/lib/Makefile.am	2008-04-02 13:28:55.000000000 +1100
+@@ -2,6 +2,7 @@
+ 
+ INCLUDES=-I$(top_srcdir)/include
+ JAVAC=@JAVAC@
++JAVACFLAGS=@JAVACFLAGS@
+ JAVAH=@JAVAH@
+ JAVA=@JAVA@
+ JAVADOC=@JAVADOC@
+@@ -85,10 +86,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
+--- libdsk-1.2.1.orig/lib/Makefile.in	2008-01-24 06:29:49.000000000 +1100
++++ libdsk-1.2.1/lib/Makefile.in	2008-04-02 14:04:42.000000000 +1100
+@@ -492,10 +492,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`
+--- libdsk-1.2.1.orig/tools/Makefile.am	2006-04-12 08:05:09.000000000 +1000
++++ libdsk-1.2.1/tools/Makefile.am	2008-04-02 14:06:06.000000000 +1100
+@@ -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
index fb7a8bf91d12..a00a5fc53809 100644
--- a/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
+++ b/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild,v 1.2 2008/04/02 07:41:42 dragonheart Exp $
 
 inherit java-pkg-opt-2 flag-o-matic
 
@@ -30,7 +30,7 @@ src_compile() {
 
 	local java_options=""
 	if use java; then
-		java_options="--with-javac-flags=\"$(java-pkg_javac-args)\""
+		java_options="--with-javac-flags=$(java-pkg_javac-args)"
 	fi
 
 	econf \
@@ -39,13 +39,13 @@ src_compile() {
 		--enable-floppy \
 		$(use_with java jni) \
 		--with-java-prefix=${JAVA_HOME} \
-		${java_options} \
+		"${java_options}" \
 		|| die
 	emake || die "libdsk make failed!"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install transform="s,^,," DESTDIR="${D}" || die
 	if use java; then
 		java-pkg_dojar "lib/${PN}.jar"
 	fi
diff --git a/app-emulation/libdsk/libdsk-1.2.1.ebuild b/app-emulation/libdsk/libdsk-1.2.1.ebuild
new file mode 100644
index 000000000000..215f440d1fae
--- /dev/null
+++ b/app-emulation/libdsk/libdsk-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.2.1.ebuild,v 1.1 2008/04/02 07:41:42 dragonheart 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}"/${P}-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 transform="s,^,," DESTDIR="${D}" || die
+	if use java; then
+		java-pkg_dojar "lib/${PN}.jar"
+	fi
+
+	dodoc ChangeLog README TODO doc/libdsk.*
+}