old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 5 insertions, 179 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index 9943c841be95..88c770fb65dc 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.95 2014/08/09 12:09:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.96 2014/10/04 01:29:56 mr_bones_ Exp $
+
+  04 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/vice-2.3-libav.patch, -files/vice-2.3-notexi.patch, -vice-2.3.ebuild:
+  old
 
   09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> vice-2.4.ebuild:
   Stable for ppc, wrt bug #416211
diff --git a/app-emulation/vice/files/vice-2.3-libav.patch b/app-emulation/vice/files/vice-2.3-libav.patch
deleted file mode 100644
index 6d8f7dac7962..000000000000
--- a/app-emulation/vice/files/vice-2.3-libav.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/gfxoutputdrv/ffmpegdrv.c
-+++ src/gfxoutputdrv/ffmpegdrv.c
-@@ -342,7 +342,7 @@
- 
-     c = st->codec;
-     c->codec_id = ffmpegdrv_fmt->audio_codec;
--    c->codec_type = CODEC_TYPE_AUDIO;
-+    c->codec_type = AVMEDIA_TYPE_AUDIO;
-     c->sample_fmt = SAMPLE_FMT_S16;
- 
-     /* put sample parameters */
-@@ -370,7 +370,7 @@
-         pkt.size = (*ffmpeglib.p_avcodec_encode_audio)(c, 
-                         audio_outbuf, audio_outbuf_size, audio_in->buffer);
-         pkt.pts = c->coded_frame->pts;
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.stream_index = audio_st->index;
-         pkt.data = audio_outbuf;
- 
-@@ -559,7 +559,7 @@
- 
-     c = st->codec;
-     c->codec_id = ffmpegdrv_fmt->video_codec;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
- 
-     /* put sample parameters */
-     c->bit_rate = video_bitrate;
-@@ -819,7 +819,7 @@
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-         AVPacket pkt;
-         (*ffmpeglib.p_av_init_packet)(&pkt);
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.stream_index = video_st->index;
-         pkt.data = (uint8_t*)picture;
-         pkt.size = sizeof(AVPicture);
-@@ -840,7 +840,7 @@
-             (*ffmpeglib.p_av_init_packet)(&pkt);
-             pkt.pts = c->coded_frame->pts;
-             if (c->coded_frame->key_frame)
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-             pkt.stream_index = video_st->index;
-             pkt.data = video_outbuf;
-             pkt.size = out_size;
diff --git a/app-emulation/vice/files/vice-2.3-notexi.patch b/app-emulation/vice/files/vice-2.3-notexi.patch
deleted file mode 100644
index 5f3b9c6de0e3..000000000000
--- a/app-emulation/vice/files/vice-2.3-notexi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -48,14 +48,7 @@
- $(srcdir)/vice.txt:	vice.texi
- 	$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
- 
--if BUILD_PDF
--$(srcdir)/vice.pdf:	vice.texi
--	$(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
--
--PDF_DEPS=$(srcdir)/vice.pdf
--else
- PDF_DEPS=
--endif
- 
- if BUILD_AMIGAGUIDE
- $(srcdir)/vice.guide:	vice.texi
diff --git a/app-emulation/vice/vice-2.3.ebuild b/app-emulation/vice/vice-2.3.ebuild
deleted file mode 100644
index f223eac87b29..000000000000
--- a/app-emulation/vice/vice-2.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.8 2012/10/28 16:57:30 hwoarang Exp $
-
-EAPI=2
-inherit autotools eutils games toolchain-funcs
-
-DESCRIPTION="The Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="Xaw3d alsa gnome nls png readline sdl ipv6 memmap ethernet oss zlib X gif jpeg xv dga xrandr ffmpeg lame pulseaudio"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	x11-apps/xset
-	Xaw3d? ( x11-libs/libXaw3d )
-	!Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
-	alsa? ( media-libs/alsa-lib )
-	gnome? (
-		x11-libs/gtk+:2
-		dev-libs/atk
-		x11-libs/pango
-	)
-	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1
-	)
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )
-	sdl? ( media-libs/libsdl )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	xv? ( x11-libs/libXv )
-	dga? ( x11-libs/libXxf86dga )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-apps/bdftopcf
-	x11-apps/mkfontdir
-	x11-proto/xproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	dga? ( x11-proto/xf86dgaproto )
-	xv? ( x11-proto/videoproto )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-notexi.patch \
-		"${FILESDIR}"/${P}-libav.patch
-	sed -i \
-		-e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \
-		man/vice.1 \
-		$(grep -rl /usr/local/lib doc) \
-		|| die "sed failed"
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"${GAMES_DATADIR}/${PN}\";:" \
-		configure.in \
-		|| die "sed failed"
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"${GAMES_DATADIR}/${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() {
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	egamesconf \
-		--disable-dependency-tracking \
-		--enable-fullscreen \
-		--enable-parsid \
-		--with-resid \
-		--without-arts \
-		--without-midas \
-		$(use_enable ffmpeg) \
-		$(use_enable lame) \
-		$(use_enable gnome gnomeui) \
-		$(use_enable nls) \
-		$(use_with Xaw3d xaw3d) \
-		$(use_with alsa) \
-		$(use_with pulseaudio pulse) \
-		$(use_with png) \
-		$(use_with readline) \
-		$(use_with sdl sdlsound) \
-		$(use_enable ipv6) \
-		$(use oss || echo --without-oss) \
-		$(use_enable memmap) \
-		$(use_enable ethernet) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog FEEDBACK README
-	prepgamesdirs
-}