summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2011-01-19 08:19:10 +0000
committerThomas Kahle <tomka@gentoo.org>2011-01-19 08:19:10 +0000
commit1c98393786e49587ac69bdd00212eedd6bcde3b5 (patch)
tree31764d8c419ab5cdbea8ede69385b999ab0127c5 /sci-mathematics/singular
parentFix ChangeLog (diff)
downloadhistorical-1c98393786e49587ac69bdd00212eedd6bcde3b5.tar.gz
historical-1c98393786e49587ac69bdd00212eedd6bcde3b5.tar.bz2
historical-1c98393786e49587ac69bdd00212eedd6bcde3b5.zip
Fix prefix install, thanks to François Bissey
Package-Manager: portage-2.1.9.33/cvs/Linux i686
Diffstat (limited to 'sci-mathematics/singular')
-rw-r--r--sci-mathematics/singular/ChangeLog6
-rw-r--r--sci-mathematics/singular/Manifest12
-rw-r--r--sci-mathematics/singular/files/singular-3.1.0-gentoo.patch12
3 files changed, 16 insertions, 14 deletions
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 68d35561cdc0..9b3427fd3402 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/singular
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.39 2011/01/10 20:34:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.40 2011/01/19 08:19:10 tomka Exp $
+
+ 19 Jan 2011; Thomas Kahle <tomka@gentoo.org>
+ files/singular-3.1.0-gentoo.patch:
+ Fix prefix install, thanks to François Bissey
10 Jan 2011; Thomas Kahle <tomka@gentoo.org> singular-3.1.2-r2.ebuild:
macos prefix support added, contributed by François Bissey
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index c3ec0be6c5f5..68cb3b916382 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -6,19 +6,19 @@ AUX singular-3.0.1-gentoo.diff 4566 RMD160 cbfcd5c402b753c9a09b6e2961f2eaecf56b5
AUX singular-3.0.1.2-gcc4.1-gentoo.patch 2603 RMD160 2b8ba6154bdd6e1a57f1093d966cb11874c05390 SHA1 45c479d1424993c8dc5a040dcaf58b91fc45d073 SHA256 748752eaddcbbcd181f50e497c8bdcb714f7a2f4434ddeacac679c6c0bc842e3
AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
AUX singular-3.1.0-emacs-22.patch 637 RMD160 ad6648dd733a064aa8f801056ed8f9c3f84fad90 SHA1 a0f3bc3a866618798f30fdfb97ca8e30bffc4e7f SHA256 2ae842d9636bd132271a23aa03c6810e6bdfaf0bf31b4376d8488402a41dd5a3
-AUX singular-3.1.0-gentoo.patch 4765 RMD160 9ba5f369c473c58ed28019b85a95c27eb58f495d SHA1 385b3932e1d2257fe28ee0dc5cef5729726c1b41 SHA256 ae59a98268270ef68ecb2e7f34074fa5eee379d13565a0f359c48db4f6e02351
+AUX singular-3.1.0-gentoo.patch 4563 RMD160 1bba02ab548c81a1b92e57accd977333b2a873d3 SHA1 9e7dfcef890f506c508d72dbcb54e30978308f8b SHA256 31cf4c45ad9319431efda173a8bc24a9eac609b9fd2afadbe66156bec43f9146
DIST Singular-3-0-1-2.tar.gz 10741252 RMD160 bcfb83fe7a57658865aa69fc526e01413fb3da81 SHA1 a95aa909bfa20145df0eb1a345ae1476116af5fd SHA256 3d50427b17cef0a2ac36d302bf7421a4cb06df24139d5386c64d14a07e7cd399
DIST Singular-3-0-1-share.tar.gz 3909236 RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 SHA1 d7c07192707dbc6f916b3c5d704bae216f0834ff SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2
DIST Singular-3-1-2-share.tar.gz 9341118 RMD160 585f8d77ec3624eea298b85bdd4f8d6383d63fd2 SHA1 eb98e7c63c2f73ecdee83ce45274127b8246008f SHA256 03ca31608684a02f645c3ab75fe06402fc076f05e1ed7154427855affbfab45e
DIST Singular-3-1-2.tar.gz 19564373 RMD160 53f407f62af36a8570b027c30b73c54dc106b290 SHA1 19ede02ed4cd513efd20f5a54568bc096e1d2c35 SHA256 4fbe46cca2aef42fdf73ef8556350278f9f3b3d5d0d1b8e21c1a182e59f2b88a
EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
EBUILD singular-3.1.2-r2.ebuild 4831 RMD160 b8501fb9063cdbbf0493ae600bb6391d19d7cc82 SHA1 8ca26026f2de3bee2838e25e8e7211f9c257cb44 SHA256 f4dbbb27fdc8075fe2aeb66f96bca79b265db19da76e452c2698b088a56842f6
-MISC ChangeLog 9983 RMD160 7725d8c10599d9b9ac606b3c52f033aaa73a934b SHA1 7ae268b3f494cddf06cb673a1accad5c2b6d750a SHA256 606749173c6b4d41c2d28f6141431420778a43e43f72d572cb7066da6afa2f45
+MISC ChangeLog 10117 RMD160 8b46473d600ac5f6674bfad7a884557afb222870 SHA1 8b877e8f5b0859fb5e6d3e5f258912883f59068e SHA256 38705a8ef0ca3124dbd9230d4857af84524ba2c58228d48e6349a244953dead4
MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEUEARECAAYFAk0rbPIACgkQnZsgo/h8kNYALwCfc7IpaJ5C2Mcxz0BJUVr1eXi8
-oB0AmIE/UuLS1QxU9z/zIXyaC0T4Ops=
-=wzYo
+iEYEARECAAYFAk02noIACgkQnZsgo/h8kNYWwACgtjW1LJ3ug9AQqAbE6thdF0ef
+zFoAnjpiRKAy89WoNu43h6lgQ6A/tTCv
+=t66B
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
index ecfba313e149..ebb402289386 100644
--- a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
+++ b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
@@ -1,12 +1,11 @@
-diff -Naur Singular-3-1-0/kernel/feResource.cc Singular-3-1-0.new/kernel/feResource.cc
---- Singular-3-1-0/kernel/feResource.cc 2009-06-04 04:11:42.000000000 -0400
-+++ Singular-3-1-0.new/kernel/feResource.cc 2009-08-23 19:05:00.000000000 -0400
+--- kernel/feResource.cc.orig 2010-04-30 10:20:14.000000000 +0000
++++ kernel/feResource.cc 2010-10-11 09:19:01.431179334 +0000
@@ -41,7 +41,7 @@
#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
#endif
#else // ! defined(MAKE_DISTRIBUTION)
-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "/usr"
++#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr"
#endif // defined(MAKE_DISTRIBUTION)
/*****************************************************************
@@ -64,9 +63,8 @@ diff -Naur Singular-3-1-0/kernel/feResource.cc Singular-3-1-0.new/kernel/feResou
#endif
{NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
};
-diff -Naur Singular-3-1-0/kernel/mod_raw.cc Singular-3-1-0.new/kernel/mod_raw.cc
---- Singular-3-1-0/kernel/mod_raw.cc 2009-06-04 06:18:12.000000000 -0400
-+++ Singular-3-1-0.new/kernel/mod_raw.cc 2009-08-23 19:04:22.000000000 -0400
+--- kernel/mod_raw.cc.orig 2009-11-02 10:12:22.000000000 +0000
++++ kernel/mod_raw.cc 2010-10-11 09:19:01.432179264 +0000
@@ -109,11 +109,11 @@
void* dynl_open_binary_warn(const char* binary_name, const char* msg)
{