cleanup ebuild

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index f5678bfefee85b0c472f190c7b09e70236357a93..631fde781aa748e7cad8c33a73fb553ccf9d9cad 100644 (file)
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 DIST makemkv_v1.6.16_bin.tar.gz 5877692 RMD160 9b22f4d4d2aa14d8cefae5070c35fe4955aef2f9 SHA1 fa5e26439a9c0bb238ceb53a84a2900a262dcca0 SHA256 0f0b2df68b7fc294834d7cbeda21d54884caf9e13a9b0190921dae27d7418309
 DIST makemkv_v1.6.16_oss.tar.gz 438026 RMD160 0fca584fe4a574a2a6a420cb88db687a60b0358c SHA1 009e6e21e0f270255f9b1087b70f8c46c95520ed SHA256 2cff47e51f465259704b0840717433f90e938d13fd7e18a01d674174b747f85b
-EBUILD makemkv-1.6.16.ebuild 1684 RMD160 920896aa0bf7077e6c2f6b6c8c8e864ee9d24253 SHA1 aa417a20a83a19f3b07ae7d58b87958f4ca8755d SHA256 b3e1deb4ebd440f957746b87c300616dc6359ec4c3064f9cc8e8b69c32a21a61
+EBUILD makemkv-1.6.16.ebuild 1967 RMD160 4c203ddc56d1a6dea9c02ad7a951727c05f51e09 SHA1 c4b907f1123e1ea09d24ca31d67efff202e8376e SHA256 e229f3a5a80647f3674d508bab1ece2cb7b80870ce09ef4c1461e0d4622a2990
 MISC ChangeLog 377 RMD160 1bdb848dd03518820b5242b1feaad05b9d18653e SHA1 f9d49857aa1134e08d38f144cc54238a0968171d SHA256 f05c2ed75df146c1e53c2c502b67b50c8747f6d2bf18213f9db574f6cff2b8fa
 MISC metadata.xml 224 RMD160 71a1b9f875b9de0f7a9f0dd00557874d936c5021 SHA1 2bca68cdbca3845abaaa36497a91b789eb1a89d0 SHA256 98cfdec9b1c16d801783412e122d81d3a42627c9b9595f5f8d0d8bf5ecb33e32

diff --git a/media-video/makemkv/makemkv-1.6.16.ebuild b/media-video/makemkv/makemkv-1.6.16.ebuild
index 253343b4fa30eb9d09f73a817837b2ee03950c76..5897c5f35ef71a780b4b62db23cbe52a685fc40e 100644 (file)
--- a/media-video/makemkv/makemkv-1.6.16.ebuild
+++ b/media-video/makemkv/makemkv-1.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.1 2011/12/02 20:32:19 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.2 2011/12/02 20:50:54 beandog Exp $
 
 EAPI=3
 
@@ -11,20 +11,22 @@ inherit multilib eutils
 MY_P="makemkv_v${PV}_oss"
 MY_PB="makemkv_v${PV}_bin"
 
-DESCRIPTION="Tool for converting Blu-Ray, HD-DVD and DVD videos to matroska."
-HOMEPAGE="http://www.makemkv.com"
-SRC_URI="http://www.makemkv.com/download/makemkv_v${PV}_oss.tar.gz
-       http://www.makemkv.com/download/makemkv_v${PV}_bin.tar.gz"
+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="MakeMKV-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-DEPEND="x11-libs/qt-gui
-       dev-libs/openssl
+DEPEND="x11-libs/qt-gui:4
+       dev-libs/openssl:0
        media-libs/mesa
-       x11-libs/qt-dbus"
+       x11-libs/qt-dbus:4"
+RDEPEND="${DEPEND}"
+
 src_prepare() {
        cd "${MY_P}"
 }
@@ -37,12 +39,12 @@ src_compile() {
 src_install() {
        # install oss package
        cd "${MY_P}"
-       dolib.so out/libdriveio.so.0
-       dolib.so out/libmakemkv.so.1
-       dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-       dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+       dolib.so out/libdriveio.so.0 || die "dolib.so out/libdriveio.so.0 died"
+       dolib.so out/libmakemkv.so.1 || die "dolib.so out/libmakemkv.so.1 died"
+       dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} || die "dosym libdriveio.so.0 died "
+       dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} || die "dosym libmakemkv.so.1 died"
        into /usr
-       dobin out/makemkv
+       dobin out/makemkv || die "dobin makemkv died"
 
        newicon makemkvgui/src/img/128/mkv_icon.png ${PN}.png
        make_desktop_entry ${PN} "MakeMKV" ${PN} "Qt;AudioVideo;Video"
@@ -50,9 +52,9 @@ src_install() {
        # install bin package
        cd "../${MY_PB}/bin"
        if use x86; then
-               dobin i386/makemkvcon
+               dobin i386/makemkvcon || die "dobin makemkvcon died"
        elif use amd64; then
-               dobin amd64/makemkvcon
+               dobin amd64/makemkvcon || die "dobin makemkvcon died"
        fi
 }