sci-mathematics/yacas: -v

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 10 insertions, 122 deletions

diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index 011ad83be5d3..2add54fa6f82 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
   Yacas (Yet Another Computer Algebra System) is a small and highly
   flexible general-purpose computer algebra language. The syntax uses a
   infix-operator grammar parser. The distribution contains a small
@@ -10,7 +10,7 @@
   language in which you can easily write your own symbolic manipulation
   algorithms.
 </longdescription>
-<use>
-  <flag name='server'>Build the network server version</flag>
-</use>
+	<use>
+		<flag name="server">Build the network server version</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild b/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
deleted file mode 100644
index cf8fa19daad6..000000000000
--- a/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild,v 1.2 2011/07/28 20:18:54 bicatali Exp $
-
-EAPI="4"
-
-inherit eutils java-pkg-opt-2 autotools
-
-DESCRIPTION="General purpose computer algebra system"
-HOMEPAGE="http://yacas.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="doc java server"
-
-DEPEND="java? ( >=virtual/jdk-1.6 )"
-RDEPEND="java? ( >=virtual/jre-1.6 )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-makefixes.patch \
-		"${FILESDIR}"/${P}-tests.patch
-	# needs to rebuild because tests include file modify Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc html-doc) \
-		$(use_enable server) \
-		--with-html-dir="/usr/share/doc/${PF}/html"
-}
-
-src_compile() {
-	default
-	if use java; then
-		cd JavaYacas || die
-		# -j1 because of file generation dependence
-		emake -j1 -f makefile.yacas
-	fi
-}
-
-src_install() {
-	default
-	if use java; then
-		cd JavaYacas || die
-		java-pkg_dojar yacas.jar
-		java-pkg_dolauncher jyacas --main net.sf.yacas.YacasConsole
-		insinto /usr/share/${PN}
-		doins hints.txt yacasconsole.html
-	fi
-}
diff --git a/sci-mathematics/yacas/yacas-1.2.2.ebuild b/sci-mathematics/yacas/yacas-1.2.2.ebuild
index f097b3903945..c9a4faf0fb82 100644
--- a/sci-mathematics/yacas/yacas-1.2.2.ebuild
+++ b/sci-mathematics/yacas/yacas-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.7 2008/11/24 09:40:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.8 2012/04/25 17:08:36 jlec Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -28,8 +28,7 @@ src_compile() {
 	econf \
 		$(use_enable doc html-doc) \
 		$(use_enable server) \
-		--with-html-dir="/usr/share/doc/${PF}/html" \
-		|| die "econf failed"
+		--with-html-dir="/usr/share/doc/${PF}/html"
 	emake || die "emake failed"
 	if use java; then
 		cd JavaYacas || die
diff --git a/sci-mathematics/yacas/yacas-1.3.1.ebuild b/sci-mathematics/yacas/yacas-1.3.1.ebuild
deleted file mode 100644
index 931856cf6829..000000000000
--- a/sci-mathematics/yacas/yacas-1.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.1.ebuild,v 1.1 2011/11/25 17:58:04 bicatali Exp $
-
-EAPI="4"
-
-inherit eutils java-pkg-opt-2 autotools
-
-DESCRIPTION="General purpose computer algebra system"
-HOMEPAGE="http://yacas.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="doc java server"
-
-DEPEND="java? ( >=virtual/jdk-1.6 )"
-RDEPEND="java? ( >=virtual/jre-1.6 )"
-
-psrc_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.2-tests.patch
-	# needs to rebuild because tests include file modify Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc html-doc) \
-		$(use_enable server) \
-		--with-html-dir="/usr/share/doc/${PF}/html"
-}
-
-src_compile() {
-	default
-	if use java; then
-		cd JavaYacas || die
-		# -j1 because of file generation dependence
-		emake -j1 -f makefile.yacas
-	fi
-}
-
-src_install() {
-	default
-	if use java; then
-		cd JavaYacas || die
-		java-pkg_dojar yacas.jar
-		java-pkg_dolauncher jyacas --main net.sf.yacas.YacasConsole
-		insinto /usr/share/${PN}
-		doins hints.txt yacasconsole.html
-	fi
-}
diff --git a/sci-mathematics/yacas/yacas-1.3.2.ebuild b/sci-mathematics/yacas/yacas-1.3.2.ebuild
index 6935fbe264e2..166757bd29c9 100644
--- a/sci-mathematics/yacas/yacas-1.3.2.ebuild
+++ b/sci-mathematics/yacas/yacas-1.3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.2.ebuild,v 1.1 2012/03/02 05:59:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.2.ebuild,v 1.2 2012/04/25 17:08:36 jlec Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit eutils java-pkg-opt-2 autotools
+inherit autotools eutils java-pkg-opt-2
 
 DESCRIPTION="General purpose computer algebra system"
 HOMEPAGE="http://yacas.sourceforge.net/"
@@ -13,7 +13,6 @@ SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE="doc java server"
 
 DEPEND="java? ( >=virtual/jdk-1.6 )"