old

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

9 files changed, 8 insertions, 293 deletions

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index 5c79f27e6a69..db516f79ad45 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/alevt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.32 2011/10/04 21:34:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.33 2011/10/23 20:19:53 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -alevt-1.6.1-r1.ebuild,
+  -alevt-1.6.1-r3.ebuild, -alevt-1.6.1-r4.ebuild,
+  -files/alevt-1.6.1-gcc4.patch, -files/alevt-1.6.1-gentoo.diff,
+  -files/alevt-1.6.1-respectflags.patch, -files/alevt-1.6.1-v4l2.patch,
+  -files/alevt-1.6.1-vbi.patch:
+  old
 
   04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> alevt-1.6.2.ebuild:
   x86 stable wrt bug #385199
diff --git a/media-video/alevt/alevt-1.6.1-r1.ebuild b/media-video/alevt/alevt-1.6.1-r1.ebuild
deleted file mode 100644
index 898d0f44a07b..000000000000
--- a/media-video/alevt/alevt-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r1.ebuild,v 1.6 2007/11/27 11:58:57 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Teletext viewer for X11"
-HOMEPAGE="http://www.goron.de/~froese/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz
-	 http://fresh.t-systems-sfr.com/linux/src/${P}.tar.gz
-	 http://www.baycom.org/~tom/${PN}-dvb.patch"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	>=media-libs/libpng-1.0.12"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:^OPT=.*:OPT = ${CFLAGS} -s:" Makefile
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${DISTDIR}"/${PN}-dvb.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin alevt alevt-cap alevt-date
-	doman alevt.1x alevt-date.1 alevt-cap.1
-	dodoc CHANGELOG COPYRIGHT README
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins contrib/mini-alevt.xpm alevt.xpm
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins contrib/icon48x48.xpm alevt.xpm
-
-	make_desktop_entry alevt "AleVT" alevt
-}
diff --git a/media-video/alevt/alevt-1.6.1-r3.ebuild b/media-video/alevt/alevt-1.6.1-r3.ebuild
deleted file mode 100644
index 99c63390b8ff..000000000000
--- a/media-video/alevt/alevt-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r3.ebuild,v 1.5 2007/11/27 11:58:57 zzam Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Teletext viewer for X11"
-HOMEPAGE="http://www.goron.de/~froese/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz
-	 http://fresh.t-systems-sfr.com/linux/src/${P}.tar.gz
-	 http://www.baycom.org/~tom/${PN}-dvb.patch"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="x11-libs/libX11
-	>=media-libs/libpng-1.0.12"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${DISTDIR}/${PN}-dvb.patch"
-	epatch "${FILESDIR}/${P}-v4l2.patch"
-	epatch "${FILESDIR}/${P}-respectflags.patch"
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin alevt alevt-cap alevt-date
-	doman alevt.1x alevt-date.1 alevt-cap.1
-	dodoc CHANGELOG COPYRIGHT README
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins contrib/mini-alevt.xpm alevt.xpm
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins contrib/icon48x48.xpm alevt.xpm
-
-	make_desktop_entry alevt "AleVT" alevt
-}
diff --git a/media-video/alevt/alevt-1.6.1-r4.ebuild b/media-video/alevt/alevt-1.6.1-r4.ebuild
deleted file mode 100644
index d3485460eeaf..000000000000
--- a/media-video/alevt/alevt-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r4.ebuild,v 1.4 2007/07/22 08:59:12 dberkholz Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Teletext viewer for X11"
-HOMEPAGE="http://www.goron.de/~froese/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz
-	 http://fresh.t-systems-sfr.com/linux/src/${P}.tar.gz
-	 http://www.baycom.org/~tom/${PN}-dvb.patch"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	>=media-libs/libpng-1.0.12"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${DISTDIR}/${PN}-dvb.patch"
-	epatch "${FILESDIR}/${P}-v4l2.patch"
-	epatch "${FILESDIR}/${P}-respectflags.patch"
-	epatch "${FILESDIR}/${P}-vbi.patch"
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin alevt alevt-cap alevt-date
-	doman alevt.1x alevt-date.1 alevt-cap.1
-	dodoc CHANGELOG COPYRIGHT README
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins contrib/mini-alevt.xpm alevt.xpm
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins contrib/icon48x48.xpm alevt.xpm
-
-	make_desktop_entry alevt "AleVT" alevt
-}
diff --git a/media-video/alevt/files/alevt-1.6.1-gcc4.patch b/media-video/alevt/files/alevt-1.6.1-gcc4.patch
deleted file mode 100644
index 868ba36f2f50..000000000000
--- a/media-video/alevt/files/alevt-1.6.1-gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur alevt-1.6.1/xio.c alevt-1.6.1-gcc4/xio.c
---- alevt-1.6.1/xio.c	2002-08-20 05:09:38.000000000 +0200
-+++ alevt-1.6.1-gcc4/xio.c	2005-07-28 15:08:53.281978632 +0200
-@@ -31,11 +31,12 @@
- 
- static struct dl_head dpys[1];		/* list of all displays */
- 
-+static void xio_timer();
-+static void handle_event();
- 
- static int
- timer_init(int argc, char **argv)
- {
--    static void xio_timer();
-     int p[2], timer_pid, i;
- 
-     if (pipe(p) == -1)
-@@ -160,7 +161,6 @@
- xio_open_dpy(char *dpy, int argc, char **argv)
- {
-     XClassHint classhint[1];
--    static void handle_event(); //forward ref
-     struct xio *xio;
- 
-     if (local_init(argc, argv) == -1)
diff --git a/media-video/alevt/files/alevt-1.6.1-gentoo.diff b/media-video/alevt/files/alevt-1.6.1-gentoo.diff
deleted file mode 100644
index bea603a9c251..000000000000
--- a/media-video/alevt/files/alevt-1.6.1-gentoo.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru alevt-1.6.0.orig/main.c alevt-1.6.0/main.c
---- alevt-1.6.0.orig/main.c	Sat Sep 16 23:34:18 2000
-+++ alevt-1.6.0/main.c	Wed Apr 10 23:09:40 2002
-@@ -15,7 +15,7 @@
- /* current args for next start() */
- static char *geometry;
- static char *dpy_name;
--static char *vbi_name = "/dev/vbi";
-+static char *vbi_name = "/dev/v4l/vbi0";
- static struct xio *xio;
- static struct vbi *vbi;
- static int fine_tune = 1; // auto = 999;
-@@ -32,7 +32,7 @@
- 	    "  Valid options:\t\tDefault:\n"
- 	    "    --help\n"
- 	    "    --version\n"
--	    "    -vbi <vbidev>\t\t/dev/vbi\n"
-+	    "    -vbi <vbidev>\t\t/dev/v4l/vbi0\n"
- 	    "    -display <dpy>\t\t$DISPLAY\n"
- 	    "    -geometry <geo>\t\t41x25\n"
- 	    "    -finetune <-4..4|auto>\t0\n"
diff --git a/media-video/alevt/files/alevt-1.6.1-respectflags.patch b/media-video/alevt/files/alevt-1.6.1-respectflags.patch
deleted file mode 100644
index d8eafe504863..000000000000
--- a/media-video/alevt/files/alevt-1.6.1-respectflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: alevt-1.6.1/Makefile
-===================================================================
---- alevt-1.6.1.orig/Makefile
-+++ alevt-1.6.1/Makefile
-@@ -1,12 +1,11 @@
- VER=1.6.1
--OPT=-O2 -s
- #OPT=-O -g
- DEFS=-DWITH_PNG
- FONT=vtxt
- # a smaller and thinner font
- #FONT=neep9
- 
--CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
-+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS)
- 
- EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
- OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
-@@ -21,13 +20,13 @@ all: alevt alevt-date alevt-cap alevt.1x
- 	sync
- 
- alevt: $(OBJS)
--	$(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
-+	$(CC) $(LDFLAGS) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
- 
- alevt-date: $(TOBJS)
--	$(CC) $(OPT) $(TOBJS) -o alevt-date
-+	$(CC) $(LDFLAGS) $(OPT) $(TOBJS) -o alevt-date
- 
- alevt-cap: $(COBJS)
--	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
-+	$(CC) $(LDFLAGS) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
- 
- font.o: font1.xbm font2.xbm
- fontsize.h: font1.xbm font2.xbm
-@@ -40,7 +39,7 @@ font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
- 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
- 
- bdf2xbm: bdf2xbm.c
--	$(CC) -O -s bdf2xbm.c -o bdf2xbm
-+	$(CC) $(CFLAGS) $(LDFLAGS) bdf2xbm.c -o bdf2xbm
- 
- alevt.1x: alevt.1x.in
- 	sed s/VERSION/$(VER)/g <alevt.1x.in >alevt.1x
diff --git a/media-video/alevt/files/alevt-1.6.1-v4l2.patch b/media-video/alevt/files/alevt-1.6.1-v4l2.patch
deleted file mode 100644
index 04ca4f28ed49..000000000000
--- a/media-video/alevt/files/alevt-1.6.1-v4l2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru alevt-1.6.1/vbi.c alevt/vbi.c
---- alevt-1.6.1/vbi.c	2001-03-03 19:14:03.000000000 +0100
-+++ alevt/vbi.c	2005-08-09 00:32:22.000000000 +0200
-@@ -41,15 +41,17 @@
- struct v4l2_format
- {
-     u32	type;			/* V4L2_BUF_TYPE_* */
-+
-     union
-     {
-+        double dummy_to_force_correct_64_bit_alignment;
- 	struct v4l2_vbi_format vbi;	/*  VBI data  */
- 	u8 raw_data[200];		/* user-defined */
-     } fmt;
- };
- 
- #define V4L2_VBI_SF_UBYTE	1
--#define V4L2_BUF_TYPE_VBI       0x00000009
-+#define V4L2_BUF_TYPE_VBI_CAPTURE       0x00000004
- #define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
- 
- /***** end of api definitions *****/
-@@ -468,7 +470,7 @@
-     int soc, eoc;	// start/end of clock run-in
-     int bpl;		// bytes per line
- 
--    if (p->sample_format != V4L2_VBI_SF_UBYTE)
-+    if (0 && p->sample_format != V4L2_VBI_SF_UBYTE)
-     {
- 	error("v4l2: unsupported vbi data format");
- 	return -1;
-@@ -526,8 +528,9 @@
-     struct v4l2_format v4l2_format[1];
-     struct v4l2_vbi_format *vbifmt = &v4l2_format->fmt.vbi;
- 
-+    v4l2_format[0].type = V4L2_BUF_TYPE_VBI_CAPTURE;
-     if (ioctl(vbi->fd, VIDIOC_G_FMT, v4l2_format) == -1
--	|| v4l2_format->type != V4L2_BUF_TYPE_VBI)
-+	|| v4l2_format->type != V4L2_BUF_TYPE_VBI_CAPTURE)
-     {
- 	// not a v4l2 device.  assume bttv and create a standard fmt-struct.
- 	int size;
diff --git a/media-video/alevt/files/alevt-1.6.1-vbi.patch b/media-video/alevt/files/alevt-1.6.1-vbi.patch
deleted file mode 100644
index 71a2e9752b91..000000000000
--- a/media-video/alevt/files/alevt-1.6.1-vbi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vbi.c	2001-03-03 19:14:03.000000000 +0100
-+++ vbi.c.new	2006-06-19 23:43:29.000000000 +0200
-@@ -555,6 +555,8 @@
- 	}
-     }
- 
-+    vbifmt->offset = 244;
-+
-     if (set_decode_parms(vbi, vbifmt) == -1)
- 	return -1;
-