From 3319f51ec19fe3c69de6dcfe7f931b2382716548 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Mar 2017 11:44:12 +0100
Subject: sci-mathematics/yacas: Minor fixes

Package-Manager: Portage-2.3.4, Repoman-2.3.2
---
 sci-mathematics/yacas/yacas-1.6.1-r1.ebuild | 54 +++++++++++++++++++++++++++++
 sci-mathematics/yacas/yacas-1.6.1.ebuild    | 47 -------------------------
 2 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 sci-mathematics/yacas/yacas-1.6.1-r1.ebuild
 delete mode 100644 sci-mathematics/yacas/yacas-1.6.1.ebuild

(limited to 'sci-mathematics')

diff --git a/sci-mathematics/yacas/yacas-1.6.1-r1.ebuild b/sci-mathematics/yacas/yacas-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..66d4e6ae5dac
--- /dev/null
+++ b/sci-mathematics/yacas/yacas-1.6.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit java-pkg-opt-2 cmake-utils
+
+DESCRIPTION="General purpose computer algebra system"
+HOMEPAGE="http://www.yacas.org/"
+SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+SLOT="0/1"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gui java +jupyter static-libs"
+
+COMMON_DEPEND="
+	gui? (
+		dev-qt/qtcore:5[icu]
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtsql:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+	)
+	jupyter? (
+		dev-python/jupyter
+		dev-libs/boost:=
+		dev-libs/jsoncpp:=
+		dev-libs/openssl:0=
+		net-libs/zeromq
+		>=net-libs/zmqpp-4.1.2
+	)"
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx )
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(usex doc)
+		-DENABLE_CYACAS_GUI=$(usex gui)
+		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
+		-DENABLE_JYACAS=$(usex java)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-mathematics/yacas/yacas-1.6.1.ebuild b/sci-mathematics/yacas/yacas-1.6.1.ebuild
deleted file mode 100644
index f6ac813dc00f..000000000000
--- a/sci-mathematics/yacas/yacas-1.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=0
-
-inherit java-pkg-opt-2 cmake-utils
-
-DESCRIPTION="General purpose computer algebra system"
-HOMEPAGE="http://www.yacas.org/"
-SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-SLOT="0/1"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gui java +jupyter static-libs"
-
-DEPEND="
-	doc? ( dev-python/sphinx )
-	gui? (	>=dev-qt/qtcore-5.5[icu]
-			>=dev-qt/qtgui-5.5
-			>=dev-qt/qtwidgets-5.5
-			>=dev-qt/qtnetwork-5.5
-			>=dev-qt/qtwebkit-5.5
-			>=dev-qt/qtmultimedia-5.5
-			>=dev-qt/qtsql-5.5
-			>=dev-qt/qtprintsupport-5.5
-			>=dev-qt/qtopengl-5.5
-			>=dev-qt/qtprintsupport-5.5 )
-	jupyter? (	dev-python/jupyter
-				dev-libs/boost
-				dev-libs/jsoncpp
-				dev-libs/openssl:0
-				net-libs/zeromq
-				>=net-libs/zmqpp-4.1.2 )
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="java? ( >=virtual/jre-1.6 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(usex doc)
-		-DENABLE_CYACAS_GUI=$(usex gui)
-		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
-		-DENABLE_JYACAS=$(usex java)
-	)
-	cmake-utils_src_configure
-}
-- 
cgit v1.2.3-18-g5258