From 8a36468c29043a43d3a0485d8e9efc51208b96e0 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 16 Oct 2011 18:50:24 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- app-emulation/fuse-utils/Manifest | 18 ++-- app-emulation/fuse/ChangeLog | 6 +- app-emulation/fuse/Manifest | 19 ++-- .../fuse/files/fuse-0.7.0-gcc4.patch | 14 --- app-emulation/fuse/fuse-0.10.0.2-r3.ebuild | 88 ------------------- app-emulation/fuse/fuse-0.7.0.ebuild | 70 --------------- 6 files changed, 23 insertions(+), 192 deletions(-) delete mode 100644 app-emulation/fuse/files/fuse-0.7.0-gcc4.patch delete mode 100644 app-emulation/fuse/fuse-0.10.0.2-r3.ebuild delete mode 100644 app-emulation/fuse/fuse-0.7.0.ebuild diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest index 835ceba8be73..83a86d533799 100644 --- a/app-emulation/fuse-utils/Manifest +++ b/app-emulation/fuse-utils/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX fuse-utils-1.0.0-libgcrypt.patch 1059 RMD160 e4416527fab5305da8b373673d22aa5c7c85e16f SHA1 c5bb615feabb1da7a1800fe240846e0c3ec32728 SHA256 252ac5449311edad454809b655bbb4f741edc0dd9c425f7cc5c504e5d35e4486 -DIST fuse-utils-0.10.0.1.tar.gz 394523 RMD160 2867781573530783f7da2de86a583b6f9b03cbb5 SHA1 eb2fdeab56881ce28f3da268355d0fd60433d80b SHA256 c18b910e6bfb7fa07466b2c9231e6125084569ea06050d15a2174bc028b74916 DIST fuse-utils-1.0.0.tar.gz 415310 RMD160 399441c92d0c08d971128a4355b5f50424a12c4e SHA1 f865c099aae7f0a751f43714700968a31cea3fbc SHA256 39f110d9760b84ecd23ab4a7ad777db6480b470f1c6435889a125abb302de104 -EBUILD fuse-utils-0.10.0.1.ebuild 835 RMD160 367fc5514c1cf46b937e6cf087c70a5ccfb4a11c SHA1 9e253603095e606b3106223fcc1becafcf48effe SHA256 783148e8d459ecc5324acbff3c5a18d3dbd99178483a89a5f3a95a23adea00ec EBUILD fuse-utils-1.0.0.ebuild 1020 RMD160 ae3fa710baced41a3426e650076a14fee20387ad SHA1 6689d071c50d631e781418aaca31508a15580c64 SHA256 ad11ab18d09fb1ea25832d865fdb2de1978b38ff7c0c391de281540848dabf69 -MISC ChangeLog 2120 RMD160 02f76551a11dc1650c6851de5324cecc552ef1b8 SHA1 1e8f6ba84aa60907dbedac0e59bf763818080ec5 SHA256 0f64933ab085dc14f29f3aa21aac1861a219f4788a3aa82e1b7f8b66384156b4 +MISC ChangeLog 2212 RMD160 358d8d858a76d9d5b3369fde329a2b3807fdfb78 SHA1 753996da6fe6457f8a654975899a69b234fd53b1 SHA256 9b4b828f161887310ed36e1288c74d29b336b0c60e5611ac693f1378a3a6bee7 MISC metadata.xml 616 RMD160 8b7a4ef605043fbb26445a44eda8be8f1915f06d SHA1 7c31e8da614ca2e4ae5c732b5bda255582042712 SHA256 7e05427224e23b4514c75293f85a123de5494752252b548daa7a1dedad4a7e4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk58/TUACgkQfXuS5UK5QB3mKgP8DbgW3kXkhFfn1Q8tUdB5y8vW -8OSKR+1wmbLzFBYbL51F64fejrB7Fl6MDV+rdW5ifBGMfCMnRw57glLUOxIiiOWw -ybXupwThwhvuroCmoBTCdmDEKIrYZM1FmY5kh6C61usr6HWRmGjD6FjYHACcch+R -cDgwXLbjkn5nDjnpeXk= -=ZqoL +iQEcBAEBAgAGBQJOmygHAAoJEEdUh39IaPFNAtIH/3ZzjvsKAhW3hiwix6h8hS/h +yUu9ESq6Chej3PZTvIDS5uXplMLcBfbpcTidAJ6GvkusTADFhqq3E/hiUVlqij2E +mDV082VDP0KwEARFTdWDfhM2/0gAFyTFUf892nHQ1dRQYVt13Q4s6mCgqfVtfIcx +s1Kr07mSeehKsR2HuShf9iK6eG6NQs1LQQus4P3TwGw1NRe6PVlzR/ZEKrygUJgo +LG5bai31YR4H5Bfvhhz+ZcGIaP2fLR6FIuFgvKGfPSYEVylu6nc6hwPJS5k/v8aD +suTlZQAI7QHZ4RmH9bCh/pDmXDGM4EJITfBDvIYe3AAqdCfLLJJBkHl74bX60dg= +=07yN -----END PGP SIGNATURE----- diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog index 0ff0cfa3845f..b8be7a0b804b 100644 --- a/app-emulation/fuse/ChangeLog +++ b/app-emulation/fuse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/fuse # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.37 2011/10/15 23:07:33 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.38 2011/10/16 18:50:24 ssuominen Exp $ + + 16 Oct 2011; Samuli Suominen -fuse-0.7.0.ebuild, + -files/fuse-0.7.0-gcc4.patch, -fuse-0.10.0.2-r3.ebuild: + old 15 Oct 2011; Markus Meier fuse-1.0.0.ebuild: x86 stable, bug #385791 diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest index 3dd7ba72fdc2..228b9b792132 100644 --- a/app-emulation/fuse/Manifest +++ b/app-emulation/fuse/Manifest @@ -1,20 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX fuse-0.7.0-gcc4.patch 725 RMD160 5d89b4e67c19a7d4c087f6e13f71ce2f87957bb2 SHA1 ba8420be70c1e050e5ca31fc7afee298978827e9 SHA256 b891245b9c66d3be267a18e704bcbadc1bbead821c541744a4301c00c2815e99 AUX fuse-1.0.0-libpng15.patch 187 RMD160 4bc84b281670e596d105271035e6257816ebdeaa SHA1 a696d8f56c1e4e1f85f56b284c58f89778d05668 SHA256 a2099911f20d78ec8621c108aa534785e9ec45bb1d826b0603acebdb575f8b0f -DIST fuse-0.10.0.2.tar.gz 1579106 RMD160 d6f3f8b10669573b62be38dcc63b35add743e0fe SHA1 1d43619a92f2557666a165af5d0b5eca87497d55 SHA256 843d5a17b7956d81741f3280910252a29f543a02cf99a177ab78bdb7dc778672 -DIST fuse-0.7.0.tar.gz 872031 RMD160 38abec9f44677f0f5b86b99bc0127a62cc7fb9cf SHA1 36e0485183bd1bbfc9140b8ebb9f0a4bf197ffe6 SHA256 266177f8d9cd8959fc2b4358b56afb343f98fb56e5d4da352589ac1d49ce32e7 DIST fuse-1.0.0.tar.gz 1628751 RMD160 32d9249266f6083a8cb565ef7b4a5f26b9fa6d5e SHA1 9bf164ca069a0b599002c49b56a1d30519e2aac0 SHA256 a00add3abc0148247f7990e6feebcc32d82ebe857897d9426e5230222425aeb9 -EBUILD fuse-0.10.0.2-r3.ebuild 2534 RMD160 d542251506986da09bbf5fd72fdd95ba7d2cc5de SHA1 d1d878a23563f867dbafe14700c6df50b906bce2 SHA256 db6490fe660ea1a20cd4cf05df6e3ed3e16bd5220eac8d269373f87f829a261d -EBUILD fuse-0.7.0.ebuild 1801 RMD160 35d50277bcc4df092dcdacd1c29ff473825f1cea SHA1 493ac7610516fd1b73b0c9dc161fe7cf44c7af2f SHA256 4155a2ab5348dc8f18d81d72e166ac747f0247feb140bc21c04a71d1b4ce132d EBUILD fuse-1.0.0.ebuild 2475 RMD160 97cc28ceb811ed10b962bc77ad54f2584fb112d0 SHA1 82c0cac127d5c76c31a95c845c8c2d79803e3ffb SHA256 a77a145247e98626f01f3de997d6e3e0d8ca52ce3bb64f55a61104c69dc58f22 -MISC ChangeLog 5177 RMD160 55c2fdcaa340dcfba5e20ea2a0aea2a953e32e98 SHA1 e5776b42f66aa27cd7420622640d45c12fbd8151 SHA256 5fc50266c0c8ebba1e611d1e6689b4c3b446a5ec3206edb4d3ce98c5d1d9531a +MISC ChangeLog 5319 RMD160 70cb480fc48aff4f7221718b300872fdd458be46 SHA1 f046d8144d0b5cc04c269bc092b2d8bef16410a3 SHA256 9b9ab98d496760462663323f4d69d96c2e13841182982ffa6980ccebae6e737a MISC metadata.xml 608 RMD160 b4fbee4fd8789cf7f0e56bfd0f573f1169021b8c SHA1 9282bed24814863d310145dfc7c5434aa28729a1 SHA256 8493d9a0a986d2bbb164ec9471eee4df7968930515247db5869056b487ca80ed -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6aEnwACgkQkKaRLQcq0GJiwQCfb+6jDTjF4X4M8Tlr2w+3f4NP -dOAAoKVKsV4yNEgEHv7kV23BzvP9KQco -=X39I +iQEcBAEBAgAGBQJOmydlAAoJEEdUh39IaPFN19cH/iZEQigpFNLcGlt5fYI+sXog +EGaHifSX9G09XwxZifrh6lhXWsBzniv5poyXDQ0921K0hjr4fAkaQ91KIf6CnZG6 +bMPjEmwB227Wgc9C/6/V+4QLK9VUg7ZuKVjrTeB1rOUGkFlSke9hmcEcwLBqyxu1 +QwbnFd50WkdksEcKFcyFAA+zGf97wJYeTPbDJUaqndDBIUzjt0rkPMumg4poBbXX +4cf7o7FASpMFj4Ucx5rpERfOaF4duAApaRPL4ZKi3u3fsIMpprULpQzEeapxCK25 +bjCcwQ5oG8HOxI3HN9IPYeJFLzLf9biFkAzPfmR31lk8eIOVwYJza+UoeezsV6Q= +=/tS3 -----END PGP SIGNATURE----- diff --git a/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch b/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch deleted file mode 100644 index e29706fe351f..000000000000 --- a/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur fuse-0.7.0.orig/sound.c fuse-0.7.0/sound.c ---- fuse-0.7.0.orig/sound.c 2004-07-04 21:52:15.000000000 +0300 -+++ fuse-0.7.0/sound.c 2006-03-09 19:26:17.000000000 +0200 -@@ -58,8 +58,8 @@ - int sound_stereo_ay_abc=0; /* (AY stereo) true for ABC stereo, else ACB */ - int sound_stereo_ay_narrow=0; /* (AY stereo) true for narrow AY st. sep. */ - --static int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ --static int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ -+int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ -+int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ - - - /* assume all three tone channels together match the beeper volume (ish). diff --git a/app-emulation/fuse/fuse-0.10.0.2-r3.ebuild b/app-emulation/fuse/fuse-0.10.0.2-r3.ebuild deleted file mode 100644 index 2c59e252b8a8..000000000000 --- a/app-emulation/fuse/fuse-0.10.0.2-r3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.10.0.2-r3.ebuild,v 1.2 2011/03/27 10:25:00 nirbheek Exp $ - -EAPI="1" - -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="~amd64 ~ppc ~x86" -IUSE="alsa ao fbcon gpm gtk joystick libsamplerate memlimit sdl svga X xml" - -# This build is heavily use dependent. Fuse user interface use flags are, in -# order of precedence: gtk, sdl, X, svga and fbcon. X version of fuse will -# be built if no valid user interface flag is chosen. -RDEPEND=">=app-emulation/libspectrum-0.5 - gtk? ( x11-libs/gtk+:2 - alsa? ( media-libs/alsa-lib ) - !alsa? ( ao? ( media-libs/libao ) ) - joystick? ( media-libs/libjsw ) ) - !gtk? ( - sdl? ( >=media-libs/libsdl-1.2.4 ) - !sdl? ( - X? ( x11-libs/libX11 - x11-libs/libXext - alsa? ( media-libs/alsa-lib ) - !alsa? ( ao? ( media-libs/libao ) ) - joystick? ( media-libs/libjsw ) ) - !X? ( - svga? ( media-libs/svgalib - alsa? ( media-libs/alsa-lib ) - !alsa? ( ao? ( media-libs/libao ) ) ) - !svga? ( - fbcon? ( virtual/linux-sources - gpm? ( sys-libs/gpm ) - alsa? ( media-libs/alsa-lib ) - !alsa? ( ao? ( media-libs/libao ) ) - joystick? ( media-libs/libjsw ) ) - !fbcon? ( x11-libs/libX11 - x11-libs/libXext - alsa? ( media-libs/alsa-lib ) - !alsa? ( ao? ( media-libs/libao ) ) - joystick? ( media-libs/libjsw ) ) ) ) ) ) - dev-libs/glib:2 - media-libs/libpng - libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/pkgconfig" - -src_compile() { - local guiflag - if use gtk; then - guiflag="" - elif use sdl; then - guiflag="--with-sdl" - elif use X; then - guiflag="--without-gtk" - elif use svga; then - guiflag="--with-svgalib" - elif use fbcon; then - guiflag="--with-fb" - else # We default to X user interface - guiflag="--without-gtk" - fi - econf --without-win32 \ - ${guiflag} \ - $(use_with gpm) \ - $(use_with alsa) \ - $(use_with ao libao) \ - $(use_with libsamplerate) \ - $(use_with joystick) \ - $(use_enable joystick ui-joystick) \ - $(use_with xml libxml2) \ - $(use_enable memlimit smallmem) \ - || die "econf failed!" - emake || die "emake failed!" -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog README THANKS - doman man/fuse.1 -} diff --git a/app-emulation/fuse/fuse-0.7.0.ebuild b/app-emulation/fuse/fuse-0.7.0.ebuild deleted file mode 100644 index 11d2c34f5ef6..000000000000 --- a/app-emulation/fuse/fuse-0.7.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2011 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.11 2011/03/27 10:25:00 nirbheek Exp $ - -EAPI="1" - -inherit eutils - -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="amd64 ppc x86" -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. -RDEPEND="dev-lang/perl - xml? ( dev-libs/libxml2 ) - png? ( media-libs/libpng ) - ~app-emulation/libspectrum-0.2.2 - || ( - gtk? ( x11-libs/gtk+:2 ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - fbcon? ( virtual/linux-sources ) - !svga? ( !fbcon? ( !sdl? ( - x11-libs/libX11 - x11-libs/libXext ) ) ) - ) - dev-libs/glib:2 - libdsk? ( >=app-emulation/libdsk-1.1.5 - app-emulation/lib765 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc4.patch -} - -src_compile() { - local guiflag - if use gtk; then - guiflag="--with-x --with-gtk2" - 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 libdsk plus3-disk) \ - --with-glib \ - --without-gtk \ - ${guiflag} \ - || die "econf failed" - #$(use_with gnome glib) \ -gnome fails, we have to hardcode the glib-dep - emake || die "emake failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS README THANKS hacking/*.txt -} -- 2.26.2