gentoo resync : 30.09.2018

8 files changed, 202 insertions, 236 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9d7796d560dc..6227b47f8d34 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 83eb4f7eb198..7c890c23c831 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -12,6 +12,8 @@ AUX octave-4.4.0-qt-5.11.patch 346 BLAKE2B 0e9d5a2701ca789abaf9b396e5716226ce786
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
+DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
 EBUILD octave-4.2.2.ebuild 5018 BLAKE2B 31a4044ed79454e35188ca546ff21cac7868d412f3f9c8fe4230b4afba4d1c440da651b497753e6331e1ea018aa6254a9ba2de7544df1daa39925a720cf6df1f SHA512 02f48228c6e4b96ce09c860b6eb4ca07939cf813e1036314f63bd8c4f15b3702c70d16bcda94dcb6557c9ec875aa00e704bc6bfcdc943b2445e2ed57155c4bd2
 EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
+EBUILD octave-4.4.1.ebuild 5089 BLAKE2B e211985e5fa310a9259242762ff38e2c702c77abbf85c0b5f2ed5d873b8370560df1cf1777612c1e8e19b910c639f81de7040f87f2c85215cc3b6071c691618d SHA512 c3ebba7cbf16b3be54bd4b9057a44479b8d53c8981d97a7f6107a81d547a6d1bcb4a53407835699cd6a170c174521058cc529d12114f52d8565a68caa1f016f3
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild
new file mode 100644
index 000000000000..3e298f6bd613
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	java? ( >=virtual/jre-1.6.0:* )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	ssl? (
+		 !libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+	"${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# [QA] detect underlinking #593670
+	append-ldflags $(test-flags-CXX -Wl,-z,defs)
+
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--disable-jit \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		--without-OSMesa \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug 566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index feb5857222ed..bfdff6639cca 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,13 +1,7 @@
 DIST wxmaxima-15.08.2.tar.gz 5592673 BLAKE2B cacb508cbcb24e27a43998ba0079b14117980669c25b39b017c0c659ef48d2ad338c6503aea99447a14250ed1a68a3414880828fc8ffdcbd3177b8eb9355a919 SHA512 a537c49477f54df4fd9e4e42a5e0d0d740f1ede817d807a98b7cec877a3ad77b2be0a61ae487a7fa5beb193b112eca163b8873292ecab5acf118d58a91e91af6
-DIST wxmaxima-16.04.2.tar.gz 5178050 BLAKE2B 52c416040277fbbf0f8e930f3ad3b8a78f7ed65d28d31722b0fef8482df261c418185705dd00841d9975ea55838303756ca7874a0e94f174fd4274fbd2dbc5d4 SHA512 da8159e7c779f50bde7a6f6852987c18aaf724b1ebf0bdc4d231f40b80e04cee2870a520251d212681b3f0a7533d28b744d3684fc395a26d2a46b48c1a31a856
-DIST wxmaxima-16.12.0.tar.gz 4842949 BLAKE2B 668219b2602b02e49eafa2c35fa7a5cfc995691356f5ce747590aa2e516ad8c1c8a6f57c8c8e19095ff301b7fd131942ea0ed6dbf4ce3b728fbb139e2139b5dc SHA512 6a68cf6b4fdf07bef7fdd19397c226c3cf4f693aaab8ae028e6af69b114a04fa7dbf20f7f183853f8f655ef8d0bf984ee2a0af6096697ab3c454d17f37c98819
-DIST wxmaxima-16.12.2.tar.gz 4866058 BLAKE2B ee00fd9259776d1aee59f295baafd6f97c7ebf38302c8cdb8c64815f8ffdd3c76cc48df1ee6a99a5afab28a033643025dfcc0a1e75f3a54de1b94f989f40164f SHA512 346a04c56a236d42e7177da9c12d94a504df7146457394c82293884995222d647746277096c14891c217559a1d9d743963c14d65931b31350ab2480f02fd03c1
-DIST wxmaxima-17.10.1.tar.gz 8690844 BLAKE2B 63e1bd1bc15aff3eb350a522dc79027fc203226c03a3ff1967537ee004c8965d49a23432e10e3dd5670e271228d03eda1731ca16a2c4a1466a9ca1fa7127c500 SHA512 015f4a05e48d3c8918adcb4c69334b80cff8d0b97af7527742aabc438d34a6e5841e129a68f0d5e7f60c5ff7b415525874e6785c9b5a9f63925968a476ebc457
 DIST wxmaxima-18.02.0.tar.gz 10131174 BLAKE2B d2137d4dfb23244c677a64578ea8cd132514d6e80b39ed1ed938a64952fcd9928459a64ceafccd34ef925fea6161a79112da9e8091de2ba8f93b4137f3240692 SHA512 e40a5fa701bd40c279de95bc16269a72678443ef0bdb14c3770c81feeaf33ddfff6c10f00b32239adcdf696f2a449c6d88d168b732d1273764c98c6ff807fd84
+DIST wxmaxima-18.10.0.tar.gz 12144997 BLAKE2B 78cfe2cfa5532271cc07eb7bb106b0c9708df4ae3086c02a859f51affe87dd813b3ca28b7fb1137cfb2acbef4f2ce12d2464c30a6dd39d47c028cf4f6c6b030e SHA512 b8cc4288db6bd673a7de7e05d3ff9e3dec1660a78944c2fcd80422cbb6102eea81de33dbc19e7f66e31e0a044be9e935a7f7323b855a1dd3302c3763e5c98196
 EBUILD wxmaxima-15.08.2.ebuild 1653 BLAKE2B 1822797d2cf9afbd98b08d4ad3384c118c592e3bf0a40af159bcf9793ec1f18a9e4019e94a270908942101b90b53564ac7c135b8c8ed65a169f70cdfad29c3af SHA512 2cdc1c72257ffe6cbcb6c833f6c0c91b857e784d8df6abb595cf9f6172abc78dbbb558a8835e8781d0fd493f2b18358c6ee7260200c524796c2b61f607b597ae
-EBUILD wxmaxima-16.04.2.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74
-EBUILD wxmaxima-16.12.0.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74
-EBUILD wxmaxima-16.12.2.ebuild 1656 BLAKE2B c56ed7d7b05ac88ad7555183abec7a8a24f6a44b2920889c539b36c708a5c637ef36bb311df6b5f46ea58a9c1a7599678746e67bde4554190c6ccb69b37d61cc SHA512 e6452ab3a3d4ccbe71befe27477775c00bdfe1235fa10e25acc5ed8d6d528acb735937eccddc288e5a70149baeb852b17fa00d652720526f299b246b4882575a
-EBUILD wxmaxima-17.10.1.ebuild 1306 BLAKE2B 5c96b27590bf6dd78beaff9a8b8b686a4c1b7c8a49f7045eaec2beb527168b4a371bd1dbe6b918d6c137bb6b4d2e88502268d406397b7dc9d5b703d7b3443ff4 SHA512 7ad43881f4bf03c28fe46e01e35cfc9a9bab8eb49745b40e3f0fd9a6b62c630312c7a8a7c7863efdcc5bea56b2f4cc7166dce7f1f6feff2e45dcf172b7903b0a
 EBUILD wxmaxima-18.02.0.ebuild 1306 BLAKE2B e9227ebb6a08432cc507718df27e090ce4bf222ae892fa6d431b6a7ff40cc10ea6f15a3671b658455ac2668392c45c405a400984e3acfbb621da6310dcff17d3 SHA512 031882d9d1dd0ce36c43420c4ac58ae6d8d57a6c4743f58d8ebbb1087ff0ac8b29697d8539aecc75fdc19696cec47c4fa11ec232783e8b033f58f281dded395d
+EBUILD wxmaxima-18.10.0.ebuild 1330 BLAKE2B b722ebd5caddfce54a7b614c84585ef0a7da5e4f88cb9fa1d3b441fa10a640f08484c1ebeb9051c53e14402f3330f3bd8d18d5f6623dad2d8bcde39327b86cea SHA512 c296f4fca6e7c4e4d27681f3d5198c84e87fd671726a4dacd596a1ea3d2b7086308ec7465f3464698ee0a91c2b2db9816c59fe4575f0ecacc5876a4608b4ae75
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-16.04.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-16.04.2.ebuild
deleted file mode 100644
index 934805673cbc..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-16.04.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit eutils gnome2-utils wxwidgets fdo-mime
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://andrejv.github.io/wxmaxima/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	local i
-
-	# consistent package names
-	sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
-		-i Makefile.in data/Makefile.in test/Makefile.in || die "sed failed"
-
-	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
-		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp src/Dirstructure.h \
-		|| die "sed failed"
-
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/locales ; echo *.mo) ; do
-			if ! has ${i%.mo} ${LINGUAS} ; then
-				sed -i \
-					-e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
-					-e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
-					locales/Makefile.in || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-printing \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install () {
-	default
-	doicon -s 128 data/wxmaxima.png
-	make_desktop_entry wxmaxima wxMaxima wxmaxima
-	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-16.12.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-16.12.0.ebuild
deleted file mode 100644
index 934805673cbc..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-16.12.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit eutils gnome2-utils wxwidgets fdo-mime
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://andrejv.github.io/wxmaxima/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	local i
-
-	# consistent package names
-	sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
-		-i Makefile.in data/Makefile.in test/Makefile.in || die "sed failed"
-
-	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
-		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp src/Dirstructure.h \
-		|| die "sed failed"
-
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/locales ; echo *.mo) ; do
-			if ! has ${i%.mo} ${LINGUAS} ; then
-				sed -i \
-					-e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
-					-e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
-					locales/Makefile.in || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-printing \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install () {
-	default
-	doicon -s 128 data/wxmaxima.png
-	make_desktop_entry wxmaxima wxMaxima wxmaxima
-	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-16.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-16.12.2.ebuild
deleted file mode 100644
index 7a474961e662..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-16.12.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit eutils gnome2-utils wxwidgets fdo-mime
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://andrejv.github.io/wxmaxima/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	local i
-
-	# consistent package names
-	sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
-		-i Makefile.in data/Makefile.in test/Makefile.in || die "sed failed"
-
-	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
-		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp src/Dirstructure.h \
-		|| die "sed failed"
-
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/locales ; echo *.mo) ; do
-			if ! has ${i%.mo} ${LINGUAS} ; then
-				sed -i \
-					-e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
-					-e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
-					locales/Makefile.in || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-printing \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install () {
-	default
-	doicon -s 128 data/wxmaxima.png
-	make_desktop_entry wxmaxima wxMaxima wxmaxima
-	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-18.10.0.ebuild
index c121ca2e948d..56c7b4a3e198 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-18.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ PLOCALES="ca cs da de el es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_
 inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://andrejv.github.io/wxmaxima/"
-SRC_URI="https://github.com/andrejv/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"