remove old

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64)

7 files changed, 2 insertions, 994 deletions

diff --git a/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch b/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch
deleted file mode 100644
index 361994013a1c..000000000000
--- a/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.in.orig	2007-08-27 20:04:18.000000000 +0200
-+++ configure.in	2007-08-27 20:10:52.000000000 +0200
-@@ -189,26 +189,33 @@
-   AC_MSG_ERROR(Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu)
- fi
- 
--if $MPLAYER_PROG 2> /dev/null | grep -q "MPlayer dev-\(CVS\|SVN\)"; then
--  have_mplayer_dev=yes
--  MPLAYER_MAJOR_VERSION=99
--  MPLAYER_MINOR_VERSION=99
--  MPLAYER_PRE_VERSION=99
--  MPLAYER_RC_VERSION=99
--  AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)
--else
-+MPLAYER_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer"`
-+
-+if echo $MPLAYER_VERSION | grep -q "MPlayer [[0-1]]\.[[0-9]]\+\(\(rc\|pre\)[[0-9]]\+\)\?"; then
-   have_mplayer_dev=no
--  MPLAYER_MAJOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`
--  MPLAYER_MINOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'`
-+  MPLAYER_MAJOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`
-+  MPLAYER_MINOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'`
-   MPLAYER_PRE_VERSION=0
-   MPLAYER_RC_VERSION=0
- 
--  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
--    MPLAYER_PRE_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
-+  if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
-+    MPLAYER_PRE_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
-   fi
- 
--  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then
--    MPLAYER_RC_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'`
-+  if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then
-+    MPLAYER_RC_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'`
-+  fi
-+else
-+  if echo $MPLAYER_VERSION | grep -q "dev-\(CVS\|SVN\)" || \
-+     echo $MPLAYER_VERSION | grep -q "SVN-"; then
-+    have_mplayer_dev=yes
-+    MPLAYER_MAJOR_VERSION=99
-+    MPLAYER_MINOR_VERSION=99
-+    MPLAYER_PRE_VERSION=99
-+    MPLAYER_RC_VERSION=99
-+    AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)
-+  else
-+    AC_MSG_ERROR(Unable to determine the version number of mplayer or the version number you specified with --with-version-number is invalid.)
-   fi
- fi
- 
-@@ -315,7 +322,7 @@
- dnl **************************************************************
- 
- AC_MSG_CHECKING([for DTS support])
--if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^ffdts.*working.*$"; then
-+if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^\(ffdts\|ffdca\|dts\).*working.*$"; then
-   have_dts_support=yes
- else
-   have_dts_support=no
diff --git a/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch b/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch
deleted file mode 100644
index b1cfbfa90e3f..000000000000
--- a/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch
+++ /dev/null
@@ -1,595 +0,0 @@
-diff -Naur ogmrip-0.12.1.orig/libogmdvd/Makefile.am ogmrip-0.12.1/libogmdvd/Makefile.am
---- ogmrip-0.12.1.orig/libogmdvd/Makefile.am	2008-06-09 21:01:20.000000000 +0200
-+++ ogmrip-0.12.1/libogmdvd/Makefile.am	2008-07-15 21:00:11.000000000 +0200
-@@ -27,8 +27,10 @@
-   ogmdvd.h
- 
- libogmdvd_la_LDFLAGS = \
--  -version-info $(OGMDVD_LT_VERSION) \
--  $(DVDREAD_LIBS)
-+  -version-info $(OGMDVD_LT_VERSION)
-+
-+libogmdvd_la_LIBADD = \
-+  $(OGMRIP_LIBS) $(DVDREAD_LIBS)
- 
- libogmdvd_ladir = \
-   $(includedir)/ogmdvd
-diff -Naur ogmrip-0.12.1.orig/libogmdvd/Makefile.in ogmrip-0.12.1/libogmdvd/Makefile.in
---- ogmrip-0.12.1.orig/libogmdvd/Makefile.in	2008-07-14 21:14:24.000000000 +0200
-+++ ogmrip-0.12.1/libogmdvd/Makefile.in	2008-07-15 20:57:43.000000000 +0200
-@@ -57,7 +57,9 @@
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libogmdvd_ladir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libogmdvd_la_LIBADD =
-+am__DEPENDENCIES_1 =
-+libogmdvd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
- am_libogmdvd_la_OBJECTS = ogmdvd-audio.lo ogmdvd-contrib.lo \
- 	ogmdvd-disc.lo ogmdvd-labels.lo ogmdvd-parser.lo \
- 	ogmdvd-priv.lo ogmdvd-reader.lo ogmdvd-stream.lo \
-@@ -340,8 +342,10 @@
-   ogmdvd.h
- 
- libogmdvd_la_LDFLAGS = \
--  -version-info $(OGMDVD_LT_VERSION) \
--  $(DVDREAD_LIBS)
-+  -version-info $(OGMDVD_LT_VERSION)
-+
-+libogmdvd_la_LIBADD = \
-+  $(OGMRIP_LIBS) $(DVDREAD_LIBS)
- 
- libogmdvd_ladir = \
-   $(includedir)/ogmdvd
-diff -Naur ogmrip-0.12.1.orig/libogmjob/Makefile.am ogmrip-0.12.1/libogmjob/Makefile.am
---- ogmrip-0.12.1.orig/libogmjob/Makefile.am	2008-06-09 21:01:17.000000000 +0200
-+++ ogmrip-0.12.1/libogmjob/Makefile.am	2008-07-15 21:00:28.000000000 +0200
-@@ -34,6 +34,9 @@
- libogmjob_la_LDFLAGS = \
-   -version-info $(OGMJOB_LT_VERSION)
- 
-+libogmjob_la_LIBADD =\
-+  $(OGMRIP_LIBS)
-+
- ogmjob-marshal.h: ogmjob-marshal.list $(GLIB_GENMARSHAL)
- 	$(GLIB_GENMARSHAL) $< --header --prefix=ogmjob_cclosure_marshal > $@
- 
-diff -Naur ogmrip-0.12.1.orig/libogmjob/Makefile.in ogmrip-0.12.1/libogmjob/Makefile.in
---- ogmrip-0.12.1.orig/libogmjob/Makefile.in	2008-07-14 21:14:24.000000000 +0200
-+++ ogmrip-0.12.1/libogmjob/Makefile.in	2008-07-15 20:59:38.000000000 +0200
-@@ -57,7 +57,8 @@
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libogmjob_ladir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libogmjob_la_LIBADD =
-+am__DEPENDENCIES_1 =
-+libogmjob_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libogmjob_la_OBJECTS = ogmjob-bin.lo ogmjob-container.lo \
- 	ogmjob-exec.lo ogmjob-list.lo ogmjob-log.lo ogmjob-marshal.lo \
- 	ogmjob-pipeline.lo ogmjob-queue.lo ogmjob-spawn.lo
-@@ -346,6 +347,9 @@
- libogmjob_la_LDFLAGS = \
-   -version-info $(OGMJOB_LT_VERSION)
- 
-+libogmjob_la_LIBADD = \
-+  $(OGMRIP_LIBS)
-+
- @MAINTAINER_MODE_TRUE@DEBUG_CFLAGS = \
- @MAINTAINER_MODE_TRUE@  -DG_ENABLE_DEBUG
- 
-diff -Naur ogmrip-0.12.1.orig/libogmrip/Makefile.am ogmrip-0.12.1/libogmrip/Makefile.am
---- ogmrip-0.12.1.orig/libogmrip/Makefile.am	2008-06-09 21:00:20.000000000 +0200
-+++ ogmrip-0.12.1/libogmrip/Makefile.am	2008-07-15 21:00:21.000000000 +0200
-@@ -41,7 +41,8 @@
- 
- libogmrip_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
--  $(top_builddir)/libogmjob/libogmjob.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  $(OGMRIP_LIBS)
- 
- #
- # Common
-@@ -57,7 +58,7 @@
- libogmrip_mplayer_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmjob/libogmjob.la \
--  libogmrip.la
-+  libogmrip.la $(OGMRIP_LIBS)
- 
- libogmrip_mplayer_ladir = \
-   $(includedir)/ogmrip
-@@ -75,7 +76,8 @@
- libogmrip_lavc_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmjob/libogmjob.la \
--  libogmrip.la libogmrip-mplayer.la
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- 
- libogmrip_lavc_ladir = \
-   $(includedir)/ogmrip
-@@ -136,8 +138,8 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_theora_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la
- endif
- 
- if HAVE_X264_SUPPORT
-@@ -153,7 +155,7 @@
- 
- libogmrip_x264_la_LIBADD = \
-   libogmrip.la \
--  libogmrip-mplayer.la
-+  libogmrip-mplayer.la -lm
- endif
- 
- #
-@@ -200,8 +202,8 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_mp3_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la
- endif
- 
- if HAVE_VORBIS_SUPPORT
-@@ -216,8 +218,8 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_vorbis_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la
- endif
- 
- if HAVE_AAC_SUPPORT
-@@ -232,8 +234,8 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_aac_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la
- endif
- 
- #
-@@ -253,8 +255,9 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_vobsub_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- 
- if HAVE_SRT_SUPPORT
- subp_codecs_LTLIBRARIES += \
-@@ -268,8 +271,9 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_srt_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- endif
- 
- #
-@@ -304,7 +308,9 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_ogg_la_LIBADD = \
--  libogmrip.la
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-+  libogmrip.la \
-+  $(OGMRIP_LIBS)
- endif
- 
- if HAVE_MKV_SUPPORT
-@@ -319,7 +325,10 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_mkv_la_LIBADD = \
--  libogmrip.la
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la \
-+  $(OGMRIP_LIBS)
- endif
- 
- if HAVE_MP4_SUPPORT
-@@ -334,8 +343,9 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_mp4_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- endif
- 
- if HAVE_LAVF_SUPPORT
-diff -Naur ogmrip-0.12.1.orig/libogmrip/Makefile.in ogmrip-0.12.1/libogmrip/Makefile.in
---- ogmrip-0.12.1.orig/libogmrip/Makefile.in	2008-07-14 21:14:25.000000000 +0200
-+++ ogmrip-0.12.1/libogmrip/Makefile.in	2008-07-15 20:58:41.000000000 +0200
-@@ -106,8 +106,9 @@
- LTLIBRARIES = $(audio_codecs_LTLIBRARIES) $(containers_LTLIBRARIES) \
- 	$(lib_LTLIBRARIES) $(subp_codecs_LTLIBRARIES) \
- 	$(video_codecs_LTLIBRARIES)
--@HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_DEPENDENCIES = libogmrip.la \
--@HAVE_AAC_SUPPORT_TRUE@	libogmrip-mplayer.la
-+@HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_DEPENDENCIES =  \
-+@HAVE_AAC_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_AAC_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
- am__libogmrip_aac_la_SOURCES_DIST = ogmrip-aac.c
- @HAVE_AAC_SUPPORT_TRUE@am_libogmrip_aac_la_OBJECTS = ogmrip-aac.lo
- libogmrip_aac_la_OBJECTS = $(am_libogmrip_aac_la_OBJECTS)
-@@ -129,13 +130,17 @@
- 	$(am_libogmrip_lavc_mpeg4_la_OBJECTS)
- @HAVE_LAVC_SUPPORT_TRUE@am_libogmrip_lavc_mpeg4_la_rpath = -rpath \
- @HAVE_LAVC_SUPPORT_TRUE@	$(video_codecsdir)
-+am__DEPENDENCIES_1 =
- libogmrip_lavc_la_DEPENDENCIES =  \
- 	$(top_builddir)/libogmdvd/libogmdvd.la \
- 	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
--	libogmrip-mplayer.la
-+	libogmrip-mplayer.la $(am__DEPENDENCIES_1)
- am_libogmrip_lavc_la_OBJECTS = ogmrip-lavc.lo
- libogmrip_lavc_la_OBJECTS = $(am_libogmrip_lavc_la_OBJECTS)
--@HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_DEPENDENCIES = libogmrip.la
-+@HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_DEPENDENCIES =  \
-+@HAVE_MKV_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_MKV_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_MKV_SUPPORT_TRUE@	libogmrip.la $(am__DEPENDENCIES_1)
- am__libogmrip_mkv_la_SOURCES_DIST = ogmrip-mkv.c
- @HAVE_MKV_SUPPORT_TRUE@am_libogmrip_mkv_la_OBJECTS = ogmrip-mkv.lo
- libogmrip_mkv_la_OBJECTS = $(am_libogmrip_mkv_la_OBJECTS)
-@@ -148,15 +153,18 @@
- libogmrip_mov_la_OBJECTS = $(am_libogmrip_mov_la_OBJECTS)
- @HAVE_LAVF_SUPPORT_TRUE@am_libogmrip_mov_la_rpath = -rpath \
- @HAVE_LAVF_SUPPORT_TRUE@	$(containersdir)
--@HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_DEPENDENCIES = libogmrip.la \
--@HAVE_MP3_SUPPORT_TRUE@	libogmrip-mplayer.la
-+@HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_DEPENDENCIES =  \
-+@HAVE_MP3_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_MP3_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
- am__libogmrip_mp3_la_SOURCES_DIST = ogmrip-mp3.c
- @HAVE_MP3_SUPPORT_TRUE@am_libogmrip_mp3_la_OBJECTS = ogmrip-mp3.lo
- libogmrip_mp3_la_OBJECTS = $(am_libogmrip_mp3_la_OBJECTS)
- @HAVE_MP3_SUPPORT_TRUE@am_libogmrip_mp3_la_rpath = -rpath \
- @HAVE_MP3_SUPPORT_TRUE@	$(audio_codecsdir)
--@HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_DEPENDENCIES = libogmrip.la \
--@HAVE_MP4_SUPPORT_TRUE@	libogmrip-mplayer.la
-+@HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_DEPENDENCIES =  \
-+@HAVE_MP4_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_MP4_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la \
-+@HAVE_MP4_SUPPORT_TRUE@	$(am__DEPENDENCIES_1)
- am__libogmrip_mp4_la_SOURCES_DIST = ogmrip-mp4.c
- @HAVE_MP4_SUPPORT_TRUE@am_libogmrip_mp4_la_OBJECTS = ogmrip-mp4.lo
- libogmrip_mp4_la_OBJECTS = $(am_libogmrip_mp4_la_OBJECTS)
-@@ -164,23 +172,28 @@
- @HAVE_MP4_SUPPORT_TRUE@	$(containersdir)
- libogmrip_mplayer_la_DEPENDENCIES =  \
- 	$(top_builddir)/libogmdvd/libogmdvd.la \
--	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la
-+	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
-+	$(am__DEPENDENCIES_1)
- am_libogmrip_mplayer_la_OBJECTS = ogmrip-mplayer.lo
- libogmrip_mplayer_la_OBJECTS = $(am_libogmrip_mplayer_la_OBJECTS)
--@HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_DEPENDENCIES = libogmrip.la
-+@HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_DEPENDENCIES =  \
-+@HAVE_OGM_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_OGM_SUPPORT_TRUE@	libogmrip.la $(am__DEPENDENCIES_1)
- am__libogmrip_ogg_la_SOURCES_DIST = ogmrip-ogg.c
- @HAVE_OGM_SUPPORT_TRUE@am_libogmrip_ogg_la_OBJECTS = ogmrip-ogg.lo
- libogmrip_ogg_la_OBJECTS = $(am_libogmrip_ogg_la_OBJECTS)
- @HAVE_OGM_SUPPORT_TRUE@am_libogmrip_ogg_la_rpath = -rpath \
- @HAVE_OGM_SUPPORT_TRUE@	$(containersdir)
--@HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_DEPENDENCIES = libogmrip.la \
--@HAVE_SRT_SUPPORT_TRUE@	libogmrip-mplayer.la
-+@HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_DEPENDENCIES =  \
-+@HAVE_SRT_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_SRT_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la \
-+@HAVE_SRT_SUPPORT_TRUE@	$(am__DEPENDENCIES_1)
- am__libogmrip_srt_la_SOURCES_DIST = ogmrip-srt.c
- @HAVE_SRT_SUPPORT_TRUE@am_libogmrip_srt_la_OBJECTS = ogmrip-srt.lo
- libogmrip_srt_la_OBJECTS = $(am_libogmrip_srt_la_OBJECTS)
- @HAVE_SRT_SUPPORT_TRUE@am_libogmrip_srt_la_rpath = -rpath \
- @HAVE_SRT_SUPPORT_TRUE@	$(subp_codecsdir)
--@HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_DEPENDENCIES =  \
-+@HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_DEPENDENCIES = $(top_builddir)/libogmjob/libogmjob.la \
- @HAVE_THEORA_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
- am__libogmrip_theora_la_SOURCES_DIST = ogmrip-theora.c
- @HAVE_THEORA_SUPPORT_TRUE@am_libogmrip_theora_la_OBJECTS =  \
-@@ -188,10 +201,12 @@
- libogmrip_theora_la_OBJECTS = $(am_libogmrip_theora_la_OBJECTS)
- @HAVE_THEORA_SUPPORT_TRUE@am_libogmrip_theora_la_rpath = -rpath \
- @HAVE_THEORA_SUPPORT_TRUE@	$(video_codecsdir)
--libogmrip_vobsub_la_DEPENDENCIES = libogmrip.la libogmrip-mplayer.la
-+libogmrip_vobsub_la_DEPENDENCIES =  \
-+	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
-+	libogmrip-mplayer.la $(am__DEPENDENCIES_1)
- am_libogmrip_vobsub_la_OBJECTS = ogmrip-vobsub.lo
- libogmrip_vobsub_la_OBJECTS = $(am_libogmrip_vobsub_la_OBJECTS)
--@HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_DEPENDENCIES =  \
-+@HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_DEPENDENCIES = $(top_builddir)/libogmjob/libogmjob.la \
- @HAVE_VORBIS_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
- am__libogmrip_vorbis_la_SOURCES_DIST = ogmrip-vorbis.c
- @HAVE_VORBIS_SUPPORT_TRUE@am_libogmrip_vorbis_la_OBJECTS =  \
-@@ -217,7 +232,7 @@
- @HAVE_XVID_SUPPORT_TRUE@am_libogmrip_xvid_la_rpath = -rpath \
- @HAVE_XVID_SUPPORT_TRUE@	$(video_codecsdir)
- libogmrip_la_DEPENDENCIES = $(top_builddir)/libogmdvd/libogmdvd.la \
--	$(top_builddir)/libogmjob/libogmjob.la
-+	$(top_builddir)/libogmjob/libogmjob.la $(am__DEPENDENCIES_1)
- am_libogmrip_la_OBJECTS = ogmrip-audio-codec.lo ogmrip-chapters.lo \
- 	ogmrip-codec.lo ogmrip-container.lo ogmrip-dvdcpy.lo \
- 	ogmrip-edl.lo ogmrip-file.lo ogmrip-fs.lo ogmrip-plugin.lo \
-@@ -544,7 +559,8 @@
- 
- libogmrip_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
--  $(top_builddir)/libogmjob/libogmjob.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  $(OGMRIP_LIBS)
- 
- 
- #
-@@ -560,7 +576,7 @@
- libogmrip_mplayer_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmjob/libogmjob.la \
--  libogmrip.la
-+  libogmrip.la $(OGMRIP_LIBS)
- 
- libogmrip_mplayer_ladir = \
-   $(includedir)/ogmrip
-@@ -578,7 +594,8 @@
- libogmrip_lavc_la_LIBADD = \
-   $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmjob/libogmjob.la \
--  libogmrip.la libogmrip-mplayer.la
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- 
- libogmrip_lavc_ladir = \
-   $(includedir)/ogmrip
-@@ -624,8 +641,8 @@
- @HAVE_THEORA_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_LIBADD = \
--@HAVE_THEORA_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_THEORA_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_THEORA_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_THEORA_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
- 
- @HAVE_X264_SUPPORT_TRUE@libogmrip_x264_la_SOURCES = \
- @HAVE_X264_SUPPORT_TRUE@  ogmrip-x264.c
-@@ -636,7 +653,7 @@
- 
- @HAVE_X264_SUPPORT_TRUE@libogmrip_x264_la_LIBADD = \
- @HAVE_X264_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_X264_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_X264_SUPPORT_TRUE@  libogmrip-mplayer.la -lm
- 
- 
- #
-@@ -675,8 +692,8 @@
- @HAVE_MP3_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_LIBADD = \
--@HAVE_MP3_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_MP3_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_MP3_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_MP3_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
- 
- @HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_SOURCES = \
- @HAVE_VORBIS_SUPPORT_TRUE@  ogmrip-vorbis.c
-@@ -686,8 +703,8 @@
- @HAVE_VORBIS_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_LIBADD = \
--@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_VORBIS_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
- 
- @HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_SOURCES = \
- @HAVE_AAC_SUPPORT_TRUE@  ogmrip-aac.c
-@@ -697,8 +714,8 @@
- @HAVE_AAC_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_LIBADD = \
--@HAVE_AAC_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_AAC_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_AAC_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_AAC_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
- 
- 
- #
-@@ -714,8 +731,9 @@
-   -L$(top_builddir)/libogmrip/.libs
- 
- libogmrip_vobsub_la_LIBADD = \
--  libogmrip.la \
--  libogmrip-mplayer.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  libogmrip.la libogmrip-mplayer.la \
-+  $(OGMRIP_LIBS)
- 
- @HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_SOURCES = \
- @HAVE_SRT_SUPPORT_TRUE@  ogmrip-srt.c
-@@ -725,8 +743,9 @@
- @HAVE_SRT_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_LIBADD = \
--@HAVE_SRT_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_SRT_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_SRT_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_SRT_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la \
-+@HAVE_SRT_SUPPORT_TRUE@  $(OGMRIP_LIBS)
- 
- 
- #
-@@ -754,7 +773,9 @@
- @HAVE_OGM_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_LIBADD = \
--@HAVE_OGM_SUPPORT_TRUE@  libogmrip.la
-+@HAVE_OGM_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_OGM_SUPPORT_TRUE@  libogmrip.la \
-+@HAVE_OGM_SUPPORT_TRUE@  $(OGMRIP_LIBS)
- 
- @HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_SOURCES = \
- @HAVE_MKV_SUPPORT_TRUE@  ogmrip-mkv.c
-@@ -764,7 +785,10 @@
- @HAVE_MKV_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_LIBADD = \
--@HAVE_MKV_SUPPORT_TRUE@  libogmrip.la
-+@HAVE_MKV_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_MKV_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
-+@HAVE_MKV_SUPPORT_TRUE@  libogmrip.la \
-+@HAVE_MKV_SUPPORT_TRUE@  $(OGMRIP_LIBS)
- 
- @HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_SOURCES = \
- @HAVE_MP4_SUPPORT_TRUE@  ogmrip-mp4.c
-@@ -774,8 +798,9 @@
- @HAVE_MP4_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
- 
- @HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_LIBADD = \
--@HAVE_MP4_SUPPORT_TRUE@  libogmrip.la \
--@HAVE_MP4_SUPPORT_TRUE@  libogmrip-mplayer.la
-+@HAVE_MP4_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
-+@HAVE_MP4_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la \
-+@HAVE_MP4_SUPPORT_TRUE@  $(OGMRIP_LIBS)
- 
- @HAVE_LAVF_SUPPORT_TRUE@libogmrip_mov_la_SOURCES = \
- @HAVE_LAVF_SUPPORT_TRUE@  ogmrip-mov.c
-diff -Naur ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.am ogmrip-0.12.1/libogmrip-gtk/Makefile.am
---- ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.am	2008-07-06 13:58:54.000000000 +0200
-+++ ogmrip-0.12.1/libogmrip-gtk/Makefile.am	2008-07-15 21:00:34.000000000 +0200
-@@ -26,14 +26,14 @@
-   ogmrip-gtk.h
- 
- libogmrip_gtk_la_LDFLAGS = \
--  -version-info $(OGMRIP_GTK_LT_VERSION) \
--  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
-+  -version-info $(OGMRIP_GTK_LT_VERSION)
- 
- libogmrip_gtk_la_LIBADD = \
--  $(top_builddir)/libogmdvd/libogmdvd.la          \
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la  \
--  $(top_builddir)/libogmjob/libogmjob.la          \
--  $(top_builddir)/libogmrip/libogmrip.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  $(top_builddir)/libogmrip/libogmrip.la \
-+  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- #
- # Options
-@@ -54,7 +54,7 @@
- 
- libogmrip_x264_options_la_LIBADD = \
-   $(top_builddir)/libogmrip/libogmrip.la \
--  libogmrip-gtk.la $(OGMRIP_LIBS)
-+  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- libogmrip_lavc_options_la_SOURCES = \
-   ogmrip-lavc-options.c
-@@ -66,7 +66,7 @@
- libogmrip_lavc_options_la_LIBADD = \
-   $(top_builddir)/libogmrip/libogmrip.la \
-   $(top_builddir)/libogmrip/libogmrip-lavc.la \
--  libogmrip-gtk.la $(OGMRIP_LIBS)
-+  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- #
- # Misc
-diff -Naur ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.in ogmrip-0.12.1/libogmrip-gtk/Makefile.in
---- ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.in	2008-07-14 21:14:24.000000000 +0200
-+++ ogmrip-0.12.1/libogmrip-gtk/Makefile.in	2008-07-15 20:59:55.000000000 +0200
-@@ -60,27 +60,28 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- options_pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES) $(options_plugin_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
- libogmrip_gtk_la_DEPENDENCIES =  \
- 	$(top_builddir)/libogmdvd/libogmdvd.la \
- 	$(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \
- 	$(top_builddir)/libogmjob/libogmjob.la \
--	$(top_builddir)/libogmrip/libogmrip.la
-+	$(top_builddir)/libogmrip/libogmrip.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libogmrip_gtk_la_OBJECTS = ogmrip-options-plugin.lo \
- 	ogmrip-source-chooser.lo ogmrip-source-chooser-widget.lo \
- 	ogmrip-chapter-list.lo ogmrip-chooser-list.lo \
- 	ogmrip-marshal.lo ogmrip-preferences.lo ogmrip-helper.lo
- libogmrip_gtk_la_OBJECTS = $(am_libogmrip_gtk_la_OBJECTS)
--am__DEPENDENCIES_1 =
- libogmrip_lavc_options_la_DEPENDENCIES =  \
- 	$(top_builddir)/libogmrip/libogmrip.la \
- 	$(top_builddir)/libogmrip/libogmrip-lavc.la libogmrip-gtk.la \
--	$(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libogmrip_lavc_options_la_OBJECTS = ogmrip-lavc-options.lo
- libogmrip_lavc_options_la_OBJECTS =  \
- 	$(am_libogmrip_lavc_options_la_OBJECTS)
- libogmrip_x264_options_la_DEPENDENCIES =  \
- 	$(top_builddir)/libogmrip/libogmrip.la libogmrip-gtk.la \
--	$(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libogmrip_x264_options_la_OBJECTS = ogmrip-x264-options.lo
- libogmrip_x264_options_la_OBJECTS =  \
- 	$(am_libogmrip_x264_options_la_OBJECTS)
-@@ -364,14 +365,14 @@
-   ogmrip-gtk.h
- 
- libogmrip_gtk_la_LDFLAGS = \
--  -version-info $(OGMRIP_GTK_LT_VERSION) \
--  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
-+  -version-info $(OGMRIP_GTK_LT_VERSION)
- 
- libogmrip_gtk_la_LIBADD = \
--  $(top_builddir)/libogmdvd/libogmdvd.la          \
-+  $(top_builddir)/libogmdvd/libogmdvd.la \
-   $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la  \
--  $(top_builddir)/libogmjob/libogmjob.la          \
--  $(top_builddir)/libogmrip/libogmrip.la
-+  $(top_builddir)/libogmjob/libogmjob.la \
-+  $(top_builddir)/libogmrip/libogmrip.la \
-+  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- 
- #
-@@ -391,7 +392,7 @@
- 
- libogmrip_x264_options_la_LIBADD = \
-   $(top_builddir)/libogmrip/libogmrip.la \
--  libogmrip-gtk.la $(OGMRIP_LIBS)
-+  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- libogmrip_lavc_options_la_SOURCES = \
-   ogmrip-lavc-options.c
-@@ -403,7 +404,7 @@
- libogmrip_lavc_options_la_LIBADD = \
-   $(top_builddir)/libogmrip/libogmrip.la \
-   $(top_builddir)/libogmrip/libogmrip-lavc.la \
--  libogmrip-gtk.la $(OGMRIP_LIBS)
-+  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
- 
- 
- #
diff --git a/media-video/ogmrip/ogmrip-0.11.2-r1.ebuild b/media-video/ogmrip/ogmrip-0.11.2-r1.ebuild
deleted file mode 100644
index 9f5f78a4dc4e..000000000000
--- a/media-video/ogmrip/ogmrip-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.11.2-r1.ebuild,v 1.2 2008/04/28 20:12:45 drac Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal jpeg libnotify matroska spell srt theora x264"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	virtual/eject
-	>=media-video/mplayer-1.0_pre4
-	>=media-sound/ogmtools-1.4
-	>=media-sound/vorbis-tools-1.0
-	>=media-sound/lame-3.96
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 ) )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	spell? ( >=app-text/enchant-1.1 )
-	matroska? ( >=media-video/mkvtoolnix-1.8.1 )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	srt? ( || ( >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		>=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc gtk-doc)
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska matroska-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)"
-
-	if ! built_with_use -a media-video/mplayer dvd encode xvid; then
-		eerror "Please check that your USE flags contain 'dvd', 'encode', 'xvid'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-	if use dts && ! built_with_use -a media-video/mplayer dts; then
-		eerror "Please check that your USE flags contain 'dts'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-	if use x264 && ! built_with_use -a media-video/mplayer x264; then
-		eerror "Please check that your USE flags contain 'x264'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-	if use jpeg && ! built_with_use -a media-video/mplayer jpeg; then
-		eerror "Please check that your USE flags contain 'jpeg'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-}
diff --git a/media-video/ogmrip/ogmrip-0.11.2.ebuild b/media-video/ogmrip/ogmrip-0.11.2.ebuild
deleted file mode 100644
index d2302cc5be7f..000000000000
--- a/media-video/ogmrip/ogmrip-0.11.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.11.2.ebuild,v 1.1 2008/01/03 02:10:14 beandog Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska spell srt theora x264"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	virtual/eject
-	>=media-video/mplayer-1.0_pre4
-	>=media-sound/ogmtools-1.4
-	>=media-sound/vorbis-tools-1.0
-	>=media-sound/lame-3.96
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 ) )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	spell? ( >=app-text/enchant-1.1 )
-	matroska? ( >=media-video/mkvtoolnix-1.8.1 )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	srt? ( || ( >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		>=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc gtk-doc)
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska matroska-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)"
-
-	if ! built_with_use -a media-video/mplayer dvd encode xvid; then
-		eerror "Please check that your USE flags contain 'dvd', 'encode', 'xvid'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-	if use dts && ! built_with_use -a media-video/mplayer dts; then
-		eerror "Please check that your USE flags contain 'dts'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-	if use x264 && ! built_with_use -a media-video/mplayer x264; then
-		eerror "Please check that your USE flags contain 'x264'"
-		eerror "and emerge mplayer again."
-		die "MPlayer is missing required USE flags (see above for details)."
-	fi
-}
diff --git a/media-video/ogmrip/ogmrip-0.12.0.ebuild b/media-video/ogmrip/ogmrip-0.12.0.ebuild
deleted file mode 100644
index ace60382a214..000000000000
--- a/media-video/ogmrip/ogmrip-0.12.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.0.ebuild,v 1.1 2008/06/26 02:05:22 beandog Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 ogm png spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	>=media-video/mplayer-1.0_pre4
-	virtual/eject
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 ) )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	matroska? ( >=media-video/mkvtoolnix-0.9 )
-	mp3? ( >=media-sound/lame-3.96 )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( >=media-sound/ogmtools-1.4 )
-	png? ( media-libs/libpng )
-	spell? ( >=app-text/enchant-1.1 )
-	srt? ( || ( ( >=app-text/tesseract-2.00 media-libs/tiff )
-		>=app-text/gocr-0.39
-		>=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	vorbis? ( >=media-sound/vorbis-tools-1.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		 >=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	local letsfail=0
-
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)"
-
-	if ! built_with_use -a media-video/mplayer dvd encode; then
-		eerror "Please check that your USE flags contain 'dvd' and 'encode'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use xvid && ! built_with_use -a media-video/mplayer xvid; then
-		eerror "Please check that your USE flags contain 'xvid'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use dts && ! built_with_use -a media-video/mplayer dts; then
-		eerror "Please check that your USE flags contain 'dts'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use x264 && ! built_with_use -a media-video/mplayer x264; then
-		eerror "Please check that your USE flags contain 'x264'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use gtk && ! built_with_use -a media-video/mplayer jpeg; then
-		eerror "Please check that your USE flags contain 'jpeg'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-
-	[[ ${letsfail} != 0 ]] && die "MPlayer is missing required USE flags (see above for details)."
-}
diff --git a/media-video/ogmrip/ogmrip-0.12.1.ebuild b/media-video/ogmrip/ogmrip-0.12.1.ebuild
deleted file mode 100644
index ed461ede0e85..000000000000
--- a/media-video/ogmrip/ogmrip-0.12.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.1.ebuild,v 1.1 2008/07/29 01:57:42 beandog Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 ogm png spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	>=media-video/mplayer-1.0_pre4
-	virtual/eject
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 ) )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	matroska? ( >=media-video/mkvtoolnix-0.9 )
-	mp3? ( >=media-sound/lame-3.96 )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( >=media-sound/ogmtools-1.4 )
-	png? ( media-libs/libpng )
-	spell? ( >=app-text/enchant-1.1 )
-	srt? ( || ( ( >=app-text/tesseract-2.00 media-libs/tiff )
-		>=app-text/gocr-0.39
-		>=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	vorbis? ( >=media-sound/vorbis-tools-1.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		 >=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	local letsfail=0
-
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)"
-
-	if ! built_with_use -a media-video/mplayer dvd encode; then
-		eerror "Please check that your USE flags contain 'dvd' and 'encode'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use xvid && ! built_with_use -a media-video/mplayer xvid; then
-		eerror "Please check that your USE flags contain 'xvid'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use dts && ! built_with_use -a media-video/mplayer dts; then
-		eerror "Please check that your USE flags contain 'dts'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use x264 && ! built_with_use -a media-video/mplayer x264; then
-		eerror "Please check that your USE flags contain 'x264'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use gtk && ! built_with_use -a media-video/mplayer jpeg; then
-		eerror "Please check that your USE flags contain 'jpeg'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-
-	[[ ${letsfail} != 0 ]] && die "MPlayer is missing required USE flags (see above for details)."
-}
diff --git a/media-video/ogmrip/ogmrip-0.12.2.ebuild b/media-video/ogmrip/ogmrip-0.12.2.ebuild
index 437d568fb548..d4635f1f3452 100644
--- a/media-video/ogmrip/ogmrip-0.12.2.ebuild
+++ b/media-video/ogmrip/ogmrip-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.2.ebuild,v 1.1 2008/10/01 06:34:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.2.ebuild,v 1.2 2008/12/03 14:10:05 beandog Exp $
 
 EAPI="2"
 
@@ -66,7 +66,7 @@ pkg_setup() {
 		$(use_enable xvid xvid-support)"
 }
 
-src_configure(){
+src_configure() {
 	gnome2_src_configure
 }