Cleaning out legacy makemkv ebuilds, keeping and recommending:

1.8.10 for systems running glibc < 2.12
1.8.12 for systems running glibc >= 2.12

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

7 files changed, 20 insertions, 449 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 375ff1c2be4a..9bed01b90194 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2014/08/19 20:46:04 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.43 2014/08/20 00:37:34 mattm Exp $
+
+*makemkv-1.8.12-r1 (20 Aug 2014)
+
+  20 Aug 2014; Matthew Marlowe <mattm@gentoo.org> +makemkv-1.8.12-r1.ebuild,
+  -makemkv-1.8.11.ebuild, -makemkv-1.8.12.ebuild, -makemkv-1.8.7.ebuild,
+  -makemkv-1.8.8.ebuild, -makemkv-1.8.9.ebuild:
+  Cleaning out legacy makemkv ebuilds, keeping and recommending: 1.8.10 for
+  systems running glibc < 2.12 1.8.12 for systems running glibc >= 2.12
 
 *makemkv-1.8.12 (19 Aug 2014)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 99e80a5837a0..982796973396 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -8,33 +8,21 @@ AUX makemkv-1.8.7-makefile.linux.patch 346 SHA256 a49a2de49685f0edc0353a0a703f40
 AUX makemkv-1.8.8-makefile.linux.patch 346 SHA256 3822bd6fb206e96803a2883e68a56f8312b7c7dd3d7794cb7958465ac0fd1ed5 SHA512 fa61ecb8208b74a31e6d1c5df0027ef00af4f8c279211f2795ee010bb8a057e6b48c5b75f3a23115d82b32ded1dd679b2b15c7e51dc8d96f37b166dd37691d81 WHIRLPOOL a6e041633cbd4eeb34be3b3cd592f37e47969b2f53a2fe2f8d1adc3b536384b80bf3f3868ae741a188f358cb408d32a4607b6a3e43b9043460251bd057c08665
 AUX makemkv-1.8.9-makefile.linux.patch 346 SHA256 2db2d41fa522da3c0b61baff2f8f12241b26c6889f8ee8b27f0db12dd6a45cab SHA512 7d84d78e3ea958939e81baa2818b787bae34e60dd3f70db9a5d6d90f38f152e62d7796dc7e052444e2c02e2f5249bd56a4cfac1719758ab99e5f1d4f061c4bb8 WHIRLPOOL e025686e2e9fdd86a927601dbd86d54c7c4b02be5fdca2f638694ce14e3c7d54fcd8f225645aba3a82ea23f5e38bc380c688d82ba7f472aa14a1c7e8e73c8c73
 DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569216da654f4ee6fd3b0278dabc103333 SHA512 cfa5724b413fab608ed15e5977301f9a6fe69d787ae2ad19c3d615ec443bf7250c33f582c252f9ab1c9632d8919d252937922407158d75f8b4295eb23032f374 WHIRLPOOL 44a7df0c38ccb7693938f10f63831828ca9f3e22a627b5d4e7f23a4756f8f6edf0f27e39c75f3678fec8c18c14cf944c126eba60c211c2b5e590b029593774c5
-DIST makemkv-bin-1.8.11.tar.gz 12219849 SHA256 70079f8804f3dc86ff66bfe523e610237274dd8740f80324f39c044c58745a14 SHA512 f855fb7d3261ff397e42c8c4af27fa95d5f9dc8e468ebe1c4770f12d8ffc1a7ec79371188a5c981563d6f8c7e571546b5d2439019308a6b0a43e74bf8a64d2b8 WHIRLPOOL 0e002872a582f5f0afff17f131f8ed699f54aceae02abc1cf7ea1835900c2992f93f2467a67d33ad0a697d0b6a819fb702405e16eb221925cc4c3f748d0c04cd
 DIST makemkv-bin-1.8.12.tar.gz 12228591 SHA256 54af3d514dfcbf73ef5095b62e962f44ede15412dbf8bb7e17ca75824522a51e SHA512 ce00428630e2f12c3fe3c12a1555099fe5bfcd1c09efad7098e91ac56d1ced0cef541e8a154f14b159b056382621b240ff2135da00af9856ea62614e3092428d WHIRLPOOL 44d8125828e46507d1c1fe14afa365b4593197728cb6f4f1f7db86e12954b25709abf662b85778d5b968efa332585e2a583d5eea73e9af5c8de103e7c293fdcd
-DIST makemkv-bin-1.8.7.tar.gz 12115593 SHA256 6614e79aa7e668654fcee3d61316262b4a1ab628768a1cfe68f7d039ad289901 SHA512 27d75bfe12037e97ddc024541626334068e1b8d4c41e1920ff312f5561abc2a36ba72b45908d72fd99daaaf1b22eca01cae8997bc4f0093beec19334ef02b25d WHIRLPOOL 33571ba4b54b5722cc5d729084ef9bad92b61c8e057128fa630f242617cb9588b8f957e8aa2b27ead2846b8816776516a9f80ba9af21d70ebc82a0ab28280760
-DIST makemkv-bin-1.8.8.tar.gz 12182158 SHA256 415f9578fc842255dc8266e869444359ef3d1f3f111a61874657aa86927125f9 SHA512 7c0bad393627840358ee378512cabd5face1abec31e68ef9f1f19ef448919fdd1cc4152374eda255dc43769846d7425963772204ee514d3dc3f944afd460f7ae WHIRLPOOL fcf0b8977ba26999dbb3874175bf1c53973190493e09f8bc5fe12679f7febb21552e86fac010f9aa4c8615fe122ac316c5a1c7e7fc60dbf5c54bf45ea386da9e
-DIST makemkv-bin-1.8.9.tar.gz 12202016 SHA256 6744fe971b655d115356a8764c06cec6fbbe6bc065ef5adbed810595b43f6548 SHA512 2d580f9d4ba2220a224e00ea3a7cafeccedaa3c63ae53e38d8bced405e15bd90d40cf1e51ab1967399ad11c3508e558af7c19c2248e414fa3527c4a7f702dbf0 WHIRLPOOL 46e896d184e565d9c38ff9b3391175b8d249ce075c34a7f072ec0c5bb7a72e1728a5e1a315b583a4f6d0317d8d624ff81d80fdd65f069e584fb240e4aad205e5
 DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
-DIST makemkv-oss-1.8.11.tar.gz 4215786 SHA256 495fbb080143c8e1853c76dde81016632a03816c44dcffffddae9733619bc809 SHA512 38562de1d7b8c9a48c173d2cec2301918a48373f296d501d592ade235895624bde697e487fe27d2920e9fb4e771e0d5e83c799b545a968ff631604ee1687de64 WHIRLPOOL c3ba4e03507ef90c7d5927644f3a4713c82c49844d0deef3d6e944f04f16742e164683801fa15e41741a1e2d461320e15b54012910e4c17146c45dbc8d01577e
 DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cdc67cd3b3bcd8aebbdc3e6970fbfeaf SHA512 10870dbecf5924946e633ac1958abf7572cdc65191398b2e2e297233274f65e547d9f5cef243de434cf8d8b31fe5240ff02e8c67f7fc135ee1c7150fee30116c WHIRLPOOL 11d0248587009d31cb03493fc2110f55a99e7109aaa89db7d989059cdfdcce3ac5c6eee24b20ab343b96afa77806e06343fa7900d4c1d71635252b7a2e3d6ae1
-DIST makemkv-oss-1.8.7.tar.gz 4223036 SHA256 6a933eb027528aa9248e56f004c9c1fd9266f0810d9563e41ca6dd968381ed6f SHA512 f09beb204a17132d057768774a12a9888f9ee06a440b525cd7870d57bd4bd9a6fb7c8956cdf6729f2ca882083beae0d77a0d94b6d40d6740abddf827ae13dfff WHIRLPOOL 321372fd7c8c04b2f5335b00ad7663168f173662f2836447d83c99184b230a2354ac2570ce22f84344bb38b43cfd2dc1ae3e1703dcdd69b000bef3fde98ddb1a
-DIST makemkv-oss-1.8.8.tar.gz 4217899 SHA256 66c25d9bc341c30bc61a848cad6d1356b5f5a225cbb33a741502605984e05f59 SHA512 5fc92227e69b8796e86832432c0c94020590f8658021e7874904ab255d7e6e988807be3df43016faa876cc9aee9f6bff4cd49597b2319e6d07ae23256f8ce190 WHIRLPOOL 3454f6c1c00084ed1235a1a03adc3d3ea08f33ac581f76d062142fdc07ab7f24c496134e426997cbd957b4c5cfbd5d70361fb6680cbfdda998b3efa0e16ef05e
-DIST makemkv-oss-1.8.9.tar.gz 4215252 SHA256 2e1b6c9583ddf9a117fec815f4334bda1c8c65df9e38012eee52ee7d151dc97e SHA512 5b925497db084a8cbdbcbd5d595f414bc89303d8b697b0b23b0bb3ffd0e3e627a92fb5f28959c27757027ccfb117f0f8620591c03d099ac1cfdb9c04bea8529d WHIRLPOOL 077d62156254238440358da347b8405cb37055bb9583fa71bb7bcdb800ee4d024ac442b10a77bdd7bf7b8a97031be5df542082a3efdf55b00bc85c97516b2a71
 EBUILD makemkv-1.8.10.ebuild 3081 SHA256 8b4d0be357c6f1f603bf0e484822d3f68484b97b948801c8e894c5f31a648cfe SHA512 796fc6928d4796dfea86de4ffe560360b457f923bf03579725e8bb9d9eaec8cf98c49fe45437f9269593982a60f61d9e8f1737299a16e88cad2ebadbb3af2643 WHIRLPOOL 9930310e36ee1eb2c0d232de603ca4f6acec6dbcb39cc79b577cad0bb8a3639cde21f78cc95e7bc4d68bd6be141b9b2a99a94f5914ed63552e0108081357f114
-EBUILD makemkv-1.8.11.ebuild 3081 SHA256 cf5aed580a1c9a2c70231d4cb1f86f74d31de0b42315b551a481ed29c5179d8b SHA512 d4e6111e5c1ca41a1efb1af5ebcb57959bd7e7787d0b9e45e580a301e79703e247d08ae60489e82d9916d07bd6c585f7f1aff7390254f5262a029faa40efd4ae WHIRLPOOL 9bc40187d574dfb419fbe9b7cbaa1aabdeebe17ca494d2cb9b3f23742142c1e2993957bf70d6d7454587df5087e9ad892676eb7b93893545fe52d55c4b6d99e9
-EBUILD makemkv-1.8.12.ebuild 3073 SHA256 50131f961956993dbbaff08768ebc34ad0a5ce35fb7fdb243142ba069df76980 SHA512 ed175a22d77b4b9ef09b66eabadcceb3e8f3e7f8927845bee35eb0cf157c315db97a573d1eb163816a4046c53d6cefb0fe525a5ae5651eaec118fdc624254768 WHIRLPOOL ee3959f7ca2d44259866804b18bf0787b54894ba83075dc5dac7ce960054b66863d4b60a8df638c4b0680a6bf8499c52fbf75593653ffdcc99f62fa39bf187d0
-EBUILD makemkv-1.8.7.ebuild 2941 SHA256 55b0801ff8a45e4c6eb6977f24e50bc058b08b13f2f403b214afafbc450ddc8e SHA512 5467f6b77f235cdf1baf0fde8872962ddaec9e7da63b1ab780b054ba0403de2825773c371ad8249b2e5ba2257d6c0f59e324028a3c1f659daa1ead21df9df822 WHIRLPOOL 94dfc57b1a9cbdd706ae9d8f0adefaaab29a60b3d1792d08399b28be512533242de16b2d419e728d4372cc90969ae86a1ebd2199d63369acda052ed208e0e48a
-EBUILD makemkv-1.8.8.ebuild 2941 SHA256 8aa42b63203f8df3c55f11ebbd31c048fe1500afd7a5e41dd9e754b5825fadc5 SHA512 272b76bed29e20f944ed91c0590980a935b0cf675ef09f6afd3a4aa493acb8a46a4da0add3066dd4ac3f1e73d452fefad11c4e9798a3ecddb75439fec8bf6769 WHIRLPOOL bd0eed6a6b0b264416ca3df3ca96555b4a4e40b5ccee4425b89ebd4910436d9e5f6b8897f7ef7f2f9c9ecc8a4f30dcd82dd238e753e531878b4d9a707afbe700
-EBUILD makemkv-1.8.9.ebuild 3082 SHA256 c879c783c80296f304c8a439428e956d45e92c74f74a28f9020237996a3afc0a SHA512 460036e63d67bcb604fd0cdafb68f179e921345818e12cdb476d1364ba01cd65a8322261f2dfe99dc8d01692303568b9fe006cd5f5cc706dc69102abbe670fac WHIRLPOOL c24b1436c6fc1f29210c99cb7b293503913d8051c2600fd951b87795b16348d41d08abb1b9f73a2251994e7fb5ebfd1827a7bb35796c458dc5e2d5494f7320a5
-MISC ChangeLog 8859 SHA256 e33fb2138de2f9e1959ef9600c2ba377bd51bedb7891c07e68a9672b34873dca SHA512 568364ad8e234c74d40bab72629158962ce7dc57ab599da55a78fbbc03bf105265ccefe13936a0ca655222fb7bc0c3985631d0861bfbf4cb452b94b1dfda7333 WHIRLPOOL eab3586572fd858b6caed4918c74be5799d9c93fee7bc550b9e1c0387aaaf1fbedbbebc33510d6e64b30ed0872077569cdfcd160cb80514cd915b2f6554d316e
+EBUILD makemkv-1.8.12-r1.ebuild 3101 SHA256 7f060c7b79b258025da8995a1fc9bd80bd1afcdc519671645a4cda510debfc5e SHA512 001e147aca40e5f5809179261f0a8623e593b93dd7977195135dbebcaac856e59158faa06ed172184b520c972924c4af2d5cb2287a80e4effe89f8469a30184f WHIRLPOOL 521655aa5185ae5608e5cec95aab19bb9b50de6ff97669ebe576b925792638e1515eb920d95527bd4eac0ce2479410828d11582687e2db3ec5e2270f11094b3d
+MISC ChangeLog 9240 SHA256 c10577ba411eb9c8edbd19c464280e22d04e231e8840aee52130931e9006a5d3 SHA512 06731a9e44f1cc9cddc97505e9c2ac9a754061d27368700e180ae65b1ef5ead7f56d006796763e9aa30382f9df7bb3388cb20f6ee2c534b919f7e5ae7b7969b7 WHIRLPOOL 8cda8c4365b73e08499c0daf20b7ec86bf26f2c1e177dbb1dcc911961c6c1fae2da8f166ceea4d1fd8a554488c12854e44709dff7a899a55180d53b40f5cebba
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJT87eTAAoJEC1LWXx4YDenb7AH/1/GQhbKaC/3VN8/nytwjlua
-rn31sO7VPCtCpS+sw/WfQvdlIH78TvJKvS/ePQNaOg1gOuI+2N7+HbFNFJKrTmgd
-UKgakxYlckQr0w/5znsCLgxll00JCHEnmI0YZjGAAluiwmm7QFKLjy0x/Ais0K5W
-2M+IMCXgs0XgPVGecDZvYvlEtEZ12NJrCW5NbIXgBb1PgSg6qaUCHrkYpBH693lV
-FpdwsBsH0w0cBOJA642Q8il3gtFEmCQq4cs9LkxoDtaVYcz+LTAvk3uFVHLK1p7t
-bLzx+thg6KDFgJeA9DhEC/X91S9hLJ01uE7TunvOxrCcrzHdyZJgQcJE75l+9U0=
-=eg/v
+iQEcBAEBCAAGBQJT8+3VAAoJEC1LWXx4YDenPjwIAIAh7Yi9TNqW69pqk+uFEUqL
+sRR+WFmaaa098PKkW+QhdzqAxI8K/F5cfbvX9jtxHIgdWPBG9W+9CyEh6qW75u1n
+DixyhBJsAXvXdKWo4S+vTX03lNprdG8YLwRcpngenT6QFGlz4tevLxInDpnEcGjG
+we4qHO4e+6Dx/byiD/j+An0U8jl6Z4PcYfcOqaEP3RqtRViF27WgN0+4kHCt2uTX
+KQx8DKIZ11iDW9f0lw45BjZ+1vMpSQNhmqVkKRfWZ2lEDhmWxEdbuQDtzU23LkBe
+N3VOYN23BhG2xI/dT1RkC+F6ax8tPk2Llj+YWRebzO1QwYEP55dTCGBNffLnn/Y=
+=p5o0
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/makemkv-1.8.11.ebuild b/media-video/makemkv/makemkv-1.8.11.ebuild
deleted file mode 100644
index bb377918cd49..000000000000
--- a/media-video/makemkv/makemkv-1.8.11.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.11.ebuild,v 1.2 2014/08/19 20:46:04 mattm 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/old/${MY_P}.tar.gz
-	http://www.makemkv.com/download/old/${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"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	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
-	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'
-
-	# 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; }
diff --git a/media-video/makemkv/makemkv-1.8.12.ebuild b/media-video/makemkv/makemkv-1.8.12-r1.ebuild
index de92e2c42c54..bfe9df9ea918 100644
--- a/media-video/makemkv/makemkv-1.8.12.ebuild
+++ b/media-video/makemkv/makemkv-1.8.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12.ebuild,v 1.1 2014/08/19 20:46:04 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r1.ebuild,v 1.1 2014/08/20 00:37:34 mattm Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -27,6 +27,7 @@ RDEPEND="dev-libs/expat
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
+	>=sys-libs/glibc-2.12.0
 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
 	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
 DEPEND="${RDEPEND}"
diff --git a/media-video/makemkv/makemkv-1.8.7.ebuild b/media-video/makemkv/makemkv-1.8.7.ebuild
deleted file mode 100644
index c926fb2bcfa8..000000000000
--- a/media-video/makemkv/makemkv-1.8.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.7.ebuild,v 1.3 2014/04/25 15:17:39 beandog Exp $
-
-EAPI=4
-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/old/${MY_P}.tar.gz
-	http://www.makemkv.com/download/old/${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"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	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
-	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/share/icons/${res}x${res}/makemkv.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; }
diff --git a/media-video/makemkv/makemkv-1.8.8.ebuild b/media-video/makemkv/makemkv-1.8.8.ebuild
deleted file mode 100644
index 4360a7d1ae83..000000000000
--- a/media-video/makemkv/makemkv-1.8.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.8.ebuild,v 1.3 2014/04/25 15:17:39 beandog Exp $
-
-EAPI=4
-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/old/${MY_P}.tar.gz
-	http://www.makemkv.com/download/old/${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"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	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
-	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/share/icons/${res}x${res}/makemkv.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; }
diff --git a/media-video/makemkv/makemkv-1.8.9.ebuild b/media-video/makemkv/makemkv-1.8.9.ebuild
deleted file mode 100644
index 2d5b612d118c..000000000000
--- a/media-video/makemkv/makemkv-1.8.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.9.ebuild,v 1.2 2014/04/25 15:17:39 beandog Exp $
-
-EAPI=4
-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/old/${MY_P}.tar.gz
-	http://www.makemkv.com/download/old/${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"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	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
-	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'
-
-	# 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; }