From 61ccd7dd449c55d7efdbb3b5a0a6f19daa6b15e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 12 Mar 2006 13:29:48 +0000 Subject: [PATCH] Drop old version. Package-Manager: portage-2.1_pre6 --- media-video/mkvtoolnix/ChangeLog | 6 +- media-video/mkvtoolnix/Manifest | 21 +--- .../mkvtoolnix/files/digest-mkvtoolnix-1.6.0 | 1 - .../files/mkvtoolnix-1.6.0-lzo2.patch | 116 ------------------ .../mkvtoolnix/mkvtoolnix-1.6.0.ebuild | 60 --------- 5 files changed, 11 insertions(+), 193 deletions(-) delete mode 100644 media-video/mkvtoolnix/files/digest-mkvtoolnix-1.6.0 delete mode 100644 media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch delete mode 100644 media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild 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ò + -files/mkvtoolnix-1.6.0-lzo2.patch, -mkvtoolnix-1.6.0.ebuild: + Drop old version. 12 Mar 2006; Diego Pettenò mkvtoolnix-1.6.5.ebuild: diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index d92df5b1d6fb..3d2f7e0717d4 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,37 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 e1b8cd8ac89f42377a09817c32fe895f ChangeLog 8248 -RMD160 1a2888a4ada259e3e8a7d1e644fbb3b5b8bd7327 ChangeLog 8248 -SHA256 5148142742a2ef1ea1d1346c5495082a47b7de92f03ffbe40cd36eb0e12a8b8d ChangeLog 8248 +MD5 5e847feb1ef089a169fa0379f9c5ab70 ChangeLog 8386 +RMD160 80f3237356b817ac32ddf18aca20609255bbbb30 ChangeLog 8386 +SHA256 b72e4a57c05447486fa4dd7d07e23ec30ae4cece84bb233cbd3aac735eec496c ChangeLog 8386 MD5 dc82e2c687345769c53a013331f2abb3 files/digest-mkvtoolnix-1.5.5 69 RMD160 4956dcc4eb472e1d142a94e6bc99fb63e7e95dab files/digest-mkvtoolnix-1.5.5 69 SHA256 e28d2ecb8eb3285332751f728496856ed9ccb549c184ad666b2bb9fda787428b files/digest-mkvtoolnix-1.5.5 69 -MD5 91ac5c9285fd2276b87d33e01746488a files/digest-mkvtoolnix-1.6.0 69 -RMD160 d92cb951aedb6abedfd01a7723cec756231f5d73 files/digest-mkvtoolnix-1.6.0 69 -SHA256 0f08c61d63045f63e3aa690a48c74601b273cc59e542bc657c56a4a892e437b5 files/digest-mkvtoolnix-1.6.0 69 MD5 a67991c3d3ece4f99b6d5bc125bda835 files/digest-mkvtoolnix-1.6.5 253 RMD160 fd2a623ae594fd895061c8b62613a974dc8422c2 files/digest-mkvtoolnix-1.6.5 253 SHA256 1d735bc1f0e4198f3d92a882f996510826b0e41cdffcb5577ff1de07885fc0af files/digest-mkvtoolnix-1.6.5 253 -MD5 10475628f738cb79f2cd3def68ab1091 files/mkvtoolnix-1.6.0-lzo2.patch 3662 -RMD160 7e6d8fda96e5e2ef875a9e1dca64a775c95bae16 files/mkvtoolnix-1.6.0-lzo2.patch 3662 -SHA256 64086a42e18371a3ab9aee39e72dae9eb4c682acd104628a52b50c4d02500e1c files/mkvtoolnix-1.6.0-lzo2.patch 3662 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253 SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf metadata.xml 253 MD5 39f624a94586d7e44abc46b352f70f95 mkvtoolnix-1.5.5.ebuild 1256 RMD160 7fdf02480c9571c090437921ad22a1814870fd45 mkvtoolnix-1.5.5.ebuild 1256 SHA256 7a80bca1b30958ba06d79e731a58ee7ecca2e3499b06e8160c3a882113442b9e mkvtoolnix-1.5.5.ebuild 1256 -MD5 e4e78e4bb899dedd4e0e6d7487301497 mkvtoolnix-1.6.0.ebuild 1472 -RMD160 6fa94db32e54eca460deab2e41dccdf03d1ecea2 mkvtoolnix-1.6.0.ebuild 1472 -SHA256 33a7d3137320345aad8661e254ee26f5fbd958c9be485a6408f20daeaaf83018 mkvtoolnix-1.6.0.ebuild 1472 MD5 47b771c5e5c73a8a801dfd21001c528a mkvtoolnix-1.6.5.ebuild 1488 RMD160 3ab7dfd630e6a1295c4aa7e99a1076b2d10851d8 mkvtoolnix-1.6.5.ebuild 1488 SHA256 72998d0883516547efc1405be7e4980ac72bf3a56e4cf2dc6943635315f90701 mkvtoolnix-1.6.5.ebuild 1488 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEFCHvAiZjviIA2XgRAv2oAJ0dICRbMw/lAX6MHXpyPB2b3GlvfgCgrTKu -ZHkk6ET1IXdrrO6IXgFMGxU= -=AwY7 +iD8DBQFEFCJEAiZjviIA2XgRAklUAKDkSjVZd7S76rWtLRB98ayITVrYLACfSjrk +u/MQ56aSnWSh4mbieoamn7k= +=Kus1 -----END PGP SIGNATURE----- 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 -+#ifdef HAVE_LZO -+ -+#ifdef HAVE_LZO_LZO1X_H -+# include -+#else -+# include -+#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 -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 -+#ifdef HAVE_LZO -+ -+#ifdef HAVE_LZO_LZO1X_H -+# include -+#else -+# include -+#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/* -} -- 2.26.2