--- mendeleydesktop-0.9.8.1-r1.ebuild.old	2011-01-13 16:07:14.430586507 +0100
+++ mendeleydesktop-0.9.8.1-r1.ebuild	2011-01-13 16:17:40.060245008 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,15 +6,11 @@
 
 inherit eutils
 
-if [ "${ARCH}" = "amd64" ] ; then
-	LNXARCH="linux-x86_64"
-else
-	LNXARCH="linux-i486"
-fi
-
 DESCRIPTION="A free research management tool for desktop & web"
 HOMEPAGE="http://www.mendeley.com/"
-SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+SRC_BASE="${HOMEPAGE}/downloads/linux/${P}-linux"
+SRC_URI="x86? ( ${SRC_BASE}-i486.tar.bz2 )
+amd64? ( ${SRC_BASE}-x86_64.tar.bz2 )"
 
 LICENSE="Mendelay-EULA"
 SLOT="0"
@@ -25,7 +21,8 @@
 	media-libs/libpng:1.2
 	dev-libs/openssl"
 
-S="${WORKDIR}/${P}-${LNXARCH}"
+S="x86? ( ${WORKDIR}/${P}-linux-i486 )
+amd64? (${WORKDIR}/${P}-linux-x86_64 )"
 
 MENDELEY_INSTALL_DIR="/opt/${PN}"