[gentoo-commits] gentoo-x86 commit in sci-misc/mendeleydesktop: ChangeLog mendeleydesktop-1.6.ebuild

[gentoo-commits] gentoo-x86 commit in sci-misc/mendeleydesktop: ChangeLog mendeleydesktop-1.6.ebuild

[Angelo Arrifano (miknix)]

miknix      12/09/11 18:17:53

  Modified:             ChangeLog mendeleydesktop-1.6.ebuild
  Log:
  Fix 'use' function invocation on global ebuild scope. #434634
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sci-misc/mendeleydesktop/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	10 Sep 2012 13:42:02 -0000	1.6
+++ ChangeLog	11 Sep 2012 18:17:52 -0000	1.7
@@ -1,6 +1,9 @@
 # ChangeLog for sci-misc/mendeleydesktop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v 1.6 2012/09/10 13:42:02 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v 1.7 2012/09/11 18:17:52 miknix Exp $
+
+  11 Sep 2012; Angelo Arrifano <miknix@gentoo.org> mendeleydesktop-1.6.ebuild:
+  Fix 'use' function invocation on global ebuild scope. #434634
 
 *mendeleydesktop-1.6 (10 Sep 2012)
 



1.2                  sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild?r1=1.1&r2=1.2

Index: mendeleydesktop-1.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mendeleydesktop-1.6.ebuild	10 Sep 2012 13:42:02 -0000	1.1
+++ mendeleydesktop-1.6.ebuild	11 Sep 2012 18:17:52 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild,v 1.1 2012/09/10 13:42:02 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild,v 1.2 2012/09/11 18:17:52 miknix Exp $
 
 EAPI="4"
 
@@ -9,12 +9,6 @@
 MY_P_AMD64="${P}-linux-x86_64"
 MY_P_X86="${P}-linux-i486"
 
-if use amd64 || use amd64-linux ; then
-	MY_P="${MY_P_AMD64}"
-elif use x86 || use x86-linux ; then
-	MY_P="${MY_P_X86}"
-fi
-
 DESCRIPTION="A free research management tool for desktop and web"
 HOMEPAGE="http://www.mendeley.com/"
 SRC_URI="amd64? ( ${MY_P_AMD64}.tar.bz2 )
@@ -36,18 +30,28 @@
 	>=x11-libs/qt-webkit-4.6:4
 	>=x11-libs/qt-xmlpatterns-4.6:4"
 
-S="${WORKDIR}/${MY_P}"
-
 QA_PRESTRIPPED="
 	/opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec/.*
 	/opt/mendeleydesktop/$(get_libdir)/lib.*so.*"
 
 pkg_nofetch() {
-	elog "Please download ${MY_P} from:"
+	elog "Please download ${A} from:"
 	elog "http://www.mendeley.com/download-mendeley-desktop/"
 	elog "and move it to ${DISTDIR}"
 }
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}"
+
+	if use amd64 || use amd64-linux ; then
+		mv -f "${MY_P_AMD64}" "${P}"
+	else
+		mv -f "${MY_P_X86}" "${P}"
+	fi
+}
+
 src_prepare() {
 	# remove bundled Qt libraries
 	rm -rf lib/mendeleydesktop/plugins \