From 11d4f55e0dee19cbe6c3529fcf5c1ed16b02c5ae Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 7 Feb 2013 00:24:22 +0000 Subject: [PATCH] makemkv is in the official tree, with the same version --- media-video/makemkv/Manifest | 8 -- .../files/makemkv-1.6.16-makefile.linux.patch | 20 ---- .../files/makemkv-1.7.4-makefile.linux.patch | 20 ---- .../files/makemkv-1.7.6-makefile.linux.patch | 20 ---- .../files/makemkv-1.7.7-makefile.linux.patch | 20 ---- .../files/makemkv-1.7.8-makefile.linux.patch | 20 ---- media-video/makemkv/makemkv-1.7.8.ebuild | 98 ------------------- 7 files changed, 206 deletions(-) delete mode 100644 media-video/makemkv/Manifest delete mode 100644 media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch delete mode 100644 media-video/makemkv/files/makemkv-1.7.4-makefile.linux.patch delete mode 100644 media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch delete mode 100644 media-video/makemkv/files/makemkv-1.7.7-makefile.linux.patch delete mode 100644 media-video/makemkv/files/makemkv-1.7.8-makefile.linux.patch delete mode 100644 media-video/makemkv/makemkv-1.7.8.ebuild diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest deleted file mode 100644 index 30ce859..0000000 --- a/media-video/makemkv/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX makemkv-1.6.16-makefile.linux.patch 579 SHA256 ebf3085044c4d1b6c1a06e48de5ab7d601944de42835d421484d6ddb5d15f535 SHA512 c7acec30e2846dcc02cef0d5d9a8162990348ce4ec6389829a518a5746210cdb63914c2a45ae6807e43f3773d180e35ff4016e9a8ee1b3054a8c24b284df459c WHIRLPOOL 619154c0fd588ecc30963e931feefbd15e1922a3db61d85849a518ebac0def28f1bff77695c130890293f905c2c5010161883ead0644f1f840aa7a619829ca4e -AUX makemkv-1.7.4-makefile.linux.patch 582 SHA256 4378b25a34ed9b3dedcdddd58bbe533c46c5582144ee5a1d15cdc49d7111fb52 SHA512 bad5507937e337c2f394f5d8c009d32f6e87e0a664e9190870582c4b853c300e477a7ec751d0f65d52448255c2b4fea6ef47cce3a1fc102074c8483dfaaebf75 WHIRLPOOL cba1ade07222e18f54bdd67ad14aaec671be1d5abb43f121f621bfd52739047ebc90062949328f9bb7af52bb34aa877d95cbd9fee1520a5efd9eb85342fdcd87 -AUX makemkv-1.7.6-makefile.linux.patch 592 SHA256 85ec887388dba2bfde25138ee21920172772abf89b4e6efbc578acdbed2b1e42 SHA512 5865f967944ff6b7bd29a18e9abd886059d5b6fb24e99deb849fb2008919fdaf61eb7d8c774d42a7166e8dc623b69da25dc62d64b1bb3097689eeb81e4cf0434 WHIRLPOOL 5a5c14bda50e461720ff3486c3977a1cb82afe2bfe847ed9028c46600e7d9f8d738e10214e7fd340763bcb60c397d19f1fde4d2c205cff9e85c808b2b38aeaec -AUX makemkv-1.7.7-makefile.linux.patch 580 SHA256 1611738fdf817fbcd37f8c393e8b08246540b5afff970c7e122a5370a68c5278 SHA512 f61ce5504526b3085f3182c048330b618b422fc96a18de465c8c739dd63f122ca6765fe81b50b6a051eb4902e8b4c28c6fd88069836191bb0db83e24cdf0fc30 WHIRLPOOL 97603aac617a82bd1aa6e26ae3ffd58b6ee0f1e543a4a343a7eb33c4c18016d861f9ce8b856fe240628d9cdbbe7d28cda0d7bd27078c6326361b149f154bf14f -AUX makemkv-1.7.8-makefile.linux.patch 580 SHA256 1611738fdf817fbcd37f8c393e8b08246540b5afff970c7e122a5370a68c5278 SHA512 f61ce5504526b3085f3182c048330b618b422fc96a18de465c8c739dd63f122ca6765fe81b50b6a051eb4902e8b4c28c6fd88069836191bb0db83e24cdf0fc30 WHIRLPOOL 97603aac617a82bd1aa6e26ae3ffd58b6ee0f1e543a4a343a7eb33c4c18016d861f9ce8b856fe240628d9cdbbe7d28cda0d7bd27078c6326361b149f154bf14f -DIST makemkv-bin-1.7.8.tar.gz 6817550 SHA256 76fa7a58e986537663c4fe8e6dd429f818d494133f9cc26052b7917e9d38d395 SHA512 251c30659d2e202b3a7197618feedfb1b0db38bde9ae573191578b4d19dbc0a87925d8bfc219e043678fa69bedfc0615e2db7fe04f9aa800ea06643aa089042f WHIRLPOOL 997762677f030f862af1e89315e226b3a3928a9a2cb6e2c6c0e690a009de2b61a41050da4d77bbd09ed9040a6349cb7f9a7273318a78bfa0cd97eabb4797fc40 -DIST makemkv-oss-1.7.8.tar.gz 493693 SHA256 f972df373570ea0f3cc8f829c23c9f3efc23a89c7b38f7c07869fdbb9dc8ab37 SHA512 f6d51f27afde358a81c6734fee8f2af63e6573371ecafd2a19374d26ec6c48e23b32dbb17ab56fdbf00ebd445586ff6ee856aeb666498e755a9868f6d9b49bd3 WHIRLPOOL e2d5753b149d280557ff506adc64ff37a00da5050574cfa23c395c52c4cf44e67e57b1ead5830d7b0563dd3e08e28ce36e111cae9e7900ed9983bd2b64c5cdbd -EBUILD makemkv-1.7.8.ebuild 2755 SHA256 3cd9617eb4f9247e082761e13d0636c2b02389fd6ec946bbb80842330b05bcfc SHA512 0fc7e5ea469ced2a4422edda30c4a97541ccfb210d8028f0455fc6f5025a8cd0a6c884507151d4e78b153f364cd372d1816453b514362892102ec09e1246dcce WHIRLPOOL 7eb7cab167155cfee0880e4b5b9f1fac13a8bc6b019ddaaf5bf012a41ef72556c4b9848940d5419f3bc96bd01834ecbb580fc14c1ad677b759b8b463ee34b74a diff --git a/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch deleted file mode 100644 index 4bef0bc..0000000 --- a/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv_v1.6.16_oss/makefile.linux.orig 2011-12-02 15:26:10.997323145 -0700 -+++ makemkv_v1.6.16_oss/makefile.linux 2011-12-02 17:24:34.058323537 -0700 -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -33,7 +33,7 @@ - install -t $(DESTDIR)/usr/bin out/makemkv - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/files/makemkv-1.7.4-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.4-makefile.linux.patch deleted file mode 100644 index ba213a6..0000000 --- a/media-video/makemkv/files/makemkv-1.7.4-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv_v1.7.4_oss/makefile.linux.orig -+++ makemkv_v1.7.4_oss/makefile.linux -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -38,7 +38,7 @@ - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch deleted file mode 100644 index 6326575..0000000 --- a/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv-oss-1.7.6/makefile.linux.orig -+++ makemkv-oss-1.7.6/makefile.linux -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -38,7 +38,7 @@ - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/files/makemkv-1.7.7-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.7-makefile.linux.patch deleted file mode 100644 index 4305cff..0000000 --- a/media-video/makemkv/files/makemkv-1.7.7-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv-oss-1.7.7/makefile.linux.orig -+++ makemkv-oss-1.7.7/makefile.linux -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -38,7 +38,7 @@ - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/files/makemkv-1.7.8-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.8-makefile.linux.patch deleted file mode 100644 index 4305cff..0000000 --- a/media-video/makemkv/files/makemkv-1.7.8-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv-oss-1.7.7/makefile.linux.orig -+++ makemkv-oss-1.7.7/makefile.linux -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -38,7 +38,7 @@ - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/makemkv-1.7.8.ebuild b/media-video/makemkv/makemkv-1.7.8.ebuild deleted file mode 100644 index 49736fb..0000000 --- a/media-video/makemkv/makemkv-1.7.8.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.7.7.ebuild,v 1.1 2012/10/02 04:15:53 mattm Exp $ - -EAPI=4 -inherit eutils gnome2-utils multilib - -MY_P=makemkv-oss-${PV} -MY_PB=makemkv-bin-${PV} - -DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container" -HOMEPAGE="http://www.makemkv.com/" -SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz - http://www.makemkv.com/download/${MY_PB}.tar.gz" - -LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="multilib" - -QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec" -RESTRICT="mirror" - -RDEPEND="dev-libs/expat - dev-libs/openssl:0 - sys-libs/zlib - virtual/opengl - x11-libs/qt-core:4 - x11-libs/qt-dbus:4 - x11-libs/qt-gui:4 - amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.linux.patch -} - -src_compile() { - emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" -f makefile.linux -} - -src_install() { - # install oss package - dolib.so out/libdriveio.so.0 - dolib.so out/libmakemkv.so.1 - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so - into /opt - dobin out/makemkv - - local res - for res in 16 22 32 64 128; do - newicon -s ${res} makemkvgui/src/img/${res}/mkv_icon.png ${PN}.png - done - - make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video' - - # install bin package - pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null - if use x86; then - dobin i386/{makemkvcon,mmdtsdec} - elif use amd64; then - dobin amd64/makemkvcon - use multilib && dobin i386/mmdtsdec - fi - popd >/dev/null - - # install license and default profile - pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null - insinto /usr/share/MakeMKV - doins *.{gz,xml} - popd >/dev/null -} - -pkg_preinst() { gnome2_icon_savelist; } - -pkg_postinst() { - gnome2_icon_cache_update - - elog "While MakeMKV is in beta mode, upstream has provided a license" - elog "to use if you do not want to purchase one." - elog "" - elog "See this forum thread for more information, including the key:" - elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053" - elog "" - elog "Note that beta license may have an expiration date and you will" - elog "need to check for newer licenses/releases. " - elog "" - elog "If this is a new install, remember to copy the default profile" - elog "to the config directory:" - elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/" -} - -pkg_postrm() { gnome2_icon_cache_update; }