commit: 534e7b287a879f6ea081e300bc7a22975d3e7e5a Author: zcj <ustcscgy <AT> 163 <DOT> com> AuthorDate: Sun Mar 8 10:51:24 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Mar 8 10:51:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=534e7b28
cdfplayer: Version bump; Patch is not needed. sci-mathematics/cdfplayer/ChangeLog | 9 +++++++-- ...cdfplayer-9.0.1.ebuild => cdfplayer-10.0.2.ebuild} | 10 +++------- .../cdfplayer/files/cdfplayer-9.0.1-installer.patch | 19 ------------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/sci-mathematics/cdfplayer/ChangeLog b/sci-mathematics/cdfplayer/ChangeLog index fff3a0a..41635cb 100644 --- a/sci-mathematics/cdfplayer/ChangeLog +++ b/sci-mathematics/cdfplayer/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-mathematics/cdfplayer -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*cdfplayer-10.0.2 (08 Mar 2015) + + 08 Mar 2015; zcj <[email protected]> +cdfplayer-10.0.2.ebuild, + -cdfplayer-9.0.1.ebuild, -files/cdfplayer-9.0.1-installer.patch: + sci-mathematics/cdfplayer: Version bump; Patch is not needed. + *cdfplayer-9.0.1 (11 Mar 2013) 11 Mar 2013; Jauhien Piatlicki (jauhien) <[email protected]> @@ -22,4 +28,3 @@ +cdfplayer-8.0.4.ebuild, +files/cdfplayer-8.0.4-installer.patch, +metadata.xml: initial commit for bug #421019 - diff --git a/sci-mathematics/cdfplayer/cdfplayer-9.0.1.ebuild b/sci-mathematics/cdfplayer/cdfplayer-10.0.2.ebuild similarity index 86% rename from sci-mathematics/cdfplayer/cdfplayer-9.0.1.ebuild rename to sci-mathematics/cdfplayer/cdfplayer-10.0.2.ebuild index b205211..231397f 100644 --- a/sci-mathematics/cdfplayer/cdfplayer-9.0.1.ebuild +++ b/sci-mathematics/cdfplayer/cdfplayer-10.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,7 +7,7 @@ EAPI=5 inherit eutils MY_SCRIPT=CDFPlayer_${PV}_LINUX.sh -MY_DESKTOPFILE=${ED}/opt/wolfram/SystemFiles/Installation/wolfram-cdf9.desktop +MY_DESKTOPFILE=${ED}/opt/wolfram/SystemFiles/Installation/wolfram-cdf10.desktop DESCRIPTION="Player for Wolfram CDF" HOMEPAGE="http://www.wolfram.com/cdf-player/"; @@ -30,12 +30,8 @@ src_unpack() { chmod u+x "${S}/${MY_SCRIPT}" || die } -src_prepare() { - epatch "${FILESDIR}/${P}-installer.patch" -} - src_install() { - "${S}/${MY_SCRIPT}" --target "${S}/${P}" -- -auto -verbose -createdir=y \ + "${S}/${MY_SCRIPT}" --target "${S}/${P}" --nox11 -- -auto -verbose -createdir=y \ -targetdir="${ED}/opt/wolfram" -execdir="${ED}/usr/bin" || die find "${ED}" -name '*.desktop' -exec \ sed -i "s%${ED}%/%g" {} \; || die diff --git a/sci-mathematics/cdfplayer/files/cdfplayer-9.0.1-installer.patch b/sci-mathematics/cdfplayer/files/cdfplayer-9.0.1-installer.patch deleted file mode 100644 index 1ec036b..0000000 --- a/sci-mathematics/cdfplayer/files/cdfplayer-9.0.1-installer.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- CDFPlayer_9.0.1_LINUX.sh -+++ CDFPlayer_9.0.1_LINUX.sh -@@ -261,11 +261,11 @@ - fi - done - chmod a+x $0 || echo Please add execution rights on $0 -- if test `echo "$0" | cut -c1` = "/"; then # Spawn a terminal! -- exec $XTERM -title "$label" -e "$0" --xwin "$@" -- else -- exec $XTERM -title "$label" -e "./$0" --xwin "$@" -- fi -+ #if test `echo "$0" | cut -c1` = "/"; then # Spawn a terminal! -+ # exec $XTERM -title "$label" -e "$0" --xwin "$@" -+ #else -+ # exec $XTERM -title "$label" -e "./$0" --xwin "$@" -+ #fi - fi - fi - fi
