Drop old version.

(Portage version: 2.1_pre6)

4 files changed, 5 insertions, 178 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 40c6b4a4552d..fa4f2bf1286d 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.50 2006/03/12 13:28:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.51 2006/03/12 13:29:48 flameeyes Exp $
+
+  12 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mkvtoolnix-1.6.0-lzo2.patch, -mkvtoolnix-1.6.0.ebuild:
+  Drop old version.
 
   12 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   mkvtoolnix-1.6.5.ebuild:
diff --git a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0 b/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0
deleted file mode 100644
index 93502fd953e2..000000000000
--- a/media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e71480ccf5b8d9155ac7c6e52c4789d3 mkvtoolnix-1.6.0.tar.bz2 652756
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch b/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch
deleted file mode 100644
index d0fd487ceba1..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 3154)
-+++ configure.in	(revision 3155)
-@@ -798,17 +798,25 @@ dnl Check for liblzo
- dnl
-   AC_ARG_ENABLE([lzo],
-     [  --enable-lzo            compile in support for LZO compression (auto)])
--  if test x"$enable_lzo" = x"yes" -o x"$enable_lzo" = "x"; then
--    AC_CHECK_LIB(lzo, lzo1x_1_compress,
--                 [ LZO_LIBS="-llzo"
-+  if test "x$enable_lzo" != "xno"; then
-+    AC_CHECK_LIB(lzo2, lzo1x_1_compress,
-+                 [ LZO_LIBS="-llzo2"
-                    lzo_found=yes ],
--                 [ lzo_found=no ],)
--    if test "$lzo_found" = "yes"; then
--      AC_CHECK_HEADERS(lzo1x.h, , lzo_found=no)
-+                 [ AC_CHECK_LIB(lzo, lzo1x_1_compress,
-+                                [ LZO_LIBS="-llzo"
-+                                  lzo_found=yes ],
-+                                [ lzo_found=no ],)
-+                 ],)
-+    if test "x$lzo_found" = "xyes"; then
-+      AC_CHECK_HEADERS([lzo1x.h lzo/lzo1x.h])
-+      if test "x$ac_cv_header_lzo1x_h" != "xyes" && "x$ac_cv_header_lzo_lzo1x_h" != "xyes"; then
-+        lzo_found=no
-+      fi
-     fi
-   fi
-   if test x"$lzo_found" = xyes ; then
-     opt_features_yes="$opt_features_yes; LZO compression"
-+    AC_DEFINE([HAVE_LZO], [1], [Define this if LZO compression is present])
-   else
-     opt_features_no="$opt_features_no; LZO compression"
-   fi
-Index: src/merge/mkvmerge.cpp
-===================================================================
---- src/merge/mkvmerge.cpp	(revision 3154)
-+++ src/merge/mkvmerge.cpp	(revision 3155)
-@@ -277,7 +277,7 @@ print_capabilities() {
- #if defined(HAVE_BZLIB_H)
-   mxinfo("BZ2\n");
- #endif
--#if defined(HAVE_LZO1X_H)
-+#if defined(HAVE_LZO)
-   mxinfo("LZO\n");
- #endif
- #if defined(HAVE_FLAC_FORMAT_H)
-@@ -901,7 +901,7 @@ parse_compression(const string &s,
- 
-   ti.compression_list[id] = COMPRESSION_UNSPECIFIED;
-   parts[1] = downcase(parts[1]);
--#ifdef HAVE_LZO1X_H
-+#ifdef HAVE_LZO
-   if ((parts[1] == "lzo") || (parts[1] == "lzo1x"))
-     ti.compression_list[id] = COMPRESSION_LZO;
- #endif
-Index: src/common/compression.h
-===================================================================
---- src/common/compression.h	(revision 3154)
-+++ src/common/compression.h	(revision 3155)
-@@ -80,8 +80,13 @@ public:
-   static compressor_ptr create(const char *method);
- };
- 
--#if defined(HAVE_LZO1X_H)
--#include <lzo1x.h>
-+#ifdef HAVE_LZO
-+
-+#ifdef HAVE_LZO_LZO1X_H
-+# include <lzo/lzo1x.h>
-+#else
-+# include <lzo1x.h>
-+#endif
- 
- class MTX_DLL_API lzo_compressor_c: public compressor_c {
- protected:
-@@ -94,7 +99,7 @@ public:
-   virtual void decompress(memory_cptr &buffer);
-   virtual void compress(memory_cptr &buffer);
- };
--#endif // HAVE_LZO1X_H
-+#endif // HAVE_LZO
- 
- #if defined(HAVE_ZLIB_H)
- #include <zlib.h>
-Index: src/common/compression.cpp
-===================================================================
---- src/common/compression.cpp	(revision 3154)
-+++ src/common/compression.cpp	(revision 3155)
-@@ -40,8 +40,13 @@ static const int compression_method_map[
- 
- // ---------------------------------------------------------------------
- 
--#if defined(HAVE_LZO1X_H)
--#include <lzoutil.h>
-+#ifdef HAVE_LZO
-+
-+#ifdef HAVE_LZO_LZO1X_H
-+# include <lzo/lzoutil.h>
-+#else
-+# include <lzoutil.h>
-+#endif
- 
- lzo_compressor_c::lzo_compressor_c():
-   compressor_c(COMPRESSION_LZO) {
-@@ -88,7 +93,7 @@ lzo_compressor_c::compress(memory_cptr &
-   buffer = memory_cptr(new memory_c(dst, dstsize, true));
- }
- 
--#endif // HAVE_LZO1X_H
-+#endif // HAVE_LZO
- 
- // ---------------------------------------------------------------------
- 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
deleted file mode 100644
index 32c2fc82f063..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild,v 1.4 2006/01/05 16:34:38 flameeyes Exp $
-
-inherit eutils wxwidgets flag-o-matic
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="wxwindows flac bzip2 lzo"
-
-DEPEND=">=dev-libs/libebml-0.7.3
-	>=media-libs/libmatroska-0.7.5
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/expat
-	sys-libs/zlib
-	wxwindows? ( =x11-libs/wxGTK-2.6* )
-	flac? ( >=media-libs/flac-1.1.0 )
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )"
-
-pkg_setup() {
-	WX_GTK_VER="2.6"
-	if use wxwindows; then
-		need-wxwidgets gtk2 || die "You must compile wxGTK with X useflag."
-		# wxWidgets does not like --as-needed
-		filter-ldflags -Wl,--as-needed --as-needed
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-lzo2.patch"
-}
-
-src_compile() {
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwindows gui) \
-		$(use_with flac) \
-		|| die "./configure died"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	dohtml doc/mkvmerge-gui.html doc/images/*
-	docinto examples
-	dodoc examples/*
-}