Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 144 insertions, 11 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 87fc6b5a6129..592b3de32d34 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/makemkv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.47 2014/10/20 14:39:06 mattm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.48 2015/02/01 23:11:48 mgorny Exp $
+
+*makemkv-1.8.13-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +makemkv-1.8.13-r1.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
   20 Oct 2014; Matthew Marlowe <mattm@gentoo.org>
   +files/makemkv-1.8.13-makefile.linux.patch:
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0079ecd57350..8cf069c34a9f 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -16,17 +16,26 @@ DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cd
 DIST makemkv-oss-1.8.13.tar.gz 4215928 SHA256 1c15e3c2a25d81bb12af7a86b0d2022f9d10644e7bd26dc8bf6366b635460d4e SHA512 7196e853d25512475b19dd9cca94e1b0718483598636838429f63f6157368aafcf17ec82377243961d1f98f568249df91bca836cef818c48738f071edc6b75b5 WHIRLPOOL 3de9b9aa74959132135674b41627b87092b8298eff22b22988c45de142b0a3150fc742afb6806659faa1bc37275575a96705d7dc5df8e3d906c4fa38f4b37f02
 EBUILD makemkv-1.8.10.ebuild 3047 SHA256 4664ef63c4f48f2de8bd25650a2f2995ac47360b8e5bac387df2730171a75946 SHA512 130bea1e8890f754062e364927c02295440d6c1ffad0175c767c1c9c03093ac458d2bc603ecf41c52bd96ba9c08ae20ccb1ffef61db2ae39fb949942f3a7fb48 WHIRLPOOL 67935a513e9ff0272fc032bd78f7152f0a597e5713f48196b77a76aee0a38a22eea498ed4007d6e783f664681bc9d162bd4018402d37d0e4f93c72081ecef2e8
 EBUILD makemkv-1.8.12-r2.ebuild 3177 SHA256 639c5706372863226f56c5866a6d6ce9d2cac04e3c299ef8e91c3c1267fcd1f8 SHA512 3542e3e0f45507132eab0d5946f9d48b189cac50e77ef302db7f3db558663849d9f27273b985e50454e3b7164e6af152040491635ec9dc59d51f601b95524206 WHIRLPOOL 4a5259d2b3c0d5201b31f64c81d78dc284eb3b59a43ee9c61c6fcff9a8a9364c3f5798aee6faa86615c3604384791ba4476ce76dfe3cd00767b1b09d98d6f6a4
+EBUILD makemkv-1.8.13-r1.ebuild 3174 SHA256 c118b91f04600e1478c93b32f07bb93d007b425a9d0760514288df3dc6497c29 SHA512 d620a7bed0e6d1b948683231ed93dbfbc70bd2b3cbfafe79077baaccf3792feea4aa4ade1fdfd8c6d312c96870379c84f05507807a956df97988b9b9935e85eb WHIRLPOOL 7ac7442b5e873823bc7203dd0ef123d30b5c8c9a90b50896b6ca0757db719febaa1fb500e9246ef6f8bc23a5fc2675a2ed9a94df46bde6eab9612b9330d606ab
 EBUILD makemkv-1.8.13.ebuild 3141 SHA256 28727458f6625741481e13aed0b6cab96f45ac39bd1b6f273daefae2c3876cf9 SHA512 67ac904e807565b2a0c50714e6fea98664f97bfb96611f3d0f19f384dceda0b4a83800682bf0890ccf294d02487b21226d0fd9b00fd4b5bb1107ab4e7acea42b WHIRLPOOL 615d48947af49d636843c283f18e8d4fe400446d5c9a0a246e34f68320ea687e68dc3166b7b343171b040c1ae6ea760816c19a0c63431c8151d86df40b8ad681
-MISC ChangeLog 9874 SHA256 e2da1609a32349cba7747a9bec6d9d223249d24f49943ae70259ddf7bec3bcd2 SHA512 1bf2cfd337c5dada7a3ab12a46bec7c3a802649379a35cef8b9456c4007ec95697f2bd34cfc25ba5a5c787e9bc55525a38006fc133eed6ff4bd6fb358d13ded2 WHIRLPOOL 4305e8cae519d9336a18bbcf74c18ae8a7f1e64b8aaa40aa74a860d2f5390cc3ab8f8173aefe2ce99d3e1fad5714b2e654f70a15f1a98b799e45fd05f1299ecc
+MISC ChangeLog 10100 SHA256 fa055ce5ded066fe838e454a6abdcb418e36b07c66f3afcf340a4ac34f6f34f0 SHA512 564cbfcfae2633f693f58c4e64f3c085bbbdff0686b10fc196dad03bcad2b1ad8c2227f777e86be2243b97dad731ee8f97f390f969ebaf576682b2567521192d WHIRLPOOL 1b1984cb74b23957432e3ef5271ac69d6e50883dc034cf75060fdc3c93c4199182852df3af7308188150e25084c50647ae50dcea59d7742bc94f6e30627d2a8b
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJURR6PAAoJEC1LWXx4YDen/HMH/RKMgdSemph7OcRLnoCP6Iff
-hlNAePG4mKBCy9e22bX0k1kTP2baG4aNIhcDW2UCPizcbnUIHcEAqzVW9sxU9pxW
-SGpp89qdzk+6l3DADrnSadiNMeuwmovc7zd9mRs/7y52Ea8vWBz5gqXq/m2iticB
-c5lVbda08K6EXmFZCAG7sC61YL0KmC42Vi2svYhXWbUQs2GIDJMBB8RT50r5C6WI
-Zpg+87tQTQITm9scT6Q8ph5lV/QILALYHKjz9BFqQkzgDIqOfomgbCZEqTK7U634
-Jf7ecUORVoZHpBG4jk9WT5PcCryrgjhdyKOe1RspoeY7FyrjWzI+FybRdD7KRGQ=
-=1+D2
+iQJ8BAEBCABmBQJUzrK1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGbIP/RSz/rDMdn0g/0GRb8unbxeX
+YGVmhS7iVd4v3z5UaNdyyTvofeJ6Pw0cOxI0yaITO67zeOJWkE8JnJpxrOzilxV+
+QaH6pzWLLMsxHjAnBan7mH44e2NxVdSE2dmzEoZHpDjwhqHauw1sLQtJZOZLC7Xr
++8k1tmaIn7yq/hacFtYW/mMCW5GgbPoiWvRW9+gaf86Ri1EA4eAMD5mcXl0B2Rfk
+dcJOD86H+dbkvQd15BM1SzZ3FIEqtPWv59/QZIrCoRYeFpC9K6/emQwrN7IMLMZP
+TvfQOCSgVGni1it6YZl0mnLDofFFAwoa7rPwssP7qyLbL3kZ2KQsqbAJASrCskJH
+3NuisxcPkmEO56pAnAAv/5AkR+HBlEef/gPqVu/jmzojMftU6poq7La95GRy5UtT
+ySjT1Z1yeEcJ91ZB/vlBSfyhOZm3EbBBHm0rNdSZTvqndSBV1Ah3WsR2sL7oau2k
+Ea/h3IJnsJRK69fS+mE+1+B+g6azFCMivoLdiPLK/M2Pb0wGSs6VaMlnl0ec66Dl
+bcUH2a/oyJCp1KQqKx07//NGzk8Qmp2qoJsoo/oPzDGyVzzK9TAF95iiLUpXYmjs
+7TGycadvAHqvbm0x0PMJIDHOtdN7Od9+rFzX0ths6T6wcJdM3gOg917UpEDgyfRe
+hCZTLWB/MJyvb5u+leZX
+=8oAg
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/makemkv-1.8.13-r1.ebuild b/media-video/makemkv/makemkv-1.8.13-r1.ebuild
new file mode 100644
index 000000000000..34a9daebc9e7
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.8.13-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.13-r1.ebuild,v 1.1 2015/02/01 23:11:48 mgorny Exp $
+
+EAPI=5
+inherit eutils gnome2-utils multilib flag-o-matic
+
+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="libav multilib qt4"
+
+QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
+
+RDEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
+	dev-libs/openssl:0
+	sys-libs/zlib
+	qt4? (
+		virtual/opengl
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
+	libav? ( >=media-video/libav-0.8.9:0= )
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/makemkv-oss-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.linux.patch
+}
+
+src_configure() {
+	replace-flags -O* -Os
+	local args=""
+	use qt4 || args="--disable-gui"
+	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
+		econf $args
+	fi
+}
+
+src_compile() {
+	emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
+}
+
+src_install() {
+	# install oss package
+	dolib.so out/libdriveio.so.0
+	dolib.so out/libmakemkv.so.1
+	dolib.so out/libmmbd.so.0
+	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
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+	into /opt
+
+	if use qt4; then
+		dobin out/makemkv
+
+		local res
+		for res in 16 22 32 64 128; do
+			newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
+		done
+
+		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
+	fi
+
+	# 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; }