Fixed for newer glib and added a prefix hack to link with fltk for native graphics

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

4 files changed, 120 insertions, 20 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 2bcb2053138e..0b4190c2ee4d 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.127 2012/06/11 22:33:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.128 2012/07/05 18:04:26 bicatali Exp $
+
+  05 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/octave-3.4.3-gets.patch, octave-3.6.2-r1.ebuild:
+  Fixed for newer glib and added a prefix hack to link with fltk for native
+  graphics
 
 *octave-3.6.2-r1 (11 Jun 2012)
 
@@ -769,4 +774,3 @@
   19 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog, octave-2.0.16.ebuild :
   Initial commit. GNU Octave is a high-level language, primarily intended
   for numerical computations. It is mostly compatible with Matlab.
-
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 87092f690c28..e2fecdb1b24e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX octave-3.4.3-help.patch 579 RMD160 89ef378589770d95a99503f423557c3d78fe4af1 SHA1 d39d54763ac86114029f8bc5d60763d2adce27bb SHA256 786d6a265d9efa5c606ad84b8d957cf6d0143dae1667d5848ac323e2746d7c77
-AUX octave-3.4.3-pkgbuilddir.patch 1396 RMD160 e86897cc0ca2c9eec255f7df0be2a5601db623f5 SHA1 3d15c240c67c59844b1b1ef98464ca5bf6e794fd SHA256 9861eeb31f576058798e21442be34a3e467c906f75c08843fcd6e14af8892e0a
-AUX octave-3.4.3-texi.patch 375 RMD160 c7938645de3339143e7989c518a9f7930bcb53a7 SHA1 89da9e09de322e905da5cd22d1f25c7851c7b3f0 SHA256 91fb6bfb0825e8159fa38c1f2113a1fc831c3156f0674f49145e6f0f83ff43e7
-DIST octave-3.4.3.tar.bz2 15085117 RMD160 d6f43fca9097b40f163c140db853d8ac1383ab39 SHA1 fe622c28a38f8730c59e46211bc7b18e7f51a679 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148
-DIST octave-3.6.1.tar.bz2 15387369 RMD160 e57ff05ee14cce60de781233c1b4e6febef89416 SHA1 46fdc0b3d7db1b0266975a7443e26769c939a9c7 SHA256 f8073ee7570d8ff78864868027ef1e08409a78e0798d8800fac67e7e714eadf6
-DIST octave-3.6.2.tar.bz2 15418829 RMD160 1bf26b238d2bba461c5902d091088533c733439b SHA1 145fef0122268086727a60e1c33e29d56fd546d7 SHA256 0bb69b93d0bee872308a7944f1ebbe948f55cd4ae55beab38f05950e1b45c4ae
-EBUILD octave-3.4.3-r1.ebuild 2750 RMD160 ab149d097fa1b1195d3eca1bbdb883f72d51bb35 SHA1 bd65a966d3483172c6503521f05bdca8e79e55a2 SHA256 36ba35598396f0048d38fdf96d7f432b7f0a4ae23d65d820b3d962bc65cbef15
-EBUILD octave-3.6.1.ebuild 2798 RMD160 f3e66715b469779887e6bcdceb7d604e8d6e63ed SHA1 5d370de17da221305df6e44f090cfd193194c9a2 SHA256 500b20b0975a4df55d23cdde601acf61bce6f6112b9ba30298f54a5a98bbc589
-EBUILD octave-3.6.2-r1.ebuild 2994 RMD160 82425924ace0ba3d54dd4ad9b03d1fc3e01183f2 SHA1 ffa0648352b873eaba3e8ea08946009287034548 SHA256 859f3b3fcf2af00be67a83dd4d902c5397bcbfaf7d8a4ae633758512f46768c6
-EBUILD octave-3.6.2.ebuild 2806 RMD160 62acf75aab9f02c3951663e1eadc26e2538a1065 SHA1 e705de574000736a01d5437f8ed343ac0e22eaad SHA256 6f1be74bb44af1a02b0031b1549a75bdd89c62ceff71fae6dcef889d835f4604
-MISC ChangeLog 31020 RMD160 8811f0b5fcfb1a67c8c73b0b3507824c7af1afcb SHA1 489f3889fd3f84b8d6f37b1698e291f243160dde SHA256 0e84ffbbd9974a6e4d3893a28da6c543a44837c4e1753cf745a56b1546291236
-MISC metadata.xml 928 RMD160 28d79a8597076528a69c31aae3b7d208a3296e6e SHA1 bd294c06bdf3bb9753f0028d596008fb1b1126df SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef
+AUX octave-3.4.3-gets.patch 3343 SHA256 6527b960fbc86a622ba8633c6a73f629efc763557693e3cfa0ba505d73f0ec5a SHA512 4ef75b39461dfdbb342473b42104a5386bc49174bd132a0b54bf8b726d47f65982c2e8a07f001e4e7af5dd4631c1d5d5d1d4c1f9b06485313f77a312afe34dad WHIRLPOOL 02e6efbe9218603fb7907a3acc14a61b7b61e00019c491c2ef7450f560dabf5965c1a005aa93d756510e3cf94a17707f496df7005f8a1a9f444751e7b6b4d806
+AUX octave-3.4.3-help.patch 579 SHA256 786d6a265d9efa5c606ad84b8d957cf6d0143dae1667d5848ac323e2746d7c77 SHA512 322f8513f71a2769510d759865f1476a3263f11f81885c2e6da75fbb157f87e9fe4c0a0e23032521b082fc70cc0d4b86e52855b6e19d077de266da59d295299a WHIRLPOOL e5ad17c2337c307bbb06f76b71448fd383bbfd5538f3f4d79a5cf2ee0ed80d522b5d933cf523e31560f2d6765e5ebf53b8a1eca9932f53f279f87c42eaf85cc8
+AUX octave-3.4.3-pkgbuilddir.patch 1396 SHA256 9861eeb31f576058798e21442be34a3e467c906f75c08843fcd6e14af8892e0a SHA512 f2c98d12cda18df8d6bd02e2e12a9af25c8b7c129922506054d4f5fb1e8d21de912fc4eed79deae7027904a5696335f001d1989ad87cb4a62f3b1f4fff453daf WHIRLPOOL cec593c6ff649b019bb5931706cef7fb9112cb7adf747050e34cc4e973f88f9e924697e79dc203148e1c2f95ac2a8cfb3ffd03baa37c218f4dc6f75dadb87f74
+AUX octave-3.4.3-texi.patch 375 SHA256 91fb6bfb0825e8159fa38c1f2113a1fc831c3156f0674f49145e6f0f83ff43e7 SHA512 d6d917f421c5c51dd02d01599d312d03d3f1dbec029862fcab5268527f95d8ffe18db86dbc56827b6a8741fb08856ab66a68e6fa965a90397d3a22a14e87b5b8 WHIRLPOOL 0ef4ccd18689190240064cc8fac7df52b7ffb3993b5a8ffb8591e922b935387864723d4cb58d6e0f9be72c1912cca7e49322c5f6098912868c7ae2f6b2ae826b
+DIST octave-3.4.3.tar.bz2 15085117 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148
+DIST octave-3.6.1.tar.bz2 15387369 SHA256 f8073ee7570d8ff78864868027ef1e08409a78e0798d8800fac67e7e714eadf6
+DIST octave-3.6.2.tar.bz2 15418829 SHA256 0bb69b93d0bee872308a7944f1ebbe948f55cd4ae55beab38f05950e1b45c4ae SHA512 445a1f9b764c874aea738d698490f30331b1a304605ef2926bff8ee64969101af23f90acf7b6ef68f1ea0f70b38e68447173c01bb6ae509493b757360a9bd6e5 WHIRLPOOL 83b037038e07298e01da261675a5c7164d82a082ac2e7b5fddec586c48c5e3685695101168b7c01d797d6092ed801b056c9f4c71296c2b78f6f845060de7bae3
+EBUILD octave-3.4.3-r1.ebuild 2750 SHA256 36ba35598396f0048d38fdf96d7f432b7f0a4ae23d65d820b3d962bc65cbef15 SHA512 dd5385292e992c6420fb125e3ab649b4f40cc50f48c711ec8bf513f4c302610dfbbdb4fff6136bc750617143ec33f55bf320a398a0f1e37b90b66be93daa8891 WHIRLPOOL 43b55d6e6933872bced5ee24a64b43413fbb0ff1878c5829f75d7b9f1764700df2549863b167b95a6e1947b5eec5928c27d5d3f553a627da79b75feb6d0c8d40
+EBUILD octave-3.6.1.ebuild 2798 SHA256 500b20b0975a4df55d23cdde601acf61bce6f6112b9ba30298f54a5a98bbc589 SHA512 0962dec8f1bc281439b102b2fa8f6522d51394dedd44b5211657bf18de138f0fa829ba4588f0d2384ca52a323084817078e7e409f521dc9ffd8a34633718cd52 WHIRLPOOL fb066b0fb968535e910f06b15a2a5e7cf35bdbc09d2365507001c0bfc30644b207d120943dabbdcb1ad510aeb22a8644e881bd539888acf8781c178731fe913b
+EBUILD octave-3.6.2-r1.ebuild 3233 SHA256 3977ae254715b9e7e6ee6a620d70616ab7d9294d4503631bc565dc621153ecdc SHA512 3fbcdcac5c4beb2417d16973b17adf29d8044c8e9e6ed08a6143d6ae36c6996f6e522695a917893f08af938e83dc6984ee3e737e5cdacfac14571a590e864c25 WHIRLPOOL 9d4ef4f47a559b2b9a9fc5af0a8544f9d5295ae3f93ebf310884a97eff1daca146e5ae032bb4e89ce45839dc4f563756e0c2be584b14a17b6d09d5eee1a30df4
+EBUILD octave-3.6.2.ebuild 2806 SHA256 6f1be74bb44af1a02b0031b1549a75bdd89c62ceff71fae6dcef889d835f4604 SHA512 d3b95ffb342d811b0e9e23f92f5bd72b356d7569f604446d45ec9f3c67e6000d87119291dce81189c4acd44f2fb0c433d31a79ea4e7e17aca5bcd0c355f9f288 WHIRLPOOL e0c745e894f86d27873ef45f8df55c49b95e6007dd5b3562e7868393a6bcb1dfe1d549f70bfa6a91f59ffd59661461220c8f00437143b9e9d99401de78d516e2
+MISC ChangeLog 31220 SHA256 62d3e5dfc25169027f7961ecea900e005ef1969de94a5f6f0d05878b7e53b3b5 SHA512 01aab7694877ee1c7317e871dcfc2bac800924037884d8feee3419f40ae018b0a4e660afadc0fbc29ad712b48eb47d1927c941f1b23d3a3287c22ae73b676d02 WHIRLPOOL f043b35a080578307b7af5ead8573d35cb0989f1c3c5680d0f1e8a8fe66da87db2f2d92b594dd56bf43e19ec2b7858a415ed943153141f05a0ab75d6601f1f3a
+MISC metadata.xml 928 SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef SHA512 d17cff883a7f83762e7f5d325b273820aa26d37cf4e2c167a4ad124330a182735f0e9bdd26be7493a8f78187adf007b89ddb73abba26b0fa0ff8e873d2abf53d WHIRLPOOL b3803f8afcb8ddeb38a25b2709e7a8aba95b588e445205afff1e971d1387e0f226079336b6d8794a6877526d59a893d4d95b82a947aac2b73fc567cab4fd47db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/WckQACgkQ1ycZbhPLE2DfjgCbB9j1t6im8FKKjkgRx4B8WUID
-FK4AoLH5XE3OE6GOc36I1+VYEsj+YIQ2
-=4D7x
+iEYEARECAAYFAk/111UACgkQ1ycZbhPLE2BG9QCfXCwuHfEUvDYE8yjruSrlqMaB
+xC0AoJHpleQnEbAmCNDOAak0Kr+5qXP9
+=MVD7
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.4.3-gets.patch b/sci-mathematics/octave/files/octave-3.4.3-gets.patch
new file mode 100644
index 000000000000..8288b7becab8
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.4.3-gets.patch
@@ -0,0 +1,85 @@
+--- libgnu/stdio.in.h.origs	2012-05-24 12:46:13.000000000 -0600
++++ libgnu/stdio.in.h	2012-05-24 16:29:54.813734894 -0600
+@@ -1,12 +1,10 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* A GNU-like <stdio.h>.
+ 
+    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3, or (at your option)
++   the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+@@ -15,8 +13,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program; if not, write to the Free Software Foundation,
+-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #if __GNUC__ >= 3
+ @PRAGMA_SYSTEM_HEADER@
+@@ -55,7 +52,8 @@
+ #include <stddef.h>
+ 
+ /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
+-   and eglibc 2.11.2.  */
++   and eglibc 2.11.2.
++   May also define off_t to a 64-bit type on native Windows.  */
+ #include <sys/types.h>
+ 
+ /* The __attribute__ feature is available in gcc versions 2.5 and later.
+@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose);
+ #elif defined GNULIB_POSIXCHECK
+ # undef pclose
+ # if HAVE_RAW_DECL_PCLOSE
+-_GL_WARN_ON_USE (pclose, "popen is unportable - "
++_GL_WARN_ON_USE (pclose, "pclose is unportable - "
+                  "use gnulib module pclose for more portability");
+ # endif
+ #endif
+@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
+ # endif
+ #endif
+ 
+-/* Some people would argue that sprintf should be handled like gets
+-   (for example, OpenBSD issues a link warning for both functions),
+-   since both can cause security holes due to buffer overruns.
++/* Some people would argue that all sprintf uses should be warned about
++   (for example, OpenBSD issues a link warning for it),
++   since it can cause security holes due to buffer overruns.
+    However, we believe that sprintf can be used safely, and is more
+    efficient than snprintf in those safe cases; and as proof of our
+    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/sci-mathematics/octave/octave-3.6.2-r1.ebuild b/sci-mathematics/octave/octave-3.6.2-r1.ebuild
index f5dc2287f1d7..f00dd1a28335 100644
--- a/sci-mathematics/octave/octave-3.6.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.2-r1.ebuild,v 1.1 2012/06/11 22:33:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.2-r1.ebuild,v 1.2 2012/07/05 18:04:26 bicatali Exp $
 
 EAPI=4
 
@@ -57,7 +57,17 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi,gets}.patch )
+
+src_prepare() {
+	# nasty prefix hack for fltk:1 linking
+	if use prefix && use opengl; then
+		sed -i \
+			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
+			configure.ac
+	fi
+	autotools-utils_src_prepare
+}
 
 src_configure() {
 	# occasional fail on install, force regeneration  see bug #401189