diff options
| author |   Angelo Arrifano <miknix@gentoo.org> | 2012-09-11 18:17:52 +0000 |
|---|---|---|
| committer | Angelo Arrifano <miknix@gentoo.org> | 2012-09-11 18:17:52 +0000 |
| commit | f70df6537c1a66a0f955cd530e7ba786a1c393a7 (patch) | |
| tree | ec963bb54719fe8cabc881e17c9b308b414b37d5 /sci-misc | |
| parent | Stable for amd64, wrt bug #433603 (diff) | |
| download | historical-f70df6537c1a66a0f955cd530e7ba786a1c393a7.tar.gz historical-f70df6537c1a66a0f955cd530e7ba786a1c393a7.tar.bz2 historical-f70df6537c1a66a0f955cd530e7ba786a1c393a7.zip | |
Fix 'use' function invocation on global ebuild scope. #434634
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/mendeleydesktop/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-misc/mendeleydesktop/Manifest | 4 | ||||
| -rw-r--r-- | sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild | 24 |
3 files changed, 20 insertions, 13 deletions
diff --git a/sci-misc/mendeleydesktop/ChangeLog b/sci-misc/mendeleydesktop/ChangeLog index 63e818a3c8a9..4a12881e090c 100644 --- a/sci-misc/mendeleydesktop/ChangeLog +++ b/sci-misc/mendeleydesktop/ChangeLog @@ -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) diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest index 38c117ea6142..64cbe6285596 100644 --- a/sci-misc/mendeleydesktop/Manifest +++ b/sci-misc/mendeleydesktop/Manifest @@ -1,5 +1,5 @@ DIST mendeleydesktop-1.6-linux-i486.tar.bz2 30372064 SHA256 6eddec72db895134da730f698ba768f639101e9d0c66437f90c11f8061dbe24f SHA512 47bc381249617da50cbff9b640d831d14b4a3a0340bf6c2b2991e5c2eb157ea8f81b4a2d1820069536738027fd14b7ce41dcd86cfd8ce1a21fd7fed561b12fe3 WHIRLPOOL 07a8b840f8def8285d83cf3ebe13307f4d1594ad8be13f3ae8ed0731dc0be120e5ec61a7ecc1fff63f98921fa061fd3a2f501fe29119288dcd162e42c7bb0374 DIST mendeleydesktop-1.6-linux-x86_64.tar.bz2 30453674 SHA256 e3c47e3a938c743382d10164f5681043be2df382a2e204a7f3066b97affeb44e SHA512 c57881c5c481f4c6a2c793ff4be95238475f4951efdcdaea935b22d151d08e4c80dd135c5a12424c9ab7cd4256958897f03102eadd7d2f8dadb7e256fb6baf73 WHIRLPOOL 60c1baf6fb50d376214c1ee47b54b3d55ff7535f9265fc533f33034e30a5e9d0517e3534c87f819466440a3488bd78bac8a86be13ecfcc3e1f0f42feb4f43082 -EBUILD mendeleydesktop-1.6.ebuild 2590 SHA256 11296c1c08cfbde47b647c1e63ee2ff7fd5fe90a0e8750ce10f9bd67a0da425e SHA512 1602b7452f27d0611b196e78e33943cf5601d83ea920a5542464a82c6c1f8d033eb0930176b609fc8824cea69693c099ad09df9020b19f959cdf60669e854d01 WHIRLPOOL 19b0868e6c5f95a696a1a07514518def9a4f532d631d93cbc16a5db4940b06f889b3d352dde653f228d4a7b36e4fd9aace0275c9fc11fd867fea8cc8b230fac3 -MISC ChangeLog 1389 SHA256 1e5d800d6840db560bff48b3f4a47571986c6992652de2dd1d74c2849194cc0e SHA512 ca81886f0cdd6e2e3985a350421c6f6d600c1feb7df24ebf1723a01fdf5ef625ddec32ab2e36dfe8f4725e3411d794d07552508a1e4026e35b56cf5a1760797a WHIRLPOOL eb59809ed92b88c2f8e07673a3f2aa4cb9bfe7259c1fc8c3185a34939dea80a07b1331d087eedf5f7f5b9599130c3e140182860d66f03532b84d23cacb50a8fb +EBUILD mendeleydesktop-1.6.ebuild 2601 SHA256 50219ce17716a7efca75c09d4fdbcf00e6f873fafe061233ab058054d9bac81e SHA512 581b4ad42c4837f128110c1da1e7e6e8d61228594c72e7cf072f1dafbbd638f95b0fe77c0390aa8f5ce19ec8cf685b82ed3cf20da7b66bf1f74b928ba496256e WHIRLPOOL d7e596b9adb0363f18c5a89690e5b24a381b5da1897f8fdd9b79f9b217e71896abdea078896bb446b460068ff444945a6ebbc28c27c3c2a131b0415e17e08aea +MISC ChangeLog 1533 SHA256 2504654c733b1b748f18a28574164e1a77743a710d07281144181b344bc47cf2 SHA512 ca6bc332c0b3c5425d75c4dbb53179d5111fe7c956ae338a3d9095ae19e433df9ceef6b39fd3595deb660768270ca42dad50cd78b7de4862e9f90469cb162bbf WHIRLPOOL 13c588eff4dfe29893e625405153b71fd7b80640455262a76025e3263a9b093f20f5ee0467f617f876f49a8125111a5564ef61dc4f3bc6a30b9ba645d8ea3f86 MISC metadata.xml 445 SHA256 2079db906c94e6fb26ca86bb2c3c7edb3f3d79ad71d566fc7c5253e788a62916 SHA512 326951d95952bffc4e1c2ff41b4bcd30ca8fd56e1013bfe4a00ca16f3c4c201bc98bf5b8f438b513804851abab513600c71704745f7c1b5a8f623e4ed2ad6fc2 WHIRLPOOL 3801ee43a62e7c2071eb0e597eb3f29307a6ab04e3fb19165e316f99922060e133c8c64ee67c160231cd1c2844e9aa6aa056f312d553168db1da672859d43f1d diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild index 695821fa60ab..fc8645c37e02 100644 --- a/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild +++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.6.ebuild @@ -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 @@ inherit eutils multilib 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 @@ RDEPEND=">=x11-libs/qt-core-4.6:4 >=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 \ |