Hopefully final fix for Bug 439380

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

4 files changed, 22 insertions, 113 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index a6891796aeba..2a85ccddf57b 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.17 2013/02/22 11:05:41 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.18 2013/02/22 12:56:13 mattm Exp $
+
+*makemkv-1.8.0-r1 (22 Feb 2013)
+
+  22 Feb 2013; Matthew Marlowe <mattm@gentoo.org> +makemkv-1.8.0-r1.ebuild,
+  -makemkv-1.7.8.ebuild, -makemkv-1.8.0.ebuild:
+  Hopefully final fix for Bug 439380
 
   22 Feb 2013; Matthew Marlowe <mattm@gentoo.org> makemkv-1.8.0.ebuild:
   Minor fix for icon directory.  Continuing to work on Bug 439380.
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 3490dcdecd98..78d5f06c1eb4 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -7,22 +7,19 @@ AUX makemkv-1.7.6-makefile.linux.patch 592 SHA256 85ec887388dba2bfde25138ee21920
 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 afcd8a8f87ef3b1ffdbc4da54bc9fcee50df57a15b0d3ccf48061a738425589d SHA512 e9feca180b4599580e36a83970f04101d964a554d1cf3c5906037057208602c1a518671bc187f8960154098925002a789067c03593b870657130780e75e1ee40 WHIRLPOOL 62e41964effb8d7394dd9c6550923596424cdd93d42392accd0549c31ee64985b8a930720a3c2f7a3f5e647ce2b0aa80da79cef50a235b536e9915ef63b788bf
 AUX makemkv-1.8.0-makefile.linux.patch 580 SHA256 b6559cfcf534fe5ee855f9b0a774c240fa5a82d9a77b20a0669a78fa4da306e4 SHA512 b06502ad59147eb98b844d366b6d659fa1e377cc0dc6a8d81518af4fddf595cfe006efda27d7c7d51dd7e6ee54227629b40439a56b1582a525efabba8506d275 WHIRLPOOL e639e2880f9087401330420202567d4311ec15b13e02935525d20ef8b79a58c8f892b2aaee99b41df9b2f4e5fc888da0dabd9965fd00b8bea8f0fcaec114a957
-DIST makemkv-bin-1.7.8.tar.gz 6817550 SHA256 76fa7a58e986537663c4fe8e6dd429f818d494133f9cc26052b7917e9d38d395 SHA512 251c30659d2e202b3a7197618feedfb1b0db38bde9ae573191578b4d19dbc0a87925d8bfc219e043678fa69bedfc0615e2db7fe04f9aa800ea06643aa089042f WHIRLPOOL 997762677f030f862af1e89315e226b3a3928a9a2cb6e2c6c0e690a009de2b61a41050da4d77bbd09ed9040a6349cb7f9a7273318a78bfa0cd97eabb4797fc40
 DIST makemkv-bin-1.8.0.tar.gz 4843544 SHA256 0c8c4914336c8d864bac81222eb555f37b0f5aa4755767618176c5b25b2e86b8 SHA512 f20332d7cebb140611e8209ccdd99eaec6c04d57df2eb4e0b02c24126447a99bbaf1f422b01c2fad951bcec82dd7770f8f1915be31b64b0c4321eb67193959da WHIRLPOOL bedd7f23a19dda25f8053516c9c12279a958aa610fdf64c7f4261964b82dd954a9862063e65c813c0b39cb081a3027359ace83372c1037bcef161354b6097251
-DIST makemkv-oss-1.7.8.tar.gz 493693 SHA256 f972df373570ea0f3cc8f829c23c9f3efc23a89c7b38f7c07869fdbb9dc8ab37 SHA512 f6d51f27afde358a81c6734fee8f2af63e6573371ecafd2a19374d26ec6c48e23b32dbb17ab56fdbf00ebd445586ff6ee856aeb666498e755a9868f6d9b49bd3 WHIRLPOOL e2d5753b149d280557ff506adc64ff37a00da5050574cfa23c395c52c4cf44e67e57b1ead5830d7b0563dd3e08e28ce36e111cae9e7900ed9983bd2b64c5cdbd
 DIST makemkv-oss-1.8.0.tar.gz 4108929 SHA256 636ab28378b6301f4f83a31695877452cc041777bfbdb622889b89ffe7ad414e SHA512 c7db83ceca9d609325abade39f12a8c323091146a0f35abe25f249f5c1887a294828d9b2cddf61302255533a6ebf137dec56158a642ca40d9690b6ccc5ca7187 WHIRLPOOL 7c1223fef4a23b6164db989f2326cf9514fffa990b46a76c3bb79174b1790a60e846e897bca0591aba301554d1f1df756eb2311031425b7a95253ea82b4b191d
-EBUILD makemkv-1.7.8.ebuild 2763 SHA256 1ba5547e0f02d492be248aabd861d5b4282943cc0162ba4215db6b145c748c98 SHA512 b08ddbc34d8fdef80af99e819d3c5a4ce86a9417f6aa339a10fd20f01dfdfb53521a3b08d7a250f7419f807ae37839ea6d9206c78eb0f8c431999682c8abe108 WHIRLPOOL 81ea3c0cfe019c580d42e9149f3b5da9624eb869899e7adfd454beeeaf9a990666cb01379c0fad915063fdcafdbcc854af3a44a651ae94bd6e863ea0451f3236
-EBUILD makemkv-1.8.0.ebuild 2765 SHA256 e7bf46061fbafdeb5b0cb43ce096d170d29d5c3768dbf6bdd14ba7575a3020ef SHA512 394349916bd7c3cc2e7edfc8e19e38f91c6e7f96f1107faf055d90cf60e62b8d85e237a800b25d94abb472aecfabd54594b9fe2275622bb35414f2e8dbb874e5 WHIRLPOOL 328f6bc5ef21ffbc1e7fc496e6a37451368733191d756da26fedaae9a65ed60b60d109c577182aba6396dbb1be93315422990f5cabe6a42913614a0eeadb9fd2
-MISC ChangeLog 3387 SHA256 b755e59401f83af9398b2011f18aaed3ae2ab2be42f0e50d572008aa83439aaa SHA512 88b26b1000cf269e0ed923da3d33fcb93aa34932a069b44f40b527a3edc816d40786186cc46b6e3aa08db3f47199e5a399a8c6db535bf1c7e65872fcf6ecd5c0 WHIRLPOOL f0e6cec07159db3784e829b6f220107354601731f2228fec031cfd7a447b952f48c855fd0d2d8a22f1c6812bb07dbc1b1ddcab00bad247adfa286c678825875d
+EBUILD makemkv-1.8.0-r1.ebuild 2825 SHA256 03a7a55dee5756eec8396b9f713525f91d761c4c9175dbd9ecfc9679bae97f3e SHA512 f122e950f9020ce34b71701df55bc48fc28e49179e5a4810202d616e9cf0f59e0343033822b7a8d159121e5aa45262200fadf927d615ba569f843012f0281e20 WHIRLPOOL a51428e911994d0d34a61811b0b9f014a3e3a9086062e052f7d0114ae1feacfc8978eed35b9eb8b1323b4f90c7d0c39e778ae88e4fe37c33a537e4b3f9d40b74
+MISC ChangeLog 3582 SHA256 ef72f8e635186daefd6b79a6a8db7ba8f3cd61e7c0b4c2d10e578869199cf2d5 SHA512 174f6e8711fcf6f67adf21dc354fb83aaa57de81b6709bc84f7331bf21c7b6e5cd8dca7f77d1278120387207010acfdfb66d671545483444aff430f718baa9f2 WHIRLPOOL 2fe3fed8cdb33dc533a11252b0608101c95714b40479d4747aafcf1181a89aa1881e90bbcd92680a3a428f52315c3337f10d04e76e152ae779bdafe5d15ca925
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRJ1ELAAoJEC1LWXx4YDenQJsH/iRqHcdYzthHEfYLwuUEPa1E
-wu5M+g+RCeQMl7TQ/iNr+PmMakqxoCMpM1WwBxA5AZLYe0Q6qjujVhOvQkQH296O
-FmUlzJCK5c655QysrJ4Fborm8Sdnv0gn+X3HwGvHTUMJa6DA/t3T05JsS8E194VK
-HpF1fWRFJFGjHiYVEZQSzvl8g51rhP+OXBVeUXU4GmCr3pdAxBEwbrzRGlP/RGgs
-T/yjTNOn5lAFZjx8vTkKr2OsZlgIM2LAuljSwQjk9iaZj4uOynJCPUeeKm5cqiAs
-90yEOoe2ApxDWGipXHdMufhvw+2eyqb+E8WSb6jTySGKyVnDmFzQfe9ILxh2/1s=
-=6gaS
+iQEcBAEBCAAGBQJRJ2ryAAoJEC1LWXx4YDenNccH/1S+nc3/HC7M1efpyQmgqVR/
+svjZLPBpDjEAPGsCtb5g+ucNoFW2jJBgeU81j9z6cmOJ5IPpWcVwklLqkD2GOj6c
+DC0fc+5zEqIqyF0ryYq4QdW2PacFO6LXDsOOu1i7i7STnvl+BzahYKwgNab1ltL2
+BaggTFOx6CUnDj3zHMiJIRy7SZsTCMI4O7HbVTIUqBDXLH34KlHvI3meDQn5b/YQ
+W26IqJQZaJDtvt2gV6BSrI3lZQdpjcCfiv9n0qwEphA6oFDuVIuvn1G+ME8xBnBy
+QFmnFIZzCxfHGE5ZiY4a17mBDy6puA61Ze7kQv/UiEztSP7A5DGXv5xUqXwoNKM=
+=V+TM
 -----END PGP SIGNATURE-----
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 d8eedce1cc20..000000000000
--- 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.8.ebuild,v 1.1 2012/11/25 18:02:25 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/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"
-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; }
diff --git a/media-video/makemkv/makemkv-1.8.0.ebuild b/media-video/makemkv/makemkv-1.8.0-r1.ebuild
index 709e8d1ff702..15e56519269b 100644
--- a/media-video/makemkv/makemkv-1.8.0.ebuild
+++ b/media-video/makemkv/makemkv-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.0.ebuild,v 1.3 2013/02/22 11:05:41 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.0-r1.ebuild,v 1.1 2013/02/22 12:56:13 mattm Exp $
 
 EAPI=4
-inherit eutils gnome2-utils multilib
+inherit eutils gnome2-utils multilib flag-o-matic
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -37,6 +37,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.linux.patch
 }
 
+src_configure() {
+	replace-flags -O* -Os
+}
+
 src_compile() {
 	emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" -f makefile.linux
 }