Version bump. WRT bug #351726

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

6 files changed, 184 insertions, 2 deletions

diff --git a/app-emulation/fuse-utils/ChangeLog b/app-emulation/fuse-utils/ChangeLog
index 0402a111c63d..4faa25a935f3 100644
--- a/app-emulation/fuse-utils/ChangeLog
+++ b/app-emulation/fuse-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/fuse-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse-utils/ChangeLog,v 1.10 2011/01/18 17:11:34 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse-utils/ChangeLog,v 1.11 2011/05/02 20:05:35 neurogeek Exp $
+
+*fuse-utils-1.0.0 (02 May 2011)
+
+  02 May 2011; Jesus Rivero <neurogeek@gentoo.org> +fuse-utils-1.0.0.ebuild,
+  +files/fuse-utils-1.0.0-libgcrypt.patch, metadata.xml:
+  Version bump. WRT bug #351726
 
   18 Jan 2011; <neurogeek@gentoo.org> metadata.xml:
   Changed metadata.xml for coherence with app-emulation/fuse
diff --git a/app-emulation/fuse-utils/files/fuse-utils-1.0.0-libgcrypt.patch b/app-emulation/fuse-utils/files/fuse-utils-1.0.0-libgcrypt.patch
new file mode 100644
index 000000000000..6212cf670b4a
--- /dev/null
+++ b/app-emulation/fuse-utils/files/fuse-utils-1.0.0-libgcrypt.patch
@@ -0,0 +1,36 @@
+--- configure.in	2010-12-16 21:47:12.000000000 +0000
++++ configure.in	2011-02-03 19:13:29.000000000 +0000
+@@ -48,12 +48,16 @@
+   LDFLAGS="$LDFLAGS -L$prefix/lib"
+ fi)
+ 
+-dnl Check that libgcrypt is available
+-AC_CHECK_LIB(gcrypt,gcry_check_version,
+-  AC_DEFINE([HAVE_LIBGCRYPT], 1, [Defined if we've got libgcrypt])
+-  GCRYPT_LIBS="$LIBS -lgcrypt"
+-  gcrypt=yes
+-)
++dnl Check whether to use libgcrypt
++AC_MSG_CHECKING(whether to use libgcrypt)
++AC_ARG_WITH(libgcrypt,
++[  --without-libgcrypt     don't use libgcrypt],
++if test "$withval" = no; then libgcrypt=no; else libgcrypt=yes; fi,
++libgcrypt=yes)
++AC_MSG_RESULT($libgcrypt)
++if test "$libgcrypt" = yes; then
++  AC_CHECK_HEADERS(gcrypt.h,LIBS="$LIBS -lgcrypt")
++fi
+ AC_SUBST(GCRYPT_LIBS)
+ AM_CONDITIONAL(BUILD_RZXCHECK, test "$gcrypt" = yes)
+ 
+--- audio2tape.h	2010-12-16 21:47:12.000000000 +0000
++++ audio2tape.h	2011-02-03 19:13:02.000000000 +0000
+@@ -26,6 +26,8 @@
+ #ifndef AUDIO2TAPE_H
+ #define AUDIO2TAPE_H
+ 
++#include <string.h>
++
+ class audio2tape_exception : public std::exception
+ {
+   public:
diff --git a/app-emulation/fuse-utils/fuse-utils-1.0.0.ebuild b/app-emulation/fuse-utils/fuse-utils-1.0.0.ebuild
new file mode 100644
index 000000000000..f944ee90c37a
--- /dev/null
+++ b/app-emulation/fuse-utils/fuse-utils-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse-utils/fuse-utils-1.0.0.ebuild,v 1.1 2011/05/02 20:05:35 neurogeek Exp $
+
+EAPI="3"
+
+DESCRIPTION="Utils for the 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 ~x86"
+IUSE="audiofile gcrypt"
+
+RDEPEND="~app-emulation/libspectrum-1.0.0[gcrypt?]
+	audiofile? ( >=media-libs/audiofile-0.2.3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare () {
+	epatch "${FILESDIR}/${P}-libgcrypt.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	$(use_with audiofile ) \
+	$(use_with gcrypt libgcrypt) \
+	|| die "Configure failed!"
+}
+
+src_compile() {
+	emake || die "Make failed!"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS ChangeLog README
+	doman man/*.1
+}
diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml
index a0ff0a203f89..e81ba224a8e5 100644
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@@ -12,4 +12,8 @@
 		<description>Proxied Maintainer. Please assign on bugs.</description>
 		<name>José Manuel Ferrer Ortiz</name>
 	</maintainer>
+	<use>
+		<flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some
+		features, including logfiles.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog
index 911e1eae6c94..e803f9ad8e31 100644
--- a/app-emulation/fuse/ChangeLog
+++ b/app-emulation/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2011/03/27 10:25:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.33 2011/05/02 20:01:15 neurogeek Exp $
+
+*fuse-1.0.0 (02 May 2011)
+
+  02 May 2011; Jesus Rivero <neurogeek@gentoo.org> +fuse-1.0.0.ebuild:
+  Version bump. WRT bug #351726
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> fuse-0.7.0.ebuild,
   fuse-0.10.0.2-r3.ebuild:
diff --git a/app-emulation/fuse/fuse-1.0.0.ebuild b/app-emulation/fuse/fuse-1.0.0.ebuild
new file mode 100644
index 000000000000..e2dcecbaa94e
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.0.0.ebuild
@@ -0,0 +1,90 @@
+# 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-1.0.0.ebuild,v 1.1 2011/05/02 20:01:15 neurogeek Exp $
+
+EAPI="3"
+
+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 memlimit png 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-1.0.0
+	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
+	png? ( media-libs/libpng )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/pkgconfig"
+
+src_configure() {
+	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 joystick) \
+		$(use_enable joystick ui-joystick) \
+		$(use_with xml libxml2) \
+		$(use_with png ) \
+		$(use_enable memlimit smallmem) \
+		|| die "econf failed!"
+}
+
+src_compile() {
+	emake || die "emake failed!"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog README THANKS
+	doman man/fuse.1
+}