summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-06-09 22:10:19 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-06-09 22:10:19 +0000
commit2f20f7ae8e0fda4cfcd5f7604ad4620193a52937 (patch)
treedd3781b7febfb568723fd3e171252d2dad1737b1 /sci-mathematics/yacas
parentStable for amd64 wrt bug #509114 (diff)
downloadhistorical-2f20f7ae8e0fda4cfcd5f7604ad4620193a52937.tar.gz
historical-2f20f7ae8e0fda4cfcd5f7604ad4620193a52937.tar.bz2
historical-2f20f7ae8e0fda4cfcd5f7604ad4620193a52937.zip
Fixed missing include version file for java option and forced -j1 until proper fix (bug #511856)
Package-Manager: portage-HEAD/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-mathematics/yacas')
-rw-r--r--sci-mathematics/yacas/ChangeLog7
-rw-r--r--sci-mathematics/yacas/Manifest15
-rw-r--r--sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch29
-rw-r--r--sci-mathematics/yacas/yacas-1.3.4.ebuild15
4 files changed, 49 insertions, 17 deletions
diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index b59ac2b60ac0..e4f5b92d5ec4 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-mathematics/yacas
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.36 2014/05/28 17:44:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.37 2014/06/09 22:09:14 bicatali Exp $
+
+ 09 Jun 2014; SĂ©bastien Fabbro <bicatali@gentoo.org>
+ +files/yacas-1.3.4-java-version.patch, yacas-1.3.4.ebuild:
+ Fixed missing include version file for java option and forced -j1 until proper
+ fix (bug #511856)
*yacas-1.3.4 (28 May 2014)
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 701ec84155d2..c4557d13fe5a 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX yacas-1.3.4-java-version.patch 1024 SHA256 3fdd740e21cd30a204d87f59bdb5570dacf0b49437fd453f5b2819f03c179202 SHA512 d9a773528191265bb97137b5b214f3361c9723e16d11121e2497c58a2f23b62e6dbc563ae751c0e89b7a553658f968887e54a684a5ddd991c5c31c2d5fbc5b39 WHIRLPOOL 7f496410213a727439f0f1ffe3a06585a877d4f284f29a7edb299897c1bfdb93bc039a2a967a1aeb1db54149f244e04afca842cb86f8bafb222fb3089bec3b9b
DIST yacas-1.3.2.tar.gz 1292706 SHA256 82c7dc0de492b4290633e6abf18d35a2ec03117e6ea3e0f9418e6e85372c030e
DIST yacas-1.3.3.tar.gz 1296777 SHA256 6c73c653c5e13567510888800a68c14d231b1ef4f2b33193a158b8caec142141 SHA512 a0c60f78a0d3f19d5fa820bdf62b2ae25ece00f985422a17a56f091ff240b74811af1c1480c24eff5dcb5cb021aa9709664e929913a33f411e6d2b64f37d3c70 WHIRLPOOL f1334fd7cd191b1e9448efaed0542f338f35cf769ef2c6e8ca43ab0a75994aa09286fb6e5688b78927980ba4967093f971be33785f4a3d92a377532dd5e09a34
DIST yacas-1.3.4.tar.gz 1582029 SHA256 11de62f7ff014bc8a14c5f48f9c34107509506636b4701999413d0cb4dac5c69 SHA512 9ec26e2c9d5355aa124a17f7dc4164c224fed880481ebd0a672c500dae9e066e37700cbd5bf896686f713a7615a58dde7be7a7a843ab236bfd0921774dc50a43 WHIRLPOOL 1d1028083ebdb1bb4d25346200b76ab76e807174886179194bc4fffb582771861535e738d47635c5df45e21edf942458dc58221cfa7826a53df0119b71c6dade
EBUILD yacas-1.3.2.ebuild 1084 SHA256 21219c42d57e22b77e0671297b7744f0d85ea6fd73a0e1b73210cc292a49f1d3 SHA512 1a731af459e98d5826c72dd41fd06279a5d55e153346b4843ec1e2b3a5bee94447859561f9dc097fb94cf77aa2a90d7531047287bedba381bc40f53f075a1c5f WHIRLPOOL e0ccef258fea8fdf52fa36581282fddf89bd98adf75d027fea85639c1e13966ff10cf4f4baac1ed34a30d2cf45ef090e544ca9a174e96cc2da48f2c6244777bc
EBUILD yacas-1.3.3.ebuild 1111 SHA256 1355f96a8144426048d9c5cb7820338efdfeead284dbc20f621bb64a9d6f8355 SHA512 03e8e2fa4f36e2ba74910e10b4e068f015bc42ba952f87e9003d782d037df975c0c389f9544dadb09ac469b6c7a6f64199bbe215aa0c991474e8c6bcbd1e2e1f WHIRLPOOL fe476442b5016d5bad1114ac8a14058e2d5b82ba1de6db9cb9746e8743f0169762e88c13da7cca82e1af5455a495e9c10874ac537098b108965f44c5327ebddd
-EBUILD yacas-1.3.4.ebuild 1256 SHA256 80ba360e48d51e3488b63ba7f81540cc22b8e6bcbb95a47286e4ffec8eb9a292 SHA512 c8818bbf7757e0ec2e61ee5eb1652e81e8f32f62d00851863891390c2f444db65b28f84937c2d040497c9834f0127e346bde3e9805211538fb85b59fd4183fee WHIRLPOOL 7fad31ade010b3a1fd1ef4ffe908555423369ebf3b4df2ec3df412fa7bcf48ad72202334fb60e2babedb44dbd1537342b67793682fa4772bb1e3a336969f9923
-MISC ChangeLog 7251 SHA256 817cab6db1a801d6fcfb76ff673d2579376bde28d56c62c2f986791e50b54fbc SHA512 ccf88a6088c05d3c2a6b1d954b38616018c8d2b32c9dd7f00789fbd7f550f93675d088551f79087889be30b35af64d87f07a104f40a0526649dcc4b6b9a79d5c WHIRLPOOL be48fb269b6577cc31c5407892d7399b662967f653de9c6604c337a3fb583746236eac0c82e974dcd1d6b2a9e33bbb8b4a9f0405dda64bf65e6dfff1a73552cd
+EBUILD yacas-1.3.4.ebuild 1371 SHA256 695f554c3f148d4563bcadc82b437432723608b12fae9770df2e65569599da86 SHA512 eb9279a32b3cb9e6feb10e497d9dcb062ab83faad931bd3e9ad48e02fcef42e3ffd23dafec36760eab5d6151e599a8fbe2267d6c58e4fc8d419a7684aa15bf56 WHIRLPOOL 07fe70f4c20369115768f8ca972fc5bcb941edf7ef921f3a47e3e331796939bbc5f7d64912fd97387ed15a300ed28b18629fa2c81e5627f31efa61b548d16035
+MISC ChangeLog 7469 SHA256 b2f501d1cce9868be07158b9691caaa7a2016285a18031ff481216c78650bf84 SHA512 24429cc100d2c95dab993c447675fc20cc5fa6fa31b0e6fa47da057fa6863fe583e10464b9167d2a4048f64eab27faf57ab6f58b5442287afc22d62c2e9f34d5 WHIRLPOOL bbad07b59c7690fe3b8e351f380ad600db6a4d3f6198c52835e3d0be3520cbbbde02a14ec728d18bb287595b73ff4ca19f8d3cd49067ef33c7e6290c1bc932ab
MISC metadata.xml 652 SHA256 b3e57d8bd4cdd080f456ae8ce7991972cc20937bbf588fc937d3213f23686c60 SHA512 9eaac4be51d0ab535c830d0b4197f24844cfcf14a941f877e7b43191e0f8dc6c5395a43c9bb735f0c41ec9264572675139a702db2f294e8c663c4b3baae96328 WHIRLPOOL f722a4463cc9bd73b2205c5cae44230078d6d796ea5d727d683add6580be82e200377e856667e074f4c11239bb6f1d384c5c1ae2b8386a2eecfc2a2676ce04a9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlOGIJIACgkQ1ycZbhPLE2DmWACgivNkMCc6KK4ukaJNA/2B8q4e
-VssAnisogihZk2rFEqYkXCejrAJXKlJ3
-=V8Hn
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch b/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch
new file mode 100644
index 000000000000..7f6ab2da5144
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch
@@ -0,0 +1,29 @@
+--- JavaYacas/dumpversion.cpp.orig 2014-06-09 12:10:15.095959491 -0700
++++ JavaYacas/dumpversion.cpp 2014-06-09 12:11:09.565339056 -0700
+@@ -1,11 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include "version.h"
++#include "yacas/yacas_version.h"
+
+ int main(int argc, char** argv)
+ {
+ printf("package net.sf.yacas;\n");
+- printf("class CVersion { static String VERSION = \"%s\"; }\n", VERSION);
++ printf("class CVersion { static String VERSION = \"%s\"; }\n", YACAS_VERSION);
+ return 0;
+ }
+
+--- JavaYacas/makefile.yacas.orig 2014-06-09 12:11:47.516603467 -0700
++++ JavaYacas/makefile.yacas 2014-06-09 15:03:17.329987079 -0700
+@@ -32,8 +32,8 @@
+ .java.class:
+ $(JAVAC) $(JAVACFLAGS) $*.java
+
+-net/sf/yacas/CVersion.java: ../src/version.h dumpversion.cpp
+- $(CXX) $(CXXFLAGS) -I ../src dumpversion.cpp -o dumpversion
++net/sf/yacas/CVersion.java: ../include/yacas/yacas_version.h dumpversion.cpp
++ $(CXX) $(CXXFLAGS) -I ../include dumpversion.cpp -o dumpversion
+ ./dumpversion > net/sf/yacas/CVersion.java
+
+
diff --git a/sci-mathematics/yacas/yacas-1.3.4.ebuild b/sci-mathematics/yacas/yacas-1.3.4.ebuild
index a5f1a1db5218..f95600be4de5 100644
--- a/sci-mathematics/yacas/yacas-1.3.4.ebuild
+++ b/sci-mathematics/yacas/yacas-1.3.4.ebuild
@@ -1,10 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.4.ebuild,v 1.1 2014/05/28 17:44:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.4.ebuild,v 1.2 2014/06/09 22:09:14 bicatali Exp $
EAPI=5
-inherit autotools-utils java-pkg-opt-2
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit java-pkg-opt-2 autotools-utils
DESCRIPTION="General purpose computer algebra system"
HOMEPAGE="http://yacas.sourceforge.net/"
@@ -18,17 +21,21 @@ IUSE="doc java static-libs server"
DEPEND="java? ( >=virtual/jdk-1.6 )"
RDEPEND="java? ( >=virtual/jre-1.6 )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.4-java-version.patch
+)
+
src_configure() {
local myeconfargs=(
+ --with-html-dir="/usr/share/doc/${PF}/html"
$(use_enable doc html-doc)
$(use_enable server)
- --with-html-dir="/usr/share/doc/${PF}/html"
)
autotools-utils_src_configure
}
src_compile() {
- autotools-utils_src_compile
+ autotools-utils_src_compile -j1
if use java; then
cd "${BUILD_DIR}"/JavaYacas || die
# -j1 because of file generation dependence