version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64

5 files changed, 195 insertions, 5 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index 76397c9bed89..e54a5b67e9bf 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -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.98 2015/02/11 03:05:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.99 2015/06/03 05:41:15 mr_bones_ Exp $
+
+*vice-2.4.20 (03 Jun 2015)
+
+  03 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/vice-2.4.20-autotools.patch, +vice-2.4.20.ebuild, metadata.xml:
+  version bump
 
 *vice-2.4.16-r1 (11 Feb 2015)
 
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index fb7616cc7270..5912bba79387 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -3,9 +3,12 @@ AUX vice-2.4-autotools.patch 349 SHA256 ea876b67f456e56faea4aeb0e8ade5e5dc730242
 AUX vice-2.4-buffer.patch 501 SHA256 4fef89a8724452f39b032db8f26e76102bf21f7a83861474a1b0f3297740d396 SHA512 ab1b2d90953d81061a6032c006121670bef0c880dfee017c00007616254642bb806eda2c89e382f079ee874f78839ec3bdcb14eb15bfb5279cfc45d2a88cfef2 WHIRLPOOL cce26a6c72072f2bccf4ff16d2fa3d8e1f6330acd50f399fc511b9e6982a474e02fdc7df1c2948ee6dff6cfd89b576cdc920364b852a4ecc1bbc561833780ba8
 AUX vice-2.4-ffmpeg-1.patch 6037 SHA256 0f3247c009f64e3e911748ce44b86ff6c2e899d8d74d6ff958f2e0c2277233f6 SHA512 7029522b0d6266ca696dfb802da623ac7a7c581978e32639e9139eabeca5d54c043f2510d362d63550987f6e8f43d1afa153d8cb18d82f1eda25e25f57b5713c WHIRLPOOL 9b7495861df422d4965c01bcafee1c51184ccfb144b8d01dbed2ff0fda377f428b38030d59fe88c5a07d11ffb46c18f6a0ecdf3857ce454613e0a3dbe123506d
 AUX vice-2.4.16-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a12093666e42dd6a59b21fd362923e9511 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 WHIRLPOOL cad09cca9eb43298168ff4c8f3c5acd52e56aeee1a3db63f91906c5f4dc440f230d3e2e68c039759fbea0e5d7bb54adec58c2c14fe4be41a75e69c1a0fe35ab6
+AUX vice-2.4.20-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a12093666e42dd6a59b21fd362923e9511 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 WHIRLPOOL cad09cca9eb43298168ff4c8f3c5acd52e56aeee1a3db63f91906c5f4dc440f230d3e2e68c039759fbea0e5d7bb54adec58c2c14fe4be41a75e69c1a0fe35ab6
 DIST vice-2.4.16.tar.gz 14779876 SHA256 90a5d6cbfa621ecb67b5bff43030bf5d5da5fee2c1933efe44ad036c3945d4ec SHA512 0f6cda3233f43c98bc14153144f0ebf41f4dc452446a842985f0ec235232580121a1b580ab834aa54fbfb15f610316764948e4db56b93bcfbfbb4320b5089ec0 WHIRLPOOL 079367e36f2358ebe233de25ed29dfa2d21a52dfbc6c3bc880ebbe3f89b6b409ed0f778aac2dc89418bd07cdf819a5bf70b98156a3dd5c7364228efee8235022
+DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823
 EBUILD vice-2.4.16-r1.ebuild 3714 SHA256 b697d5d5bf0642c99a0e398001ec82946f3e60e89440216a49fd1af0bba11a5b SHA512 25f7eb1858ab2f7c571f40d451e9cc955ca193fac4abb53cd0cd1607aa8fabed1de7204f58bf2e9a13d6081b00089c023e6069a79cfa0949dc43cb43ac0cb3d1 WHIRLPOOL 33e5668d5ba70ae6d9dc724f9ef0fb74ddd328d3cb8fc6b36c3c510e08894285eae39dbf37218b4f73299f5a5b2d723dc9a3525a5d5058845d49cc288d32b2af
+EBUILD vice-2.4.20.ebuild 4131 SHA256 848397e79fbda4a954a12799ce741d1529ebcb6c1db240e34c0a32f2645ffeaf SHA512 9639946ce5c9006a83ad4b3de9969af5e153c1e7f9fdb6ed9add2393bd2e0e7f0d2f99dfdcf62b744b5f0d49bdf891d515f06363b11f294954b7d7152334ffe2 WHIRLPOOL f6015979c365b6b318327121cc172ceaf372cc878b1219bf3b9b67f796378f874c61bfecaed75fd241ad89be981d7c62ed9275008cae900d37954afe63526a5e
 EBUILD vice-2.4.ebuild 3034 SHA256 f13eeb0f0e005c01706fabd03d0f7fa87da6fe6d3a4062d9a4df8cd09b89d7df SHA512 bdc3e192548a739636fb45db3fc84b9a94219e21518475fd667ad03cf1a547b51a569bd793b0289278183fbba07e4f7f143d7e343a000ee5733de76aaaa86f02 WHIRLPOOL 2acf927c307445a501ab6364f086d84ff0b1bb0247b586efc7c88b3535ec58f6dde298cc8ef2633327ec03baae41bb2e5cf1db41c49861819828fb1e27a71c6c
-MISC ChangeLog 13280 SHA256 f6885d2ef34cab7d2faec2a4e2c65d5bdded00e1e38fa1849626d4d207297c94 SHA512 b0b493a02d03a5e217506878d79844185fee14a6b7712dc1c2aa27ce19df0072bc488ea1946aba98fd3e7854689fa1df726dd9b69f20c93ffd2ee8a476e86847 WHIRLPOOL cbf9dfcb102ddae51535f26d73b7cfd7d27f8d11157389056d70c731687d88e200a3282fd460da9e9ae43907127550914315a04b53729314982829c145525f39
-MISC metadata.xml 567 SHA256 b6ed95d99dbba801fed1f2b96bf20539f1c488cebd9e1cdb00a7566e094d8d10 SHA512 570bc143c416c8287f1b29b217acd5b0bacee5f2d7c5f54abc13738bedfb626b3945586661affc25c2c4959101ba05a9abd0e8f6e4fefa2b99b78facfd41cc41 WHIRLPOOL 52e20e267c7aaef5da39d2341475848f810f4b7d9a703077f3134c511348ae5dbdf6ec8bb94480f93b12174eec2263a2e652a0878d9093d2356bce1a04c8e819
+MISC ChangeLog 13452 SHA256 a64122dd86d360615518a9852d27df9a9c31388a70c4b2eba1417e1d71c3ebff SHA512 9c6a618a2aae727e09cb723757f2e1f6c7b48f58b9f517e5c018bbd47cb0a0404b83b39453e7538b5654e45fd64425ea94f6c631d24b9e84675d8ee36b56d279 WHIRLPOOL ca69532632d82f454f20c20033bab7517096db26cc79cc7b1b219729ef396580371dd555d4614964e4a0e198f0b74f0dda3f37d981c75306275c8c3ad83c2ac6
+MISC metadata.xml 717 SHA256 0e1121621aff2d521e71b6161f29ab42892604ecd2422358de31f32168064a59 SHA512 7b6b0888968258783c7d6cdce580d5a751001970ea363910201c9a0fe351ef02c328153f8804765664f541dc6a5344165421a177093737c35f74110592c96ba4 WHIRLPOOL a2a56a5ccf1a20e6b3e3546caa067f9b291d4d1b2d9711e65db30557d9a9ae9f5158f65680b7371e8cb0064675db36ea27708b1666feb7cdd371ef303d83d02b
diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.20-autotools.patch
new file mode 100644
index 000000000000..7bebd2800ef6
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 89baadf5a73b..750e54de76ed 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -3,10 +3,12 @@
 <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="fullscreen">Enable the ability to run fullscreen</flag>
+	<flag name="gtk2">Use GTK+2 for GUI instead of GTK+3</flag>
+	<flag name="gtk3">Use GTK+3for GUI  instead of GTK+2</flag>
 	<flag name='memmap'>Enable extra monitor features</flag>
+	<flag name='sdlsound'>Use <pkg>media-libs/libsdl</pkg> for sound support</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>
diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild
new file mode 100644
index 000000000000..8af1c57b4672
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -0,0 +1,168 @@
+# 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.20.ebuild,v 1.1 2015/06/03 05:41:15 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 gtk2 +gtk3 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.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,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline
+	)
+	gtk2? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.90 )
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk2? ( !gtk3? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) ) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk2? ( !gtk3? (
+			x11-libs/libICE
+			x11-libs/libSM
+		) )
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	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 || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	if use gtk2 || use gtk3 ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk2 gnomeui)"
+	gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}