0.7.0 x86 stable for bug 105808

(Portage version: 2.0.51.22-r2)

5 files changed, 12 insertions, 77 deletions

diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog
index 4eea5edaad8c..0ebed0fcc2e5 100644
--- a/app-emulation/fuse/ChangeLog
+++ b/app-emulation/fuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/fuse
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.14 2005/06/05 11:43:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.15 2005/09/17 22:27:17 vanquirius Exp $
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -fuse-0.6.1.1.ebuild,
+  fuse-0.7.0.ebuild:
+  0.7.0 x86 stable for bug 105808. Thanks to Ooblick <txe_stc at yahoo dot com>.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> fuse-0.6.2.1.ebuild:
   Stable on ppc.
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index c18b1cbb5e9a..d0686cb67110 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,8 +1,6 @@
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 5a4f236e9b4a1dad81f3830e4e250a7b ChangeLog 1830
 MD5 d3875981a76876cb483a8053da9b8772 fuse-0.6.2.1.ebuild 1621
-MD5 1e15134381495cf00664a85fccd67610 fuse-0.7.0.ebuild 1627
-MD5 6cb0fdbdba724235d29b0f56870c84e0 fuse-0.6.1.1.ebuild 1641
+MD5 77faa013db1f3fbbf23a2f73c5cb3b50 fuse-0.7.0.ebuild 1635
+MD5 5a4f236e9b4a1dad81f3830e4e250a7b ChangeLog 1830
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 630351171dc1040370d0d75ae0e6617d files/digest-fuse-0.7.0 62
-MD5 a006698565f857d2c37f037f2c2c5e4a files/digest-fuse-0.6.1.1 64
 MD5 5f2dadd0c93925bbe9f614df56f9bf1e files/digest-fuse-0.6.2.1 64
diff --git a/app-emulation/fuse/files/digest-fuse-0.6.1.1 b/app-emulation/fuse/files/digest-fuse-0.6.1.1
deleted file mode 100644
index e0318a684ae7..000000000000
--- a/app-emulation/fuse/files/digest-fuse-0.6.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6738574d0f01f758ed352a6d3cb5f4b1 fuse-0.6.1.1.tar.gz 509597
diff --git a/app-emulation/fuse/fuse-0.6.1.1.ebuild b/app-emulation/fuse/fuse-0.6.1.1.ebuild
deleted file mode 100644
index bea66931e79d..000000000000
--- a/app-emulation/fuse/fuse-0.6.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.6.1.1.ebuild,v 1.14 2005/01/03 22:11:18 dragonheart Exp $
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://www.srcf.ucam.org/~pak21/spectrum/fuse.html"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="xml2 png zlib X gtk gtk2 sdl svga fbcon gnome libdsk"
-
-# This build is heavily use dependent. USE="svga" will build the svga
-# version of fuse, otherwise X will be used. Libdsk must be specified
-# in order to take advantage of +3 emulation.
-DEPEND="dev-lang/perl
-	xml2? ( dev-libs/libxml2 )
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )
-	>=app-emulation/libspectrum-0.1.0
-	X? (
-		virtual/x11
-		gtk? (
-			gtk2? ( =x11-libs/gtk+-2* )
-			!gtk2? ( =x11-libs/gtk+-1* )
-		)
-	)
-	!X? (
-		|| (
-			sdl? ( media-libs/libsdl )
-			svga? ( media-libs/svgalib )
-			virtual/x11
-		)
-	)
-	gnome? ( =dev-libs/glib-1* )
-	libdsk? ( app-emulation/libdsk
-		app-emulation/lib765 )"
-
-src_compile() {
-	local guiflag
-	if use X ; then
-		guiflag="--with-x"
-	elif use sdl ; then
-		guiflag="--without-x --with-sdl"
-	elif use svga ; then
-		guiflag="--without-x --with-svgalib"
-	elif use fbcon ; then
-		guiflag="--without-x --with-fb"
-	else
-		guiflag="--with-x"
-	fi
-	econf \
-		`use_with gnome glib` \
-		`use_with gtk` \
-		`use_with gtk2` \
-		`use_with libdsk plus3-disk` \
-		${guiflag} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	dodoc AUTHORS README THANKS hacking/*.txt
-}
diff --git a/app-emulation/fuse/fuse-0.7.0.ebuild b/app-emulation/fuse/fuse-0.7.0.ebuild
index 257d8dc4e98b..3a1d468811bf 100644
--- a/app-emulation/fuse/fuse-0.7.0.ebuild
+++ b/app-emulation/fuse/fuse-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.7.0.ebuild,v 1.2 2005/05/21 10:47:33 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.7.0.ebuild,v 1.3 2005/09/17 22:27:17 vanquirius Exp $
 
 DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
 HOMEPAGE="http://fuse-emulator.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="xml2 png zlib X gtk gtk2 sdl svga fbcon gnome libdsk"
 
 # This build is heavily use dependent. USE="svga" will build the svga
@@ -34,7 +34,7 @@ DEPEND="dev-lang/perl
 		)
 	)
 	gnome? ( =dev-libs/glib-1* )
-	libdsk? ( app-emulation/libdsk
+	libdsk? ( >=app-emulation/libdsk-1.1.5
 		app-emulation/lib765 )"
 
 src_compile() {
@@ -61,6 +61,6 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dodoc AUTHORS README THANKS hacking/*.txt
 }