autoconf fix thanks to master Diego - bug #226705. removed old version 1.1.10-r1

Package-Manager: portage-2.1.4.4

5 files changed, 14 insertions, 78 deletions

diff --git a/app-emulation/libdsk/ChangeLog b/app-emulation/libdsk/ChangeLog
index 52d0ef8b7218..91fb54ac16d5 100644
--- a/app-emulation/libdsk/ChangeLog
+++ b/app-emulation/libdsk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libdsk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.21 2008/06/20 14:42:08 dragonheart Exp $
+
+  20 Jun 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:
+  autoconf fix thanks to master Diego - bug #226705. removed old version
+  1.1.10-r1
 
 *libdsk-1.2.1 (02 Apr 2008)
 
diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index e7c2162d4287..88a223e5bfb5 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1,10 +1,8 @@
 AUX java-make-fix.patch 2110 RMD160 a927ee25514b4c479ad32f65165a64bfbdb71a69 SHA1 09bb9319cf79a050f7af074ed0b7285bfe13ff1b SHA256 2fb811df86023e38dc75f6c1ec6fd3990d7d53f13afb5faa746d87936e0d6a0d
-AUX libdsk-1.2.1-java-make-fix.patch 1838 RMD160 3a631c383426cd3f333810e8066d4cfd14aae990 SHA1 a8d2275105f0d010cd3a019ea294587b2eb851e8 SHA256 d24253814c9eeb7fcd9ebbef5fc8718c4450f2ccd0d1b7d3c99f7cca22799198
-DIST libdsk-1.1.10.tar.gz 802326 RMD160 e8356fdc3d6c49cdd2e1720883cd59e5f3dc3085 SHA1 ff25b8db40e7e6a0de77b4ef9f7eed70c612febf SHA256 bdd11105aa2235209795200c37f782e37d8798b74b173b31516f2b47a964a8e6
+AUX libdsk-1.2.1-java-make-fix.patch 1185 RMD160 f3a1b840677bb15f411fed998b384352b114f3b5 SHA1 db1cc4fdc952679ff5495bbb7ca6de265ae1a1f8 SHA256 d77bc73776dc68248d961c10597f53a57e5e2f5d22276c00f28c9c4f62925796
 DIST libdsk-1.1.5.tar.gz 773995 RMD160 09ff2f58b6e982238eeb5449b10ffa6c22ece327 SHA1 2870a600fbc453230671756de036cdae06eff194 SHA256 b08c5a0b2f1f00a9a4eca0ba6c0169d813782b9e140df363333b24290ec74281
 DIST libdsk-1.2.1.tar.gz 815146 RMD160 8557b31f81515d9e85ac6fb3c277b9e4b330f3d9 SHA1 8d02a8ed0021a34a13c061858ca026c385c11c5b SHA256 73dccf8d2d8a291ca9ea74414bee71e848e7bbf816fe82bfc599d4f54936f832
-EBUILD libdsk-1.1.10-r1.ebuild 1275 RMD160 b6de97d435f6f7fcef142450aaf5c4fbe3e0d77d SHA1 7a5f91f0d5b13a1c5a8d4bbf31648c7deb2fafa9 SHA256 93f1d815a8150cba940dc07e13729cd77371beff6f2d3df0450891df7b71e807
 EBUILD libdsk-1.1.5.ebuild 793 RMD160 7446d01df3e43f94c9813d8bfd17f4c61560d8da SHA1 9f701d82cf35e2ed74dc17f3c38dc7e0928283f5 SHA256 e80fcdfe8ce2b9e3fb83f8c2873cb1a7c5940f10950866bcd8864f5a7bcbadf7
-EBUILD libdsk-1.2.1.ebuild 1276 RMD160 93f1155d487ec0ec079eaeb242be687aae0452b8 SHA1 8c7dcb6ce5cd94fcb3747b6642019507047dd8ae SHA256 87f3dbb6f6ab04acbdf0d41be9b9e343970b6d6692cc43f653a42e38b36bb531
-MISC ChangeLog 2836 RMD160 2511684937c7f1ebbbd793319dfde8127f88c409 SHA1 326f76aec76b51e88f0bdc6d455e448b34462b68 SHA256 65d61a5bf44a89299ed2d782ee933bde6f60b2c839ae7f2528ed134ca06b8135
+EBUILD libdsk-1.2.1.ebuild 1297 RMD160 5952948e35e4f66faf9965baae65f07bda252829 SHA1 2d4fc3a583270f56d3d51cd7759b4461a642755c SHA256 48df5d1cb47cf3865e5ade7e2eb47fd432f6d208abd8185250cf8a711dad77a8
+MISC ChangeLog 3066 RMD160 e3e6fae68b637e297ffab7bb3c658c31c6fdd56f SHA1 5b30fe1805c4ff0d301e15cfb29b080a3a049266 SHA256 37d4e7b0006dab7dac4b8f2a458aebc867fc7a714919fab6298df6cae1aad653
 MISC metadata.xml 314 RMD160 6c07bf6beb7a80688cab14b2c325d3d0e046babc SHA1 7378ee22485e7181284c4c38a145c3d08f73fe19 SHA256 f58e7d74e43d9d1375de6ee5d65fccdba45afc50f81ba6fa7b3e51f346805e74
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
index 07aa58c9a93e..21e7ff999224 100644
--- 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
@@ -21,21 +21,6 @@
  
  
  $(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 @@
diff --git a/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild b/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
deleted file mode 100644
index a00a5fc53809..000000000000
--- a/app-emulation/libdsk/libdsk-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2 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}/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.*
-}
diff --git a/app-emulation/libdsk/libdsk-1.2.1.ebuild b/app-emulation/libdsk/libdsk-1.2.1.ebuild
index 215f440d1fae..9e739461e447 100644
--- a/app-emulation/libdsk/libdsk-1.2.1.ebuild
+++ b/app-emulation/libdsk/libdsk-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.2.1.ebuild,v 1.2 2008/06/20 14:42:08 dragonheart Exp $
 
-inherit java-pkg-opt-2 flag-o-matic
+inherit java-pkg-opt-2 flag-o-matic autotools
 
 DESCRIPTION="Disk emulation library"
 HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.seasip.demon.co.uk/Unix/LibDsk/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="java"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 CDEPEND="sys-libs/zlib
 		app-arch/bzip2"
@@ -23,6 +23,7 @@ RDEPEND="${CDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-java-make-fix.patch
+	eautoconf
 }
 
 src_compile() {