Fix building with -X, bug 113093, xml2->xml, bug 116346, modular X deps, bug 123933...

Package-Manager: portage-2.1_rc4-r3

diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog
index 2ee2acd7f94516db49bf1f85c943103ff1fcd287..1f83d3c77b1699c0b2581cb9d048e23f351f68ce 100644 (file)
--- a/app-emulation/fuse/ChangeLog
+++ b/app-emulation/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/fuse
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.17 2006/03/10 06:02:40 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.18 2006/06/06 12:29:53 genstef Exp $
+
+  06 Jun 2006; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  -fuse-0.6.2.1.ebuild, fuse-0.7.0.ebuild:
+  Fix building with -X, bug 113093, xml2->xml, bug 116346, modular X deps, bug
+  123933, merge gtk2 and gtk flags, bug 106560, remove old
 
   10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/fuse-0.7.0-gcc4.patch, fuse-0.7.0.ebuild:

diff --git a/app-emulation/fuse/files/digest-fuse-0.7.0 b/app-emulation/fuse/files/digest-fuse-0.7.0
index 83363353801e0cbd044df898c0b2c52af1afaebc..9e31a04712ea6a8728e4c0520892e56347cb3ecd 100644 (file)
--- a/app-emulation/fuse/files/digest-fuse-0.7.0
+++ b/app-emulation/fuse/files/digest-fuse-0.7.0
@@ -1 +1,3 @@
 MD5 d81ad260cd6a8dd533af01ee6a5f9527 fuse-0.7.0.tar.gz 872031
+RMD160 38abec9f44677f0f5b86b99bc0127a62cc7fb9cf fuse-0.7.0.tar.gz 872031
+SHA256 266177f8d9cd8959fc2b4358b56afb343f98fb56e5d4da352589ac1d49ce32e7 fuse-0.7.0.tar.gz 872031

diff --git a/app-emulation/fuse/fuse-0.7.0.ebuild b/app-emulation/fuse/fuse-0.7.0.ebuild
index 242043ec529cc049b75572cfccdcca0dc20b2f94..7cf40c5ae2f1b6e115ff0248afb938845794f123 100644 (file)
--- a/app-emulation/fuse/fuse-0.7.0.ebuild
+++ b/app-emulation/fuse/fuse-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5 2006/03/10 06:02:40 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.7.0.ebuild,v 1.6 2006/06/06 12:29:53 genstef Exp $
 
 inherit eutils
 
@@ -11,31 +11,26 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="xml2 png zlib X gtk gtk2 sdl svga fbcon gnome libdsk"
+IUSE="gtk sdl svga fbcon libdsk xml png"
 
 # 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 )
+RDEPEND="dev-lang/perl
+       xml? ( dev-libs/libxml2 )
        png? ( media-libs/libpng )
-       zlib? ( sys-libs/zlib )
        >=app-emulation/libspectrum-0.2.2
-       X? (
-               virtual/x11
-               gtk? (
-                       gtk2? ( =x11-libs/gtk+-2* )
-                       !gtk2? ( =x11-libs/gtk+-1* )
-               )
+       || (
+               sdl? ( media-libs/libsdl )
+               svga? ( media-libs/svgalib )
+               fbcon? ( virtual/linux-sources )
+               gtk? ( >=x11-libs/gtk+-2 )
+               !svga? ( !fbcon? ( !sdl? (
+                       || ( ( x11-libs/libX11
+                       x11-libs/libXext )
+                       virtual/x11 ) ) ) )
        )
-       !X? (
-               || (
-                       sdl? ( media-libs/libsdl )
-                       svga? ( media-libs/svgalib )
-                       virtual/x11
-               )
-       )
-       gnome? ( =dev-libs/glib-1* )
+       >=dev-libs/glib-2
        libdsk? ( >=app-emulation/libdsk-1.1.5
                app-emulation/lib765 )"
 
@@ -47,28 +42,28 @@ src_unpack() {
 
 src_compile() {
        local guiflag
-       if use X ; then
-               guiflag="--with-x"
-       elif use sdl ; then
+       if use gtk; then
+               guiflag="--with-x --with-gtk2"
+       elif use sdl; then
                guiflag="--without-x --with-sdl"
-       elif use svga ; then
+       elif use svga; then
                guiflag="--without-x --with-svgalib"
-       elif use fbcon ; then
+       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` \
+               $(use_with libdsk plus3-disk) \
+               --with-glib \
+               --without-gtk \
                ${guiflag} \
-               || die
-       emake || die
+               || die "econf failed"
+               #$(use_with gnome glib) \ -gnome fails, we have to hardcode the glib-dep
+       emake || die "emake failed"
 }
 
 src_install() {
-       make install DESTDIR="${D}" || die
+       make install DESTDIR="${D}" || die "make install failed"
        dodoc AUTHORS README THANKS hacking/*.txt
 }

diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index d8b96be3c5cd34ef10346690f4c871a3c235ccb7..b17012b02b48739f2c6db3a8ce575a40410d02ce 100644 (file)
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>no-herd</herd>
        <maintainer>
-               <email>bug-wranglers@gentoo.org</email>
+               <email>maintainer-needed@gentoo.org</email>
                <description>This package lacks a primary herd or maintainer.</description>
        </maintainer>
 </pkgmetadata>