public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-emulation/vice: vice-2.4.16-r1.ebuild metadata.xml ChangeLog vice-2.4.16.ebuild
@ 2015-02-11  3:05 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; only message in thread
From: Michael Sterrett (mr_bones_) @ 2015-02-11  3:05 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    15/02/11 03:05:43

  Modified:             metadata.xml ChangeLog
  Added:                vice-2.4.16-r1.ebuild
  Removed:              vice-2.4.16.ebuild
  Log:
  rework gui selection and deps; add more use flags
  
  (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.6                  app-emulation/vice/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vice/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	4 May 2010 06:10:59 -0000	1.5
+++ metadata.xml	11 Feb 2015 03:05:43 -0000	1.6
@@ -3,8 +3,11 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
+	<flag name="fullscreen">Enable the ability to run fullscreen</flag>
+	<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 	<flag name='ethernet'>Enable ethernet emulation</flag>
 	<flag name='memmap'>Enable extra monitor features</flag>
+	<flag name='vte'>Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
 	<flag name='xrandr'>Enable support for the X xrandr extension</flag>
 </use>
 </pkgmetadata>



1.98                 app-emulation/vice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/ChangeLog?r1=1.97&r2=1.98

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog	5 Feb 2015 03:17:04 -0000	1.97
+++ ChangeLog	11 Feb 2015 03:05:43 -0000	1.98
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.97 2015/02/05 03:17:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.98 2015/02/11 03:05:43 mr_bones_ Exp $
+
+*vice-2.4.16-r1 (11 Feb 2015)
+
+  11 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> +vice-2.4.16-r1.ebuild,
+  -vice-2.4.16.ebuild, metadata.xml:
+  rework gui selection and deps; add more use flags
 
 *vice-2.4.16 (05 Feb 2015)
 



1.1                  app-emulation/vice/vice-2.4.16-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/vice-2.4.16-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vice/vice-2.4.16-r1.ebuild?rev=1.1&content-type=text/plain

Index: vice-2.4.16-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.16-r1.ebuild,v 1.1 2015/02/11 03:05:43 mr_bones_ Exp $

EAPI=5
inherit autotools eutils toolchain-funcs flag-o-matic games

DESCRIPTION="The Versatile Commodore 8-bit Emulator"
HOMEPAGE="http://vice-emu.sourceforge.net/"
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"

LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="Xaw3d alsa ethernet ffmpeg fullscreen gtk gtk3 ipv6 lame nls oss png pulseaudio readline sdl threads vte zlib"

RDEPEND="
	virtual/jpeg
	virtual/opengl
	media-libs/giflib
	alsa? ( media-libs/alsa-lib )
	ethernet? (
	    >=net-libs/libpcap-0.9.8
	    >=net-libs/libnet-1.1.2.1
	)
	ffmpeg? ( virtual/ffmpeg )
	lame? ( media-sound/lame )
	nls? ( virtual/libintl )
	png? ( media-libs/libpng:0 )
	zlib? ( sys-libs/zlib )
	sdl? (
		media-libs/libsdl[joystick,sound,video]
	)
	!sdl? (
		x11-libs/libX11
		x11-libs/libXext
		fullscreen? (
			x11-libs/libXrandr
			x11-libs/libXxf86vm )
		readline? ( sys-libs/readline )
		gtk? (
			!gtk3? (
				x11-libs/gtk+:2
				vte? ( x11-libs/vte:0 )
			)
			gtk3? (
				x11-libs/gtk+:3
				vte? ( x11-libs/vte:2.90 )
			)
			x11-libs/pango
			x11-libs/cairo
			x11-libs/gtkglext
		)
		!gtk? (
			x11-libs/libX11
			x11-libs/libXmu
			x11-libs/libXpm
			x11-libs/libXt
			x11-libs/libXv
			sys-libs/readline
			Xaw3d? ( x11-libs/libXaw3d )
			!Xaw3d? ( x11-libs/libXaw )
		)
	)"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	!sdl? (
		!gtk? (
			x11-libs/libICE
			x11-libs/libSM
		)
		x11-apps/bdftopcf
		x11-apps/mkfontdir
		x11-proto/xproto
		fullscreen? ( x11-proto/xf86vidmodeproto )
		x11-proto/xextproto
		media-libs/fontconfig
		x11-proto/videoproto
	)
	nls? ( sys-devel/gettext )"

pkg_pretend() {
	if use gtk || use gtk3 && use sdl ; then
		eerror "gtk (2 or 3) and sdl USE flags can't both be set.  Pick one and mask the other one in /etc/portage/package.use"
		die "Please pick one gui option."
	fi
}

src_prepare() {
	epatch \
		"${FILESDIR}"/${P}-autotools.patch
	sed -i \
		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
		man/vice.1 \
		$(grep -rl --exclude="*texi" /usr/local/lib doc) \
		|| die
	sed -i \
		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
		configure.ac || die
	sed -i \
		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
		src/arch/unix/archdep.h \
		src/arch/sdl/archdep_unix.h
	AT_NO_RECURSIVE=1 eautoreconf
}

src_configure() {
	local gui_arg

	if use sdl ; then
		gui_arg="--enable-sdlui"
	elif use gtk || use gtk3 ; then
		# The gtk UI code has raw calls to XOpenDisplay and
		# is missing -lX11 if vte doesn't pull it in.
		if ! use vte ; then
			append-libs -lX11
		fi
		gui_arg="--enable-gnomeui"
		if use gtk3 ; then
			gui_arg="--enable-gnomeui3"
		fi
	fi
	# don't try to actually run fc-cache (bug #280976)
	FCCACHE=/bin/true \
	PKG_CONFIG=$(tc-getPKG_CONFIG) \
	egamesconf \
		--enable-parsid \
		--with-resid \
		--without-arts \
		--without-midas \
		$(use_enable ethernet) \
		$(use_enable ffmpeg) \
		$(use_enable fullscreen) \
		$(use_enable ipv6) \
		$(use_enable lame) \
		$(use_enable nls) \
		$(use_enable vte) \
		$(use_with Xaw3d xaw3d) \
		$(use_with alsa) \
		$(use_with oss) \
		$(use_with png) \
		$(use_with pulseaudio pulse) \
		$(use_with readline) \
		$(use_with sdl sdlsound) \
		$(use_with threads uithreads) \
		$(use_with zlib) \
		${gui_arg} \
		--disable-option-checking
		# --disable-option-checking has to be last
}

src_install() {
	DOCS="AUTHORS ChangeLog FEEDBACK README" \
		default
	prepgamesdirs
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-02-11  3:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-11  3:05 [gentoo-commits] gentoo-x86 commit in app-emulation/vice: vice-2.4.16-r1.ebuild metadata.xml ChangeLog vice-2.4.16.ebuild Michael Sterrett (mr_bones_)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox