gentoo resync : 28.12.2017

3 files changed, 6 insertions, 89 deletions

diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest
index 5f0fba24101a..c60cdd95e872 100644
--- a/sci-misc/cdfplayer/Manifest
+++ b/sci-misc/cdfplayer/Manifest
@@ -1,5 +1,3 @@
-DIST CDFPlayer_10.4.0_LINUX.sh 1315941152 SHA256 4c202541762839c766d6f484377e3413de9dd7c70f47484da615572c8e44f4ed SHA512 13205dad6d3a57937b55f41d895e6eef5c7ebf1f416622226cbe97a7de4a39c8d1b5c7424194c2aa4bca9020b52f52ef311af118d810c6065a1275e58d9580a1 WHIRLPOOL 36236338c6ec922a6294da34e5379ba5ecf087b307a484abd79c516804d1db6f859b33a1535a9dce6f1980a51972ec1ceff3b39a6270b9d9797beedabc03a0f3
-DIST CDFPlayer_11.0.1_LINUX.sh 1630401312 SHA256 0f5f89d252481ea7fb49bd6c6c9b0a38956d4f0c32c361d02a543a8582c472e8 SHA512 bf52caa6a495ce78670ab6931e8caa3167121d5193e6839bb745026883f32c536d460faa960a59e593486fbf1a90d1ca51cb8e8a52eedff20e48eb1cb1a80701 WHIRLPOOL 9946110dffe973043dc4d89fd015ebcadfbd6e747b3993059cc811ce7e8f09df37db80daf9a3701cbd09de2331c3e534a20064876eabc256561aeca9fe4357a3
-EBUILD cdfplayer-10.4.0.ebuild 2135 BLAKE2B c29db50273a9b3131f31462447931330e88b04bed6311c00eb602ce3a868077553439e47371e84f177e12584ee5452ef46b020b356225c5ceffe13e19750572e SHA512 e2e80d28a4904057b4d80514d9b157edd62b8c7538a30dcb6311ad385ec5d6eb23c530d831bad3a665d08eab9dd187f1f8639c666a65e04bfb0bd1f2349f0c1e
-EBUILD cdfplayer-11.0.1.ebuild 2135 BLAKE2B deafe6bc761c794ae90647ac27142dda47b3cbcd2281952183d86fd5b12606c7bf67a15ac4a6d7c212378d169538760b53d6c6cfbcc355334324f245f68fb256 SHA512 8a33853c1680c9948473ace3fdbb4a296bb6c12b8939669ef735aedd0384c7d140f0413f84bab5d2a4c4fb82710f68d9128be554df5a7bd7843c52f2a67ab77b
+DIST CDFPlayer_11.2.0_LINUX.sh 1821479711 BLAKE2B 7d12a94b43fdd60dc6af3d78fe45f85a2aa68752c690de023d4cd0cc5d24f8b091db7846d3732d7618d7df659b982fbcf19543d7d0c0116ddcae7f7b1aa11d88 SHA512 8a9a98ed5dceb18db41e52269dedf2a00ee89015a76eb650b852f8e1c19040918ecfa7594737f2982118c7358eab4d1e85694eecbe059edc963d4bdc8533b470
+EBUILD cdfplayer-11.2.0.ebuild 2103 BLAKE2B 2f832880dfd4d5cb4d7692830cd6e34d77658e4a41b12403a875c69cf781492533049380746e8a43e8f43a7619732ec32394f79bb51b9e34e4c1efbe986d2b57 SHA512 95ecf50e8435fdce56e90e8670fc810c56d6fb13251fb4e82a86d6ed07c982136b4c7752fda5c425458c7dc90110c8bfdb7c9864bf36fdb6fe0f6fd22390c47b
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild b/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild
deleted file mode 100644
index c8687b11278f..000000000000
--- a/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="CDFPlayer_10.4.0_LINUX.sh"
-HOMEPAGE="http://www.wolfram.com/cdf-player/"
-
-LICENSE="WolframCDFPlayer"
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RESTRICT="strip mirror bindist fetch"
-
-DEPEND=""
-
-# this list comes from lsof output
-# probably there are still some libraries missing
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	media-libs/alsa-lib
-	dev-libs/expat
-	media-libs/fontconfig
-	dev-libs/icu
-	x11-libs/libxcb
-	dev-libs/libxml2
-	|| ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
-"
-
-# we need this a few times
-MPV=$(get_version_component_range 1-2)
-
-# we might as well list all files in all QA variables...
-QA_PREBUILT="opt/*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/CDFPlayer/${MPV}" "-execdir=${S}/opt/bin" || die
-}
-
-src_install() {
-	# move all over
-	mv "${S}/opt" "${D}/opt" || die
-
-	# the autogenerated symlinks point into sandbox, redo
-	rm "${D}/opt/bin/"* || die
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
-
-	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}" -name "wolfram-cdf10.desktop") ; do
-		echo Fixing "${filename}"
-		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
-		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-		doins "${filename}"
-	done
-}
-
-pkg_nofetch() {
-	einfo "Sadly Wolfram provides no permanent link to the player files."
-	einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from"
-	einfo "${HOMEPAGE} and place it in ${DISTDIR}"
-}
diff --git a/sci-misc/cdfplayer/cdfplayer-11.0.1.ebuild b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
index 561ed97e3815..c449fbfa4514 100644
--- a/sci-misc/cdfplayer/cdfplayer-11.0.1.ebuild
+++ b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit versionator
 
 DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="CDFPlayer_11.0.1_LINUX.sh"
+SRC_URI="CDFPlayer_11.2.0_LINUX.sh"
 HOMEPAGE="http://www.wolfram.com/cdf-player/"
 
 LICENSE="WolframCDFPlayer"
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-libs/icu
 	x11-libs/libxcb
 	dev-libs/libxml2
-	|| ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
+	sys-libs/ncurses:5/5
 "
 
 # we need this a few times
@@ -61,8 +61,8 @@ src_install() {
 
 	# the autogenerated symlinks point into sandbox, redo
 	rm "${D}/opt/bin/"* || die
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
+	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
+	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
 
 	# fix some embedded paths and install desktop files
 	insinto /usr/share/applications