Fix building with -X, bug 113093, xml2->xml, bug 116346, modular X deps, bug 123933, merge gtk2 and gtk flags, bug 106560, remove old

Package-Manager: portage-2.1_rc4-r3

3 files changed, 17 insertions, 95 deletions

diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 4c935c8adc44..b9a89321e496 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,31 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 05ef68e8a314bdccba2de0262318e230 ChangeLog 2309
-RMD160 db143722e45f8e5b6d9f46d532666692f455b39b ChangeLog 2309
-SHA256 7153f89325e3e52b9e234fd7a9ad4ff376d430e478d7779737cb97b53a49fd29 ChangeLog 2309
-MD5 5f2dadd0c93925bbe9f614df56f9bf1e files/digest-fuse-0.6.2.1 64
-RMD160 7ecf4fa7545b7070d31edbd8ffa91ca4607f777e files/digest-fuse-0.6.2.1 64
-SHA256 0751a9a8d46ed7be69d5ad80279c6bfced7e00d1a6d771087525f4d79033a687 files/digest-fuse-0.6.2.1 64
-MD5 630351171dc1040370d0d75ae0e6617d files/digest-fuse-0.7.0 62
-RMD160 2461319dfaed53ba689afe7b740427128a053fea files/digest-fuse-0.7.0 62
-SHA256 19da228e006b6104ab8da7c0d15c8b942cdf4271c3cc1dd247ea17ad5f433dd3 files/digest-fuse-0.7.0 62
+AUX fuse-0.7.0-gcc4.patch 725 RMD160 5d89b4e67c19a7d4c087f6e13f71ce2f87957bb2 SHA1 ba8420be70c1e050e5ca31fc7afee298978827e9 SHA256 b891245b9c66d3be267a18e704bcbadc1bbead821c541744a4301c00c2815e99
 MD5 35c61d2acc6135850881b6a8487cb2fc files/fuse-0.7.0-gcc4.patch 725
 RMD160 5d89b4e67c19a7d4c087f6e13f71ce2f87957bb2 files/fuse-0.7.0-gcc4.patch 725
 SHA256 b891245b9c66d3be267a18e704bcbadc1bbead821c541744a4301c00c2815e99 files/fuse-0.7.0-gcc4.patch 725
-MD5 d3875981a76876cb483a8053da9b8772 fuse-0.6.2.1.ebuild 1621
-RMD160 6099207f244c8d761be130bc512f40ecc331bb8e fuse-0.6.2.1.ebuild 1621
-SHA256 fc4793cefd0d3a58547ff82cff5d60db6445518887abceef186e4a8acb72d3e1 fuse-0.6.2.1.ebuild 1621
-MD5 b5b5a68d9c74332cddfe2bf15dc9c5b9 fuse-0.7.0.ebuild 1722
-RMD160 1655364069ce832ff85da608196b8ce13f221f85 fuse-0.7.0.ebuild 1722
-SHA256 d2755929a686d46281d16ffb6c59698a467b8efbd349e5e7a6189276b82bd649 fuse-0.7.0.ebuild 1722
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
-SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEERaJCRZPokWLroQRAsTpAJ9tDun+BemRwGxhnLwQnWyGtXDz6ACgtVFh
-7hTDsdYy+dCuIr8dmzLhooA=
-=p4Ty
------END PGP SIGNATURE-----
+DIST fuse-0.7.0.tar.gz 872031 RMD160 38abec9f44677f0f5b86b99bc0127a62cc7fb9cf SHA1 36e0485183bd1bbfc9140b8ebb9f0a4bf197ffe6 SHA256 266177f8d9cd8959fc2b4358b56afb343f98fb56e5d4da352589ac1d49ce32e7
+EBUILD fuse-0.7.0.ebuild 1810 RMD160 4d7702fc37249e885a8f306ce4c995761333caeb SHA1 72486178690cab0b4acbbf9455da9a49b78638f2 SHA256 4e2afc284b5cdb81ffb0c0fae9b7180a8a7de4a8ab0082b37f94ea552cc9fb85
+MD5 3e0019ae12efc115d7d83b9c7d4bd20a fuse-0.7.0.ebuild 1810
+RMD160 4d7702fc37249e885a8f306ce4c995761333caeb fuse-0.7.0.ebuild 1810
+SHA256 4e2afc284b5cdb81ffb0c0fae9b7180a8a7de4a8ab0082b37f94ea552cc9fb85 fuse-0.7.0.ebuild 1810
+MISC ChangeLog 2558 RMD160 ab98420ba6260cb150d4d543d77508a5aba24597 SHA1 902edd17162bfb61e28ed842d1bf3bbbde9bccf5 SHA256 0c9712428a51c12e9916f267d12d68f9a55de13ec0f777528f3d263178992be2
+MD5 3fe583325b9fe5207cf7e090b820515e ChangeLog 2558
+RMD160 ab98420ba6260cb150d4d543d77508a5aba24597 ChangeLog 2558
+SHA256 0c9712428a51c12e9916f267d12d68f9a55de13ec0f777528f3d263178992be2 ChangeLog 2558
+MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
+MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
+RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
+SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata.xml 314
+MD5 9e91b8a2c78571a55822516afcccca99 files/digest-fuse-0.7.0 232
+RMD160 acb538f016bcd2a19109113cdf4f2e2e0c9efee4 files/digest-fuse-0.7.0 232
+SHA256 59b89e8bee2cbfd34675862d3c4aa2138a001ae773bce622940be3941913e90d files/digest-fuse-0.7.0 232
diff --git a/app-emulation/fuse/files/digest-fuse-0.6.2.1 b/app-emulation/fuse/files/digest-fuse-0.6.2.1
deleted file mode 100644
index a9227f6bace9..000000000000
--- a/app-emulation/fuse/files/digest-fuse-0.6.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ce5c01fb922acb695c7229e765d0f6b fuse-0.6.2.1.tar.gz 668863
diff --git a/app-emulation/fuse/fuse-0.6.2.1.ebuild b/app-emulation/fuse/fuse-0.6.2.1.ebuild
deleted file mode 100644
index e54baa4cd252..000000000000
--- a/app-emulation/fuse/fuse-0.6.2.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.2.1.ebuild,v 1.9 2005/06/05 11:43:11 hansmi Exp $
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-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.2.1
-	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
-}