media-tv/otrdecoder-bin: Use x86? as a condition for i686 binaries instad of \!amd64...

(Portage version: 2.2.0_alpha41-r1/svn/Linux x86_64)

svn path=/sunrise/; revision=12193

diff --git a/media-tv/otrdecoder-bin/ChangeLog b/media-tv/otrdecoder-bin/ChangeLog
index 67a57046e8df43580fc2d521db84829554b773d6..3fe35177d8f47426fe79fbb3fcb4decd5dc4bfc3 100644 (file)
--- a/media-tv/otrdecoder-bin/ChangeLog
+++ b/media-tv/otrdecoder-bin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
+  otrdecoder-bin-592.ebuild:
+  Use x86? as a condition for i686 binaries instad of \!amd64?, simplify
+  src_unpack() as suggested by tommy[d].
+
   02 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
   otrdecoder-bin-592.ebuild:
   Fix KEYWORDS to include -* for binary package, quote expansion of ${S},

diff --git a/media-tv/otrdecoder-bin/otrdecoder-bin-592.ebuild b/media-tv/otrdecoder-bin/otrdecoder-bin-592.ebuild
index 172b25f8d4e2f9cfe72db07f411173a5f049ad0f..a107a3fb48b28199c216fa4be17bb0510813c8ce 100644 (file)
--- a/media-tv/otrdecoder-bin/otrdecoder-bin-592.ebuild
+++ b/media-tv/otrdecoder-bin/otrdecoder-bin-592.ebuild
@@ -7,7 +7,7 @@ EAPI=2
 DESCRIPTION="Decoder for onlinetvrecorder.com (German)"
 HOMEPAGE="http://www.onlinetvrecorder.com/"
 SRC_URI="amd64? ( http://www.onlinetvrecorder.com/downloads/${PN}-linux-Ubuntu_8.04.2-x86_64-0.4.613.tar.bz2 )
-       !amd64? ( http://www.onlinetvrecorder.com/downloads/${PN}-linux-Ubuntu_9.04-i686-0.4.${PV}.tar.bz2 )"
+       x86? ( http://www.onlinetvrecorder.com/downloads/${PN}-linux-Ubuntu_9.04-i686-0.4.${PV}.tar.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -21,11 +21,7 @@ RESTRICT="strip"
 
 src_unpack() {
        default
-       if use amd64; then
-               mv ${PN}-linux-Ubuntu_8.04.2-x86_64-0.4.613 "${S}" || die "move failed"
-       else
-               mv ${PN}-linux-Ubuntu_9.04-i686-0.4.${PV} "${S}" || die "move failed"
-       fi
+       mv ${PN}-linux-Ubuntu_* "${S}" || die
 }
 
 src_prepare() {