remove old

(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)

11 files changed, 9 insertions, 420 deletions

diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index ec51c0a8736e..c03facd87dfb 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.23 2008/10/06 20:33:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.24 2008/10/06 21:38:15 aballier Exp $
+
+  06 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/cxfe-0.9.1-asneeded.patch, -files/gcc-2.95-fix.patch,
+  -files/Makefile-fix.patch, -files/black-background.patch,
+  -files/disable-dpms.patch, -files/max-osd-fix.patch,
+  -files/position-osd.patch, -files/xv-default.patch, -cxfe-0.9.1.ebuild,
+  -cxfe-0.9.1-r2.ebuild:
+  remove old
 
   06 Oct 2008; Markus Meier <maekke@gentoo.org> cxfe-0.9.2.ebuild:
   amd64/x86 stable, bug #239677
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
deleted file mode 100644
index 46c63c260376..000000000000
--- a/media-video/cxfe/cxfe-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,46 +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/cxfe/cxfe-0.9.1-r2.ebuild,v 1.5 2007/07/22 08:54:59 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="A command line interface for xine."
-HOMEPAGE="http://www.rtwnetwork.com/cxfe/"
-
-SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="lirc"
-
-RDEPEND=">=media-libs/xine-lib-1_rc1
-	   x11-libs/libX11
-	   x11-libs/libXext
-	   lirc? ( app-misc/lirc )
-	   sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	   x11-libs/libX11
-	   x11-libs/libXext"
-
-src_unpack() {
-	unpack ${A}
-	mv cxfe ${P}
-	cd ${P}
-	epatch "${FILESDIR}/gcc-2.95-fix.patch"
-	epatch "${FILESDIR}/max-osd-fix.patch"
-	epatch "${FILESDIR}/xv-default.patch"
-	epatch "${FILESDIR}/disable-dpms.patch"
-	epatch "${FILESDIR}/position-osd.patch"
-	epatch "${FILESDIR}/black-background.patch"
-
-	# add missing space, see #82684
-	sed -i -e 's/\-lXext\@LDFLAGS/\-lXext \@LDFLAGS/' Makefile.in
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-}
-
-src_install() {
-	dobin cxfe
-	dodoc README TODO lircrc-example
-}
diff --git a/media-video/cxfe/cxfe-0.9.1.ebuild b/media-video/cxfe/cxfe-0.9.1.ebuild
deleted file mode 100644
index 28ffa17a3977..000000000000
--- a/media-video/cxfe/cxfe-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +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/cxfe/cxfe-0.9.1.ebuild,v 1.6 2007/11/27 11:59:57 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="A command line interface for xine."
-HOMEPAGE="http://www.rtwnetwork.com/cxfe/"
-
-SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="lirc"
-
-RDEPEND=">=media-libs/xine-lib-1_rc1
-	   x11-libs/libX11
-	   x11-libs/libXext
-	   lirc? ( app-misc/lirc )
-	   sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	   x11-libs/libX11
-	   x11-libs/libXext"
-src_unpack() {
-	unpack ${A}
-	mv cxfe ${P}
-	cd ${P}
-	epatch "${FILESDIR}"/gcc-2.95-fix.patch
-	epatch "${FILESDIR}"/max-osd-fix.patch
-	epatch "${FILESDIR}"/xv-default.patch
-}
-
-src_install() {
-	dobin cxfe
-	dodoc README TODO lircrc-example
-}
diff --git a/media-video/cxfe/files/Makefile-fix.patch b/media-video/cxfe/files/Makefile-fix.patch
deleted file mode 100644
index a1d97a50ae1a..000000000000
--- a/media-video/cxfe/files/Makefile-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- Makefile.in	2004-08-15 01:11:43.000000000 +0200
-+++ ../cxfe-edited/Makefile.in	2004-09-25 10:56:21.820612240 +0200
-@@ -1,7 +1,7 @@
- SHELL = /bin/sh
- VPATH = @srcdir@
- 
--subdirs = @subdirs@
-+subdirs = .
- top_srcdir = @top_srcdir@
- srcdir = @srcdir@
- prefix = @prefix@
-@@ -13,9 +13,9 @@
- 
- CC = @CC@ -Wall
- CPPFLAGS = @CPPFLAGS@
--CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags`
-+CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags` -I/usr/X11R6/include
- LIBS = @LIBS@
--LDFLAGS = `xine-config --libs` @LDFLAGS@ -lX11 @LIBS@ 
-+LDFLAGS = `xine-config --libs` -L/usr/X11R6/lib -lX11 -lXext @LDFLAGS@ @LIBS@ 
- INSTALL = @INSTALL@
- 
- #CC=gcc -Wall -g -O2
-@@ -29,15 +29,20 @@
- cxfe: cxfe.o termio/getch2.o
- 
- clean:
--	rm cxfe.o cxfe termio/*.o
-+	@if test -f cxfe.o ; then rm cxfe.o ; fi
-+	@if test -f cxfe ; then rm cxfe termio/*.o ; fi
-+	@if test -f termio/getch2.o ; then rm cxfe termio/*.o ; fi
- 
- install:
--	cp cxfe $(bindir)/cxfe
--	chmod 755 $(bindir)/cxfe
--        if test ! -d $(prefix)/share/cxfe ; then mkdir -p $(prefix)/share/cxfe ; 
--fi
--	cp lircrc-example $(prefix)/share/cxfe/lircrc
-+	@echo "Installing cxfe to:" $(bindir)/cxfe
-+	@chmod +x cxfe
-+	@cp cxfe $(bindir)/cxfe
-+	@if test ! -d $(prefix)/share/cxfe ; \
-+	then mkdir -p $(prefix)/share/cxfe ; \
-+	fi
-+	@echo "Installing lirc example to:" $(prefix)/share/cxfe/lircrc
-+	@cp lircrc-example $(prefix)/share/cxfe/lircrc
- 
- uninstall:
--	rm -f $(bindir)/cxfe
--	rm -Rf $(prefix)/share/cxfe
-+	@rm -f $(bindir)/cxfe
-+	@rm -Rf $(prefix)/share/cxfe
diff --git a/media-video/cxfe/files/black-background.patch b/media-video/cxfe/files/black-background.patch
deleted file mode 100644
index d44e33a69580..000000000000
--- a/media-video/cxfe/files/black-background.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-mod/cxfe.c	2005-07-26 00:39:31.000000000 +0200
-@@ -1111,11 +1111,16 @@
- 
-      XLockDisplay(display);
-      window[0] = XCreateSimpleWindow(display, XDefaultRootWindow(display),
--				  xpos, ypos, width, height, 1, 0, 0);
-+				     xpos, ypos, width, height, 1, 
-+				     BlackPixel(display,0), 
-+				     BlackPixel(display,0));
- 
-      window[1] = XCreateSimpleWindow(display, XDefaultRootWindow(display),
--				  0, 0, (DisplayWidth(display, screen)),
--				  (DisplayHeight(display, screen)), 0, 0, 0);
-+				     0, 0, (DisplayWidth(display, screen)),
-+				     (DisplayHeight(display, screen)), 0, 
-+				     BlackPixel(display,0), 
-+				     BlackPixel(display,0));
-+
- 
-      XSelectInput(display, window[0], INPUT_MOTION);
- 
diff --git a/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch b/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch
deleted file mode 100644
index 3e357dcd3e35..000000000000
--- a/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2007-01-30 20:14:10.000000000 +0100
-+++ Makefile.in	2007-01-30 20:14:16.000000000 +0100
-@@ -14,7 +14,7 @@
- CC = @CC@ -Wall
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags`
--LIBS = @LIBS@
-+LDLIBS = @LIBS@
- LDFLAGS = `xine-config --libs` -L/usr/X11R6/lib -lXext @LDFLAGS@ @LIBS@ -lX11 
- INSTALL = @INSTALL@
- 
diff --git a/media-video/cxfe/files/disable-dpms.patch b/media-video/cxfe/files/disable-dpms.patch
deleted file mode 100644
index e9a8bcde5ef5..000000000000
--- a/media-video/cxfe/files/disable-dpms.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Common subdirectories: cxfe/CVS and cxfe-mod/CVS
-diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
---- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-mod/cxfe.c	2005-01-15 06:40:05.724443072 +0100
-@@ -103,8 +103,57 @@
-   uint32_t  status;
- } MWMHints;
- 
-+static int dpms_disabled=0;
-+static int timeout_save=0;
- 
-+void wsScreenSaverOn( Display *mDisplay )
-+{
-+ int nothing;
-+ if ( dpms_disabled )
-+  {
-+   if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
-+    {
-+     if ( !DPMSEnable( mDisplay ) ) printf("DPMS restoring failed.\n"); // restoring power saving settings
-+      else
-+       {
-+        // DPMS does not seem to be enabled unless we call DPMSInfo
-+        BOOL onoff;
-+        CARD16 state;
-+        DPMSInfo( mDisplay,&state,&onoff );
-+        if ( onoff ) printf("Successfully enabled DPMS.\n");
-+         else printf("DPMS not enabled.\n");
-+       }
-+    }
-+  }
-+ if ( timeout_save )
-+  {
-+   int dummy, interval, prefer_blank, allow_exp;
-+   XGetScreenSaver( mDisplay,&dummy,&interval,&prefer_blank,&allow_exp );
-+   XSetScreenSaver( mDisplay,timeout_save,interval,prefer_blank,allow_exp );
-+   XGetScreenSaver( mDisplay,&timeout_save,&interval,&prefer_blank,&allow_exp );
-+  }
-+}
- 
-+void wsScreenSaverOff( Display * mDisplay )
-+{
-+ int interval,prefer_blank,allow_exp,nothing;
-+ if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
-+  {
-+   BOOL onoff;
-+   CARD16 state;
-+   DPMSInfo( mDisplay,&state,&onoff );
-+   if ( onoff )
-+    {
-+      Status stat;
-+      printf("Disabling DPMS.\n");
-+      dpms_disabled=1;
-+      stat=DPMSDisable( mDisplay );  // monitor powersave off
-+      //mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"stat: %d.\n",stat );
-+   }
-+  }
-+ XGetScreenSaver( mDisplay,&timeout_save,&interval,&prefer_blank,&allow_exp );
-+ if ( timeout_save ) XSetScreenSaver( mDisplay,0,interval,prefer_blank,allow_exp ); // turning off screensaver
-+}
- 
- static void *osd_loop(void *dummy)
- {
-@@ -755,6 +804,10 @@
- 	       XLockDisplay(display);
- 	       XUnmapWindow(display, window[fullscreen]);
- 	       fullscreen = !fullscreen;
-+	       if (fullscreen)
-+		 wsScreenSaverOff(display);
-+	       else
-+		 wsScreenSaverOn(display);
- 	       XMapRaised(display, window[fullscreen]);
- 	       XSync(display, False);
- 	       XTranslateCoordinates(display, window[fullscreen],
-@@ -920,6 +973,7 @@
-          }     
-    }
- }
-+
- char* makestring(char *string, int len)
- {
-    int i;
-@@ -1134,6 +1188,9 @@
-     else
-        completion_event = -1;
- 
-+    if (fullscreen)
-+      wsScreenSaverOff(display);
-+
-     XMapRaised(display, window[fullscreen]);
- 
-     res_h = (DisplayWidth(display, screen) * 1000 / DisplayWidthMM(display, screen));
-@@ -1293,6 +1350,7 @@
-   
-   if (x11) {
-      XLockDisplay(display);
-+     wsScreenSaverOn(display);
-      XUnmapWindow(display,  window[fullscreen]);
-      XDestroyWindow(display,  window[0]);
-      XDestroyWindow(display,  window[1]);
-diff -uN cxfe/main.h cxfe-mod/main.h
---- cxfe/main.h	2004-11-27 02:32:28.000000000 +0100
-+++ cxfe-mod/main.h	2005-01-15 06:40:29.770787472 +0100
-@@ -43,6 +43,7 @@
- #include <X11/Xatom.h>
- #include <X11/Xutil.h>
- #include <X11/extensions/XShm.h>
-+#include <X11/extensions/dpms.h>
- #include <xine.h>
- #include <xine/xineutils.h>
- 
-Common subdirectories: cxfe/termio and cxfe-mod/termio
diff --git a/media-video/cxfe/files/gcc-2.95-fix.patch b/media-video/cxfe/files/gcc-2.95-fix.patch
deleted file mode 100644
index 4f8b7f934490..000000000000
--- a/media-video/cxfe/files/gcc-2.95-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-0.91/cxfe.c	2004-11-30 11:32:48.230792288 +0100
-@@ -955,6 +955,9 @@
-   static            pthread_t lirc_thread;
-   static	    pthread_t osd_thread;
-   int               err;
-+  int dvd_mrl = 0;
-+  int vcd_mrl = 0;
-+  int cd_mrl = 0;
-   /* default values */
-   fullscreen = 0;
-   
-@@ -1075,10 +1078,6 @@
-   xine_init(cxfe.xine);
-   
-     // check which mrl types was specified:
--  int dvd_mrl = 0;
--  int vcd_mrl = 0;
--  int cd_mrl = 0;
--  
-   for(i = 0; i < m; i++){
-      if (strstr(mrl[i], "dvd:"))
-        dvd_mrl = 1;
diff --git a/media-video/cxfe/files/max-osd-fix.patch b/media-video/cxfe/files/max-osd-fix.patch
deleted file mode 100644
index 92847a9a4d09..000000000000
--- a/media-video/cxfe/files/max-osd-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-max-osd.c	2004-12-11 18:22:29.171711112 +0100
-@@ -125,11 +125,22 @@
- //  if(fbxine.osd.enabled) {
-     va_list   args;
-     char     *buf;
--    int       n, size = 100;
-+    int       n, size = 47;
-     
-     if((buf = xine_xmalloc(size)) == NULL) 
-       return;
-     
-+    va_start(args, info);
-+    n = vsnprintf(buf, size, info, args);
-+    va_end(args);
-+
-+    buf = realloc(buf, size+3);
-+    buf[size-1] = '.';
-+    buf[size] = '.';
-+    buf[size+1] = '.';
-+    buf[size+2] = '\0';
-+
-+#if 0
-     while(1) {
-       
-       va_start(args, info);
-@@ -147,6 +158,7 @@
-       if((buf = realloc(buf, size)) == NULL)
- 	return;
-     }
-+#endif
- 
-     xine_osd_clear(osd);
- 
diff --git a/media-video/cxfe/files/position-osd.patch b/media-video/cxfe/files/position-osd.patch
deleted file mode 100644
index 2d04a38c14cd..000000000000
--- a/media-video/cxfe/files/position-osd.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-mod/cxfe.c	2005-03-01 23:37:18.394875952 +0100
-@@ -476,6 +476,28 @@
-    percent_done = (ltime/llength)*100;
-    printf("Time:%d sec Length:%d sec \n",ltime/1000,llength/1000);
- }
-+static void print_osd_status()
-+{
-+   int	     lpos, ltime, llength;
-+   int	     percent_done;
-+   
-+   
-+   (void)get_pos_length(cxfe.stream, &lpos, &ltime, &llength);
-+
-+   percent_done = (int)(((double)ltime/(double)llength)*100);
-+
-+   int cur_hour = ltime/1000/60/60;
-+   int cur_min = (ltime/1000-cur_hour*60*60)/60;
-+   int cur_sec= ltime/1000-cur_hour*60*60-cur_min*60;
-+
-+   int tot_hour = llength/1000/60/60;
-+   int tot_min = (llength/1000-tot_hour*60*60)/60;
-+   int tot_sec= llength/1000-tot_hour*60*60-tot_min*60;
-+   
-+   osd_display_info("%02d:%02d:%02d / %02d:%02d:%02d (%2d%%)", cur_hour, 
-+		    cur_min, cur_sec, tot_hour, tot_min, tot_sec, 
-+		    percent_done);
-+}
- #ifdef HAVE_LIBLIRC_CLIENT
- static void *process_lirc_thread()
- {
-@@ -518,6 +540,8 @@
-                 if (!strcmp(c,"Quit")){
-                     running = 0;
-                     next_mrl = FALSE;}
-+		if (!strcmp(c,"STATUS"))
-+		    print_osd_status();
- 		if (!strcmp(c,"ASPECT_CHANGE"))
- 		    aspect_change();
- 		if (!strcmp(c,"Menu"))
-@@ -679,6 +703,10 @@
- 	case 'D':
- 	        toggle_deinterlace();
- 		break;
-+	case 'o':
-+	case 'O':
-+	        print_osd_status();
-+		break;
-         case 'l':
-         case 13:
-            	send_event(XINE_EVENT_INPUT_SELECT);
-@@ -864,6 +892,10 @@
-            case XK_M:
-              send_event(XINE_EVENT_INPUT_DOWN);
-              break;
-+	   case XK_o:
-+	   case XK_O:
-+	     print_osd_status();
-+	     break;
-            case XK_Return:
-              send_event(XINE_EVENT_INPUT_SELECT);
-              break;
diff --git a/media-video/cxfe/files/xv-default.patch b/media-video/cxfe/files/xv-default.patch
deleted file mode 100644
index a42bad2ca66f..000000000000
--- a/media-video/cxfe/files/xv-default.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe.c	2005-01-13 11:52:28.346389672 +0100
-@@ -938,7 +938,7 @@
-   char              configfile[2048];
-   x11_visual_t      vis;
-   double            res_h, res_v;
--  char             *vo_driver = "auto";
-+  char             *vo_driver = "xv";
-   char             *ao_driver = "auto";
-   char             *mrl[1000];
-   char             *cda_param = "input.cdda_device";
-@@ -960,7 +960,7 @@
-   
-   
-   if(argc <= 1) {
--    printf("Please specify at minimum a video driver and an mrl\n");
-+    printf("Please specify a mrl\n");
-     printf("For help enter cxfe --help\n");
-     return 1;
-   }