diff options
author | Patrick Kursawe <phosphan@gentoo.org> | 2004-03-23 07:58:03 +0000 |
---|---|---|
committer | Patrick Kursawe <phosphan@gentoo.org> | 2004-03-23 07:58:03 +0000 |
commit | d951ed82dba1b32498fa5b88465aa330b68f43a2 (patch) | |
tree | 72ff986d83c4703d7d88b10bc9b76943ff182323 /app-sci/singular | |
parent | -O3 to -O2 for bug #45252. Marking stable. (Manifest recommit) (diff) | |
download | gentoo-2-d951ed82dba1b32498fa5b88465aa330b68f43a2.tar.gz gentoo-2-d951ed82dba1b32498fa5b88465aa330b68f43a2.tar.bz2 gentoo-2-d951ed82dba1b32498fa5b88465aa330b68f43a2.zip |
Miscellaneous bugfixes provided by user in bug #45446
Diffstat (limited to 'app-sci/singular')
-rw-r--r-- | app-sci/singular/ChangeLog | 8 | ||||
-rw-r--r-- | app-sci/singular/Manifest | 3 | ||||
-rw-r--r-- | app-sci/singular/files/digest-singular-2.0.5-r1 | 12 | ||||
-rw-r--r-- | app-sci/singular/files/singular-2.0.5-r1-gentoo.diff | 94 | ||||
-rw-r--r-- | app-sci/singular/singular-2.0.5-r1.ebuild | 127 |
5 files changed, 243 insertions, 1 deletions
diff --git a/app-sci/singular/ChangeLog b/app-sci/singular/ChangeLog index 0be8c5f95f53..b2d01781e942 100644 --- a/app-sci/singular/ChangeLog +++ b/app-sci/singular/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-sci/singular # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/singular/ChangeLog,v 1.5 2004/03/12 10:20:41 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/singular/ChangeLog,v 1.6 2004/03/23 07:58:03 phosphan Exp $ + +*singular-2.0.5-r1 (23 Mar 2004) + + 23 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> singular-2.0.5-r1.ebuild, + files/singular-2.0.5-r1-gentoo.diff: + Miscellaneous bugfixes provided by user in bug #45446 - thanks! *singular-2.0.5 (12 Mar 2004) diff --git a/app-sci/singular/Manifest b/app-sci/singular/Manifest index 74a09884c0bc..1bbedd4add19 100644 --- a/app-sci/singular/Manifest +++ b/app-sci/singular/Manifest @@ -1,9 +1,12 @@ +MD5 a8abe48aede86f173d6e11e3bc7c286a singular-2.0.5-r1.ebuild 3739 MD5 4bed27987870d999d421f86f55279880 singular-2.0.4-r1.ebuild 3662 MD5 e6a3c2b65bb6cb28c8784ca0764cee55 singular-2.0.5.ebuild 3736 MD5 c631274fe11c106e38a2c9ebe50b7ecb ChangeLog 1166 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 MD5 b1383ace2a0b30413341982e4e34341f files/fake_ssh 150 +MD5 da41086d5925033ffb11c86241162d8b files/singular-2.0.5-r1-gentoo.diff 3470 MD5 fb4fac95a720a5c04fe2fb226feddf01 files/singular-2.0.5-gentoo.diff 1485 MD5 673cd925126b07ea0e78cf91269b7d66 files/digest-singular-2.0.5 859 MD5 b52673163a28446aae41691abc3e705d files/digest-singular-2.0.4-r1 862 +MD5 673cd925126b07ea0e78cf91269b7d66 files/digest-singular-2.0.5-r1 859 MD5 8f79455c2cd6352e5e0907b21a7390f1 files/singular-2.0.4-gentoo.diff 3287 diff --git a/app-sci/singular/files/digest-singular-2.0.5-r1 b/app-sci/singular/files/digest-singular-2.0.5-r1 new file mode 100644 index 000000000000..168e24b6c043 --- /dev/null +++ b/app-sci/singular/files/digest-singular-2.0.5-r1 @@ -0,0 +1,12 @@ +MD5 7dade3cbf4b3297e13067bf136b47dd5 Singular-doc-2-0-5.tar.gz 658275 +MD5 25490dbf52e0c3f3ff9d32a5c0773db9 Singular-emacs-2-0-5.tar.gz 62596 +MD5 ccb98926a93b0fc90711730790c56ac5 Singular-factory-2-0-5.tar.gz 479277 +MD5 001d7a818b0f4d149bc02d6c226874f8 Singular-IntProg-2-0-4a.tar.gz 85619 +MD5 2cc39a94e1e1c555cbbdfea2a825286e Singular-kernel-2-0-5.tar.gz 2688358 +MD5 149cd0f1249388e58138a6b1de17dd7c Singular-libfac-2-0-5.tar.gz 86640 +MD5 e88a57eab4c719f97a2cec19a8429f74 Singular-main-2-0-5.tar.gz 54627 +MD5 8d7b33130501acf7d74cbd9e02b8a26a Singular-MP-2-0-5.tar.gz 365390 +MD5 5304918a83976e0d1c58ea40e795cfa7 Singular-NTL-5.3.1.tar.gz 655942 +MD5 69ed8eb72f97f0940b0df4b5907faeb6 Singular-NTL-generic.tar.gz 7429 +MD5 7dc82f3822f35268c47c86edb9822e6f Singular-omalloc-2-0-5.tar.gz 237140 +MD5 a9fbca50eb2e0c6b468c572edcf737b6 Singular-Tst-2-0-5.tar.gz 4181732 diff --git a/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff b/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff new file mode 100644 index 000000000000..49079d08a006 --- /dev/null +++ b/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff @@ -0,0 +1,94 @@ +--- singuname.sh 2003-08-07 12:48:09.000000000 +0200 ++++ singuname.sh.new 2003-08-07 12:50:14.000000000 +0200 +@@ -168,6 +168,18 @@ + echo ${prefix}-Unknown + exit 1 + fi ++# PowerPC Linux ######################################################## ++elif (echo $uname_a | $egrep " ppc " > $devnull) ++then ++ prefix=ppc ++ if (echo $uname_a | $egrep "Linux" > $devnull) ++ then ++ echo ${prefix}-Linux ++ exit 0 ++ else ++ echo ${prefix}-Unknown ++ exit 1 ++ fi + else # Unknown ######################################################## + echo Unknown + exit 2 +--- Singular/mod_raw.cc 2003-08-22 12:53:30.000000000 +0200 ++++ Singular/mod_raw.cc.new 2004-03-12 10:07:14.000000000 +0100 +@@ -40,7 +40,7 @@ + void* dynl_open_binary_warn(char* binary_name, const char* msg) + { + void* handle = NULL; +- const char* bin_dir = feGetResource('b'); ++ const char* bin_dir = feGetResource('r'); + if (bin_dir != NULL) + { + char path_name[MAXPATHLEN]; +@@ -104,6 +104,10 @@ + #define HAVE_ELF_SYSTEM + #endif + ++#if defined(ppc_Linux) ++#define HAVE_ELF_SYSTEM ++#endif ++ + #if defined(HAVE_ELF_SYSTEM) + #include <dlfcn.h> + +--- Singular/feResource.cc.orig 2004-03-03 12:26:07.000000000 +0100 ++++ Singular/feResource.cc 2004-03-22 21:19:24.005384472 +0100 +@@ -45,7 +45,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" + #endif // defined(MAKE_DISTRIBUTION) + + #ifdef ix86_Win +@@ -83,15 +83,12 @@ + { + {"SearchPath", 's', feResPath, NULL, + "$SINGULARPATH;" +- "%b/LIB;" +- "%r/LIB;" +- "%r/../LIB;" ++ "%r/share/singular/LIB;" + "%d/LIB;" +- "%d/../LIB" + ""}, +- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular"EXT,""}, +- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME ""}, +- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", ""}, ++ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular"EXT,""}, ++ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin",""}, ++ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", ""}, + {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, ""}, + {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", ""}, + {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", ""}, +@@ -105,7 +102,7 @@ + #ifdef ix86_Win + {"rxvt", 'X', feResBinary,"RXVT", "%b/rxvt.exe", ""}, + #else +- {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", ""}, ++ {"xterm", 'X', feResBinary,"XTERM", "%d/X11R6/bin/xterm", ""}, + #endif + {"Path", 'p', feResPath, NULL, "%b;$PATH", ""}, + #endif // ! defined(macintosh) +--- Singular/mod_raw.cc.orig 2004-03-22 23:20:46.424288520 +0100 ++++ Singular/mod_raw.cc 2004-03-22 23:22:11.975282792 +0100 +@@ -44,7 +44,7 @@ + if (bin_dir != NULL) + { + char path_name[MAXPATHLEN]; +- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, ++ sprintf(path_name, "%s%s%s%s.%s", bin_dir, "/lib/singular", DIR_SEPP, binary_name, + DL_TAIL); + handle = dynl_open(path_name); + if (handle == NULL && ! warn_handle) diff --git a/app-sci/singular/singular-2.0.5-r1.ebuild b/app-sci/singular/singular-2.0.5-r1.ebuild new file mode 100644 index 000000000000..8261c18527ff --- /dev/null +++ b/app-sci/singular/singular-2.0.5-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-sci/singular/singular-2.0.5-r1.ebuild,v 1.1 2004/03/23 07:58:03 phosphan Exp $ + +S=${WORKDIR}/${P} +MINPV=${PV//./-} +BPN=${PN/s/S} +NTLVERSION="5.3.1" +# attention: different versions are mixed. IntProg is older + +DESCRIPTION="computer algebra system for polynomial computations" +SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-doc-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-emacs-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-factory-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-IntProg-2-0-4a.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-kernel-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-libfac-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-main-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-MP-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-NTL-${NTLVERSION}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-NTL-generic.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-omalloc-${MINPV}.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-Tst-${MINPV}.tar.gz" +HOMEPAGE="http://www.singular.uni-kl.de/" + +RDEPEND=">=dev-lang/perl-5.6 + >=dev-libs/gmp-4.1-r1" + +IUSE="doc" + +DEPEND="${RDEPEND} + doc? ( sys-apps/texinfo + virtual/tetex + dev-lang/perl )" + +SLOT="0" +LICENSE="singular" +KEYWORDS="~x86 ~ppc" + +S=${WORKDIR} + +src_unpack () { + unpack ${A} + epatch $FILESDIR/${P}-r1-gentoo.diff +} + + + +src_compile() { + local myconf="${myconf} --with-NTL --prefix=${D}/usr" + econf ${myconf} + make CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "make failed" +} + +src_install () { + local myarchprefix + case ${ARCH} in + x86) + myarchprefix=ix86 + ;; + *) + myarchprefix=${ARCH} + ;; + esac + cd ${WORKDIR}/omalloc + einstall || die + cd ${WORKDIR}/MP + einstall || die + cd ${WORKDIR}/ntl + einstall || die + cd ${WORKDIR}/factory + einstall || die + cd ${WORKDIR}/libfac + einstall || die + cd ${WORKDIR}/Singular + einstall || die + rm ${D}/usr/LIB + dodir /usr/share/singular/LIB + dodir /usr/share/singular/LIB/gftables + insinto /usr/share/singular/LIB + cd ${WORKDIR}/Singular/LIB + doins *.lib* + insinto /usr/share/singular/LIB/gftables + cd gftables + doins * + dodir /usr/bin + dodir /usr/lib/singular + insinto /usr/lib/singular + cd ${D}/usr/${myarchprefix}-Linux + rm Singular + dobin *Singular* + doins *.so + use doc && ( cd ${WORKDIR}/doc + # fake ssh during doc creation + cp ${FILESDIR}/fake_ssh ${T}/ssh + chmod +x ${T}/ssh + export PATH="${T}:${PATH}" + make dvi + dodoc *.dvi + make ps + dodoc *.ps + local strange_error="Inappropriate ioctl for device" + echo ${strange_error} > makeresult + while grep -q "${strange_error}" makeresult + do make 2>&1 info | tee makeresult + done + echo > singular.info "INFO-DIR-SECTION Math" + echo >> singular.info "START-INFO-DIR-ENTRY" + echo >> singular.info "* Singular: (singular). A Computer Algebra System for Polynomial Computations" + echo >> singular.info "END-INFO-DIR-ENTRY" + cat singular.hlp >> singular.info + doinfo singular.info + make html + dohtml -r html/. + cd ${D}/usr + mv doc/NTL share/doc/${PF}/ + ) + cd ${D} + dosym /usr/bin/Singular-${MINPV} /usr/bin/Singular + cd ${D}/usr + rm -r ${myarchprefix}-Linux +} + +pkg_postinst() { + einfo "The authors ask you to register as a SINGULAR user." + einfo "Please check the license file for details." +} |