diff options
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/skycat/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-astronomy/skycat/files/skycat-3.0.1-gcc43.patch | 418 | ||||
| -rw-r--r-- | sci-astronomy/skycat/files/skycat-3.0.1-m4.patch | 141 | ||||
| -rw-r--r-- | sci-astronomy/skycat/files/skycat-3.0.2-glibc-2.10.patch | 12 | ||||
| -rw-r--r-- | sci-astronomy/skycat/files/skycat-3.0.2-makefile-qa.patch | 119 | ||||
| -rw-r--r-- | sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch | 30 | ||||
| -rw-r--r-- | sci-astronomy/skycat/skycat-3.0.2-r2.ebuild | 64 | ||||
| -rw-r--r-- | sci-astronomy/skycat/skycat-3.1.1.ebuild | 62 | ||||
| -rw-r--r-- | sci-astronomy/skycat/skycat-3.1.2.ebuild | 55 |
9 files changed, 8 insertions, 902 deletions
diff --git a/sci-astronomy/skycat/ChangeLog b/sci-astronomy/skycat/ChangeLog index 2f00e6f3c8cd..c0a50f073d7b 100644 --- a/sci-astronomy/skycat/ChangeLog +++ b/sci-astronomy/skycat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-astronomy/skycat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/ChangeLog,v 1.10 2011/08/23 11:48:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/ChangeLog,v 1.11 2011/08/23 11:51:03 xarthisius Exp $ + + 23 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> + -files/skycat-3.0.1-gcc43.patch, -files/skycat-3.0.1-m4.patch, + -skycat-3.0.2-r2.ebuild, -files/skycat-3.0.2-glibc-2.10.patch, + -files/skycat-3.0.2-makefile-qa.patch, -skycat-3.1.1.ebuild, + -files/skycat-3.1.1-gcc45.patch, -skycat-3.1.2.ebuild: + drop old *skycat-3.1.2-r1 (23 Aug 2011) diff --git a/sci-astronomy/skycat/files/skycat-3.0.1-gcc43.patch b/sci-astronomy/skycat/files/skycat-3.0.1-gcc43.patch deleted file mode 100644 index 06ba0413dbf5..000000000000 --- a/sci-astronomy/skycat/files/skycat-3.0.1-gcc43.patch +++ /dev/null @@ -1,418 +0,0 @@ ---- astrotcl/generic/ImageIO.h.orig 2008-11-05 17:57:14.000000000 +0000 -+++ astrotcl/generic/ImageIO.h 2008-11-05 17:57:29.000000000 +0000 -@@ -116,7 +116,7 @@ - double unScaleValue(double d) const {return (d-bzero_)/bscale_;} - - // return the size in bytes of a raw image pixel -- int pixelSize() const {return abs(bitpix_)/8;} -+ int pixelSize() const {return fabs(bitpix_)/8;} - - // member access - int width() const {return width_;} ---- astrotcl/generic/Fits_IO.h.orig 2006-01-12 16:43:52.000000000 +0000 -+++ astrotcl/generic/Fits_IO.h 2006-09-14 11:34:20.000000000 +0100 -@@ -49,7 +49,7 @@ - // extend the size of the FITS header by one header block - int extendHeader(); - -- static void* FitsIO::reallocFile(void* p, size_t newsize); -+ static void* reallocFile(void* p, size_t newsize); - - protected: - // Check that this object represents a FITS file (and not just some kind of memory) ---- rtd/generic/ImageData.h.orig 2006-01-12 16:39:00.000000000 +0000 -+++ rtd/generic/ImageData.h 2006-09-14 11:36:42.000000000 +0100 -@@ -348,16 +348,16 @@ - int getSpectrum(double* xyvalues, int x0, int y0, int x1, int y1); - - // get meander coords of a horizontal line at position y (index starting at 0) -- int ImageData::getXline4(int y, int x0, int x1, double *xyvalues); -+ int getXline4(int y, int x0, int x1, double *xyvalues); - - // same as getXline4 but with specified x ranges (start xr0, delta dxr) -- int ImageData::getXline4(int y, int x0, int x1, double *xyvalues, double xr0, double dxr); -+ int getXline4(int y, int x0, int x1, double *xyvalues, double xr0, double dxr); - - // get meander coords of a vertical line at position x (index starting at 0) -- int ImageData::getYline4(int x, int y0, int y1, double *xyvalues); -+ int getYline4(int x, int y0, int y1, double *xyvalues); - - // Return the image coords of the visible image area (bounding box) -- void ImageData::getBbox(double *x0, double *x1, double *y0, double *y1); -+ void getBbox(double *x0, double *x1, double *y0, double *y1); - - // get min and max values of an image area - int getMinMax(double rx0, double ry0, int w, int h, double *minval, double *maxval); ---- rtd/generic/ImageDisplay.h.orig 2006-01-12 16:39:29.000000000 +0000 -+++ rtd/generic/ImageDisplay.h 2006-09-14 11:35:30.000000000 +0100 -@@ -78,7 +78,7 @@ - } - - // flush X output buffer -- void ImageDisplay::flushX(); -+ void flushX(); - - // other info - int width() {return xImage_ ? xImage_->width : 0;} ---- rtd/generic/RtdCamera.h.orig 2006-01-12 16:39:14.000000000 +0000 -+++ rtd/generic/RtdCamera.h 2006-09-14 11:39:21.000000000 +0100 -@@ -48,7 +48,7 @@ - public: - - // constructor -- RtdCamera::RtdCamera( -+ RtdCamera( - const char* name, - Tcl_Interp*, - int verbose, -@@ -56,64 +56,64 @@ - char* image = "RtdCamera"); - - // destructor -- virtual RtdCamera::~RtdCamera(); -+ virtual ~RtdCamera(); - - // static file handler, called by Tk file handler for realtime image events -- static void RtdCamera::fileEventProc(ClientData, int mask); -+ static void fileEventProc(ClientData, int mask); - - // start/stop/pause or continue accepting images -- int RtdCamera::start(const char* cameraName); -- int RtdCamera::stop(); -- int RtdCamera::pause(); -- int RtdCamera::cont(); -+ int start(const char* cameraName); -+ int stop(); -+ int pause(); -+ int cont(); - - // return camera name -- char* RtdCamera::camera() {return camera_;} -+ char* camera() {return camera_;} - - // Add timestamp in performance tool. -- void RtdCamera::timeStamp(char *evDesc); -+ void timeStamp(char *evDesc); - - // update global variables -- int RtdCamera::updateGlobals(); -+ int updateGlobals(); - - // check if camera is attached -- int RtdCamera::attached(); -+ int attached(); - - protected: - - // member called by fileEventProc for image events -- int RtdCamera::fileEvent(); -+ int fileEvent(); - - // cleanup image events in the socket queue -- void RtdCamera::cleanup(); -+ void cleanup(); - - // called to display new image from shared memory - // (defined in a derived class) -- virtual int RtdCamera::display(const rtdIMAGE_INFO&, const Mem& data) = 0; -+ virtual int display(const rtdIMAGE_INFO&, const Mem& data) = 0; - - // set camera name -- void RtdCamera::camera(const char *camera) {strcpy(camBuf_, camera);} -+ void camera(const char *camera) {strcpy(camBuf_, camera);} - - // create/delete the Tcl file handler -- void RtdCamera::fileHandler(int create); -+ void fileHandler(int create); - - // disconnect from camera -- void RtdCamera::disconnect(); -+ void disconnect(); - - // Decrement the semaphore -- void RtdCamera::semDecr(); -+ void semDecr(); - - // check if rtdServer is alive -- void RtdCamera::rtdServerCheck(); -+ void rtdServerCheck(); - - // check status after image event failure -- void RtdCamera::checkStat(); -+ void checkStat(); - - // start accepting events from the camera -- int RtdCamera::attach(const char* camera); -+ int attach(const char* camera); - - // check image type -- int RtdCamera::checkType(int type); -+ int checkType(int type); - - Tcl_Interp* interp_; // Tcl interp (for file events, error handling) - rtdIMAGE_EVT_HNDL* eventHndl_; // image event handle -@@ -133,9 +133,9 @@ - - // -- short cuts -- - -- int RtdCamera::connected() {return connected_;} -- void RtdCamera::connected(int set) {connected_ = set; } -- void RtdCamera::attached(int set) {attached_ = set; } -+ int connected() {return connected_;} -+ void connected(int set) {connected_ = set; } -+ void attached(int set) {attached_ = set; } - }; - - #endif /* _RtdCamera_h_ */ ---- rtd/generic/RtdImage.h.orig 2006-01-12 16:39:28.000000000 +0000 -+++ rtd/generic/RtdImage.h 2006-09-14 11:47:08.000000000 +0100 -@@ -428,7 +428,7 @@ - static int rtd_set_cmap(ClientData, Tcl_Interp* interp, int argc, char** argv); - - // update idle tasks and performance test variables -- void RtdImage::updateRequests(); -+ void updateRequests(); - - // read-only access to configuration options - static ImageColor* colors() {return colors_;} ---- rtd/generic/RtdPerf.h.orig 2006-01-12 16:39:21.000000000 +0000 -+++ rtd/generic/RtdPerf.h 2006-09-14 11:40:28.000000000 +0100 -@@ -23,42 +23,42 @@ - - public: - // Constructor -- RtdPerf::RtdPerf(Tcl_Interp* interp); -+ RtdPerf(Tcl_Interp* interp); - - // Destructor -- RtdPerf::~RtdPerf(); -+ ~RtdPerf(); - - // Add delta time to 'timevar' -- void RtdPerf::timeInc(double *timevar); -+ void timeInc(double *timevar); - - // Start a new cycle -- void RtdPerf::newCycle(); -+ void newCycle(); - - // End a cycle and set the Tcl global variables -- void RtdPerf::endCycle(); -+ void endCycle(); - - // Reset the time variables and Tcl global variables -- void RtdPerf::reset(); -+ void reset(); - - // Switch performance test on -- void RtdPerf::on() {maybeOn_ = 1; on_ = 0;} -- void RtdPerf::on(int set) {on_ = set;} -+ void on() {maybeOn_ = 1; on_ = 0;} -+ void on(int set) {on_ = set;} - - // Switch performance test on -- void RtdPerf::off() {maybeOn_ = 0; on_ = 0;} -+ void off() {maybeOn_ = 0; on_ = 0;} - - // Set verbose and debug flag -- void RtdPerf::verbose(int set) {verbose_ = set;} -- void RtdPerf::debug(int set) {debug_ = set;} -+ void verbose(int set) {verbose_ = set;} -+ void debug(int set) {debug_ = set;} - - // Set the instance name of the RtdImage (used for global Tcl variables) -- void RtdPerf::name(char *nam) {strcpy(name_, nam);} -+ void name(char *nam) {strcpy(name_, nam);} - - // -- short cuts -- - -- void RtdPerf::GENtime() {timeInc(&GENtime_);} -- void RtdPerf::TCLtime() {timeInc(&TCLtime_);} -- void RtdPerf::Xtime() {timeInc(&Xtime_);} -+ void GENtime() {timeInc(&GENtime_);} -+ void TCLtime() {timeInc(&TCLtime_);} -+ void Xtime() {timeInc(&Xtime_);} - - protected: - RtdDebugLog *dbl_; // debug log object -@@ -84,9 +84,9 @@ - - // -- short cuts -- - -- char* RtdPerf::name() {return(name_);} -- int RtdPerf::isOn() {return on_;} -- int RtdPerf::maybeOn() {return maybeOn_;} -+ char* name() {return(name_);} -+ int isOn() {return on_;} -+ int maybeOn() {return maybeOn_;} - }; - - #endif /* _RtdPerf_h_ */ ---- rtd/generic/RtdUtils.h.orig 2006-01-12 16:39:16.000000000 +0000 -+++ rtd/generic/RtdUtils.h 2006-09-14 11:37:32.000000000 +0100 -@@ -28,11 +28,11 @@ - class RtdDebugLog { - public: - -- RtdDebugLog::RtdDebugLog(char *nam, int debug); -+ RtdDebugLog(char *nam, int debug); - -- void RtdDebugLog::log(const char *format, ...); -- void RtdDebugLog::setlog(int set) {debug_ = set;} -- int RtdDebugLog::setlog() {return debug_;} -+ void log(const char *format, ...); -+ void setlog(int set) {debug_ = set;} -+ int setlog() {return debug_;} - - protected: - char name_[100]; // name of application ---- rtd/generic/histmap.c.orig 2008-11-05 18:02:25.000000000 +0000 -+++ rtd/generic/histmap.c 2008-11-05 18:02:53.000000000 +0000 -@@ -17,6 +17,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include "histeq.h" /* define SubrangeLink, List */ - - ---- rtd/generic/histzero.c.orig 2008-11-05 18:02:31.000000000 +0000 -+++ rtd/generic/histzero.c 2008-11-05 18:03:08.000000000 +0000 -@@ -15,6 +15,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include "histeq.h" /* define SubrangeLink */ - - static void merge_links(); - ---- rtd/rtdevt/rtdCLNT.h.orig 2006-01-12 16:40:00.000000000 +0000 -+++ rtd/rtdevt/rtdCLNT.h 2006-09-14 11:51:56.000000000 +0100 -@@ -40,52 +40,52 @@ - ~rtdCLNT(); - - // store/return the name of the requestor -- char *rtdCLNT::ReqName() { return reqName_; } -- void rtdCLNT::ReqName(char *name) { strncpy (reqNameBuf_, name, RTD_NAMELEN); } -+ char *ReqName() { return reqName_; } -+ void ReqName(char *name) { strncpy (reqNameBuf_, name, RTD_NAMELEN); } - - // store/return the name of the camera -- char *rtdCLNT::CamName() { return camName_; } -- void rtdCLNT::CamName(char *name) { strncpy (camNameBuf_, name, RTD_NAMELEN); } -+ char *CamName() { return camName_; } -+ void CamName(char *name) { strncpy (camNameBuf_, name, RTD_NAMELEN); } - - // store/return the name of the socket file descriptor -- int rtdCLNT::Socket() { return socket_; } -- void rtdCLNT::Socket(int socket) { socket_ = socket; } -+ int Socket() { return socket_; } -+ void Socket(int socket) { socket_ = socket; } - - // return the semaphore params set by the requestor -- int rtdCLNT::semId() { return semId_; } -+ int semId() { return semId_; } - - // return the number of semaphores -- int rtdCLNT::shmNum() { return shmNum_; } -+ int shmNum() { return shmNum_; } - - // set the values for semId and shmNum -- void rtdCLNT::SetSemPar(int semId, int shmNum); -+ void SetSemPar(int semId, int shmNum); - - // store/return the index -- int rtdCLNT::Index() { return index_; } -- void rtdCLNT::Index(int index) { index_ = index; } -+ int Index() { return index_; } -+ void Index(int index) { index_ = index; } - - // store/return the port number -- int rtdCLNT::Port() { return port_; } -- void rtdCLNT::Port(int port) { port_ = port; } -+ int Port() { return port_; } -+ void Port(int port) { port_ = port; } - - // store/return the type number -- int rtdCLNT::Type() { return type_; } -- void rtdCLNT::Type(int type) { type_ = type; } -+ int Type() { return type_; } -+ void Type(int type) { type_ = type; } - - // clear a buffer -- void rtdCLNT::BufClear(char *name) { memset (name, '\0', RTD_NAMELEN); } -+ void BufClear(char *name) { memset (name, '\0', RTD_NAMELEN); } - - // are we attched? -- int rtdCLNT::Attached() { return (*reqName_ == '\0' || *camName_ == '\0'); } -+ int Attached() { return (*reqName_ == '\0' || *camName_ == '\0'); } - -- void rtdCLNT::Attach(char* reqName, char *camName); -- void rtdCLNT::Detach(); -+ void Attach(char* reqName, char *camName); -+ void Detach(); - -- int rtdCLNT::Forward(rtdPACKET *rtdPacket); -- void rtdCLNT::Cleanup(); -- int rtdCLNT::Accept(int listenSocket); -- int rtdCLNT::AttachedToCamera(char *camera); -- char *rtdCLNT::TypeName(); -+ int Forward(rtdPACKET *rtdPacket); -+ void Cleanup(); -+ int Accept(int listenSocket); -+ int AttachedToCamera(char *camera); -+ char *TypeName(); - - private: - char *reqName_; // name of requestor ---- rtd/rtdevt/rtdLOG.h.orig 2006-01-12 16:39:54.000000000 +0000 -+++ rtd/rtdevt/rtdLOG.h 2006-09-14 11:51:06.000000000 +0100 -@@ -24,8 +24,8 @@ - rtdLOG(int); - ~rtdLOG(); - -- void rtdLOG::log(const char *format, ...); -- int rtdLOG::Verbose() { return verbose_; } -+ void log(const char *format, ...); -+ int Verbose() { return verbose_; } - - private: - int verbose_; ---- rtd/rtdevt/rtdSERVER.h.orig 2006-01-12 16:39:57.000000000 +0000 -+++ rtd/rtdevt/rtdSERVER.h 2006-09-14 11:52:24.000000000 +0100 -@@ -39,15 +39,15 @@ - rtdSERVER(int, int, int); - ~rtdSERVER(); - -- int rtdSERVER::Loop(); -+ int Loop(); - - protected: -- rtdCLNT *rtdSERVER::GetCurrClient(); -- void rtdSERVER::ServImageCmd(rtdPACKET *rtdPacket); -- void rtdSERVER::ServStatusCmd(int socket); -- int rtdSERVER::IncrSem(rtdPACKET *rtdPacket, int increment); -- rtdCLNT *rtdSERVER::Accept(); -- void rtdSERVER::DisconnectClient(rtdCLNT *client); -+ rtdCLNT *GetCurrClient(); -+ void ServImageCmd(rtdPACKET *rtdPacket); -+ void ServStatusCmd(int socket); -+ int IncrSem(rtdPACKET *rtdPacket, int increment); -+ rtdCLNT *Accept(); -+ void DisconnectClient(rtdCLNT *client); - - private: - int socketFd_; // listen socket ---- cat/generic/AstroQuery.h.orig 2008-06-16 17:14:15.000000000 +0000 -+++ cat/generic/AstroQuery.h 2008-06-16 17:14:32.000000000 +0000 -@@ -16,6 +16,8 @@ - */ - - -+ -+#include <cstring> - #include <cstdio> - #include "WorldOrImageCoords.h" - - diff --git a/sci-astronomy/skycat/files/skycat-3.0.1-m4.patch b/sci-astronomy/skycat/files/skycat-3.0.1-m4.patch deleted file mode 100644 index 914b0ebadf05..000000000000 --- a/sci-astronomy/skycat/files/skycat-3.0.1-m4.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- tclconfig/tcl.m4.orig 2006-02-01 22:10:36.000000000 +0000 -+++ tclconfig/tcl.m4 2006-09-14 11:23:20.000000000 +0100 -@@ -731,6 +731,50 @@ - ]) - - #-------------------------------------------------------------------- -+# TEA_CONFIG_SYSTEM -+# -+# Determine what the system is (some things cannot be easily checked -+# on a feature-driven basis, alas). This can usually be done via the -+# "uname" command, but there are a few systems, like Next, where -+# this doesn't work. -+# -+# Arguments: -+# none -+# -+# Results: -+# Defines the following var: -+# -+# system - System/platform/version identification code. -+# -+#-------------------------------------------------------------------- -+ -+AC_DEFUN(TEA_CONFIG_SYSTEM, [ -+ AC_MSG_CHECKING([system version]) -+ AC_CACHE_VAL(tcl_cv_sys_version,[ -+ if test -f /usr/lib/NextStep/software_version; then -+ tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` -+ else -+ tcl_cv_sys_version=`uname -s`-`uname -r` -+ if test "$?" -ne 0 ; then -+ AC_MSG_WARN([can't find uname command]) -+ tcl_cv_sys_version=unknown -+ else -+ # Special check for weird MP-RAS system (uname returns weird -+ # results, and the version is kept in special file). -+ -+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -+ tcl_cv_sys_version=MP-RAS-`awk '{print $3}' /etc/.relid` -+ fi -+ if test "`uname -s`" = "AIX" ; then -+ tcl_cv_sys_version=AIX-`uname -v`.`uname -r` -+ fi -+ fi -+ fi]) -+ AC_MSG_RESULT($tcl_cv_sys_version) -+ system=$tcl_cv_sys_version -+]) -+ -+#-------------------------------------------------------------------- - # TEA_CONFIG_CFLAGS - # - # Try to determine the proper flags to pass to the compiler -@@ -849,30 +893,7 @@ - # for the system. This can usually be done via the "uname" command, but - # there are a few systems, like Next, where this doesn't work. - -- AC_MSG_CHECKING([system version (for dynamic loading)]) -- if test -f /usr/lib/NextStep/software_version; then -- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` -- else -- system=`uname -s`-`uname -r` -- if test "$?" -ne 0 ; then -- AC_MSG_RESULT([unknown (can't find uname command)]) -- system=unknown -- else -- # Special check for weird MP-RAS system (uname returns weird -- # results, and the version is kept in special file). -- -- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -- fi -- if test "`uname -s`" = "AIX" ; then -- system=AIX-`uname -v`.`uname -r` -- fi -- if test "${TEA_PLATFORM}" = "windows" ; then -- system=windows -- fi -- AC_MSG_RESULT([$system]) -- fi -- fi -+ TEA_CONFIG_SYSTEM - - # Step 2: check for existence of -ldl library. This is needed because - # Linux can use either -ldl or -ldld for dynamic loading. -@@ -2318,25 +2339,8 @@ - AC_DEFUN(TEA_BLOCKING_STYLE, [ - AC_CHECK_HEADERS(sys/ioctl.h) - AC_CHECK_HEADERS(sys/filio.h) -+ TEA_CONFIG_SYSTEM - AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O]) -- if test -f /usr/lib/NextStep/software_version; then -- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` -- else -- system=`uname -s`-`uname -r` -- if test "$?" -ne 0 ; then -- system=unknown -- else -- # Special check for weird MP-RAS system (uname returns weird -- # results, and the version is kept in special file). -- -- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -- fi -- if test "`uname -s`" = "AIX" ; then -- system=AIX-`uname -v`.`uname -r` -- fi -- fi -- fi - case $system in - # There used to be code here to use FIONBIO under AIX. However, it - # was reported that FIONBIO doesn't work under AIX 3.2.5. Since -@@ -3031,13 +3035,13 @@ - fi - if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \ - -o x"${exec_prefix_default}" = x"yes" ; then -- #if test x"${TCL_EXEC_PREFIX}" != x; then -- #AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}]) -- #exec_prefix=${TCL_EXEC_PREFIX} -- #else -+ if test x"${TCL_EXEC_PREFIX}" != x; then -+ AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}]) -+ exec_prefix=${TCL_EXEC_PREFIX} -+ else - AC_MSG_NOTICE([--exec-prefix defaulting to ${prefix}]) - exec_prefix=$prefix -- #fi -+ fi - fi - ]) - -@@ -3817,7 +3821,8 @@ - - # check in a few common install locations - if test x"${ac_cv_c_$1config}" = x ; then -- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ -+ for i in `ls -d ${libdir} 2>/dev/null` \ -+ `ls -d ${exec_prefix}/lib 2>/dev/null` \ - `ls -d ${prefix}/lib 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ - `ls -d /usr/contrib/lib 2>/dev/null` \ diff --git a/sci-astronomy/skycat/files/skycat-3.0.2-glibc-2.10.patch b/sci-astronomy/skycat/files/skycat-3.0.2-glibc-2.10.patch deleted file mode 100644 index 85cdf3479a42..000000000000 --- a/sci-astronomy/skycat/files/skycat-3.0.2-glibc-2.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur skycat-3.0.2/tclutil/generic/HTTP.C skycat-3.0.2.new/tclutil/generic/HTTP.C ---- skycat-3.0.2/tclutil/generic/HTTP.C 2006-01-12 11:40:58.000000000 -0500 -+++ skycat-3.0.2.new/tclutil/generic/HTTP.C 2009-09-16 00:13:30.000000000 -0400 -@@ -1108,7 +1108,7 @@ - // host. Note need a copy of variable as strtok modifies it. - char *ptr = getenv( "http_noproxy" ); - if ( ptr != NULL ) { -- char *hostdomain = strchr(host, '.'); -+ char *hostdomain = strchr(const_cast<char*>(host), '.'); - if (hostdomain != NULL) { - hostdomain++; - // make a copy of the http_noproxy string for strtok diff --git a/sci-astronomy/skycat/files/skycat-3.0.2-makefile-qa.patch b/sci-astronomy/skycat/files/skycat-3.0.2-makefile-qa.patch deleted file mode 100644 index 3d74f6a0e126..000000000000 --- a/sci-astronomy/skycat/files/skycat-3.0.2-makefile-qa.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -Naur skycat-3.0.2/astrotcl/Makefile.in skycat-3.0.2.new/astrotcl/Makefile.in ---- skycat-3.0.2/astrotcl/Makefile.in 2006-02-01 15:08:34.000000000 -0500 -+++ skycat-3.0.2.new/astrotcl/Makefile.in 2009-09-24 22:23:15.000000000 -0400 -@@ -114,7 +114,7 @@ - RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT) - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - #TCL_DEFS = @TCL_DEFS@ -diff -Naur skycat-3.0.2/cat/Makefile.in skycat-3.0.2.new/cat/Makefile.in ---- skycat-3.0.2/cat/Makefile.in 2006-02-01 15:08:34.000000000 -0500 -+++ skycat-3.0.2.new/cat/Makefile.in 2009-09-24 22:23:15.000000000 -0400 -@@ -124,7 +124,7 @@ - RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT) - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - #TCL_DEFS = @TCL_DEFS@ -@@ -436,7 +436,7 @@ - cxxtests: $(CXX_TEST_APPS) - - $(CXX_TEST_APPS): FORCE -- $(CXXCOMPILE) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS) - cp $(srcdir)/tests/test.table . - -@@LD_LIBRARY_PATH_VAR@=@exec_prefix@/lib; export @LD_LIBRARY_PATH_VAR@ ;\ - $@ > $@.result 2>&1 ;\ -diff -Naur skycat-3.0.2/rtd/Makefile.in skycat-3.0.2.new/rtd/Makefile.in ---- skycat-3.0.2/rtd/Makefile.in 2006-02-01 15:08:34.000000000 -0500 -+++ skycat-3.0.2.new/rtd/Makefile.in 2009-09-24 22:25:10.000000000 -0400 -@@ -123,7 +123,7 @@ - CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o - EXEEXT = @EXEEXT@ - LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ --MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) -+MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS) - MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ - MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ - MAKE_STUB_LIB = @MAKE_STUB_LIB@ -@@ -131,7 +131,7 @@ - RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT) - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - #TCL_DEFS = @TCL_DEFS@ -@@ -442,14 +442,14 @@ - $(AR) r $@ $(RTDEVT_OBJ) - $(RANLIB) $@ - --$(RTD_SERVER): $(RTD_SERVER_OBJS) -- $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ -+$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ - --rtdClient: rtdClient.o -- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ -+rtdClient: rtdClient.o $(RTDEVT_LIB) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@ - --rtdCubeDisplay: rtdCubeDisplay.o -- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ -+rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@ - - #======================================================================== - # RTD Remote access C library -@@ -464,14 +464,14 @@ - #======================================================================== - test: binaries libraries $(TEST_APPS) - --tImageEvent: tImageEvent.o -- $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@ -+tImageEvent: tImageEvent.o $(RTDEVT_LIB) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTDEVT_LIB) @LIBS@ - - trtdRemote: trtdRemote.o -- $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@ -+ $(COMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@ - --tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o -- $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \ -+tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o $(PKG_LIB_FILE) -+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \ - @rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LIBS} - - #======================================================================== -diff -Naur skycat-3.0.2/skycat/Makefile.in skycat-3.0.2.new/skycat/Makefile.in ---- skycat-3.0.2/skycat/Makefile.in 2006-02-04 10:32:15.000000000 -0500 -+++ skycat-3.0.2.new/skycat/Makefile.in 2009-09-24 22:23:15.000000000 -0400 -@@ -120,7 +120,7 @@ - RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT) - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - #TCL_DEFS = @TCL_DEFS@ -diff -Naur skycat-3.0.2/tclutil/Makefile.in skycat-3.0.2.new/tclutil/Makefile.in ---- skycat-3.0.2/tclutil/Makefile.in 2006-02-01 15:08:34.000000000 -0500 -+++ skycat-3.0.2.new/tclutil/Makefile.in 2009-09-24 22:23:15.000000000 -0400 -@@ -116,7 +116,7 @@ - RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT) - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - STLIB_LD = @STLIB_LD@ - #TCL_DEFS = @TCL_DEFS@ diff --git a/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch b/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch deleted file mode 100644 index 32b7f86656c8..000000000000 --- a/sci-astronomy/skycat/files/skycat-3.1.1-gcc45.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- astrotcl/generic/ImageIO.h.orig 2010-09-24 06:31:03.000000000 +0100 -+++ astrotcl/generic/ImageIO.h 2010-09-24 06:32:06.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include <iostream> - #include <cmath> -+#include <cstdlib> - #include "WCSRep.h" - #include "Mem.h" - ---- ./rtd/generic/histzero.c.orig 2010-09-24 06:36:08.000000000 +0100 -+++ ./rtd/generic/histzero.c 2010-09-24 06:37:48.000000000 +0100 -@@ -15,6 +15,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include "histeq.h" /* define SubrangeLink */ - - static void merge_links(); ---- ./rtd/generic/histmap.c.orig 2010-09-24 06:35:59.000000000 +0100 -+++ ./rtd/generic/histmap.c 2010-09-24 06:37:26.000000000 +0100 -@@ -17,6 +17,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include "histeq.h" /* define SubrangeLink, List */ - - diff --git a/sci-astronomy/skycat/skycat-3.0.2-r2.ebuild b/sci-astronomy/skycat/skycat-3.0.2-r2.ebuild deleted file mode 100644 index 701054ac8aa5..000000000000 --- a/sci-astronomy/skycat/skycat-3.0.2-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/skycat-3.0.2-r2.ebuild,v 1.1 2009/09/25 03:19:56 markusle Exp $ - -inherit eutils autotools - -DESCRIPTION="ESO astronomical image visualizer with catalog access." -HOMEPAGE="http://archive.eso.org/skycat" -SRC_URI="ftp://ftp.eso.org/pub/archive/${PN}/Sources/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="threads" - -RDEPEND="${DEPEND}" -DEPEND="x11-libs/libXext - >=dev-tcltk/tclx-2.4 - >=dev-tcltk/blt-2.4 - >=dev-tcltk/itcl-3.3 - >=dev-tcltk/iwidgets-4.0.1 - >=dev-tcltk/tkimg-1.3 - sci-libs/cfitsio - sci-astronomy/wcstools" - -src_unpack() { - unpack ${A} - cd "${S}" - # fix buggy tcl.m4 for bash3 - epatch "${FILESDIR}"/${PN}-3.0.1-m4.patch - # fix old style headers, set as error by new g++ - epatch "${FILESDIR}"/${PN}-3.0.1-gcc43.patch - - epatch "${FILESDIR}"/${P}-glibc-2.10.patch - # need fix for tk-8.5 - if has_version ">=dev-lang/tk-8.5" ; then - epatch "${FILESDIR}"/${P}-tk8.5.patch - fi - - epatch "${FILESDIR}"/${P}-makefile-qa.patch - - # use system libs - epatch "${FILESDIR}"/${P}-systemlibs.patch - rm -fr "${S}"/astrotcl/cfitsio/ "${S}"/astrotcl/libwcs/ \ - || die "Failed to remove included libs" - - eautoreconf -} - -src_compile() { - econf $(use_enable threads) --enable-merge - emake - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README CHANGES VERSION - for d in tclutil astrotcl rtd cat skycat; do - for f in README CHANGES VERSION; do - newdoc ${f} ${f}.${d} - done - done -} diff --git a/sci-astronomy/skycat/skycat-3.1.1.ebuild b/sci-astronomy/skycat/skycat-3.1.1.ebuild deleted file mode 100644 index 81cc3f77a336..000000000000 --- a/sci-astronomy/skycat/skycat-3.1.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/skycat-3.1.1.ebuild,v 1.1 2010/09/24 18:13:38 bicatali Exp $ - -EAPI=2 -inherit eutils autotools - -DESCRIPTION="ESO astronomical image visualizer with catalog access." -HOMEPAGE="http://archive.eso.org/skycat" -SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="threads" - -DEPEND="x11-libs/libXext - >=dev-tcltk/tclx-2.4 - >=dev-tcltk/blt-2.4 - >=dev-tcltk/itcl-3.3 - >=dev-tcltk/iwidgets-4.0.1 - >=dev-tcltk/tkimg-1.3 - sci-libs/cfitsio - sci-astronomy/wcstools" -RDEPEND="${DEPEND}" - -src_prepare() { - # fix buggy tcl.m4 for bash3 - epatch "${FILESDIR}"/${PN}-3.0.1-m4.patch - epatch "${FILESDIR}"/${PN}-3.1.1-gcc45.patch - #epatch "${FILESDIR}"/${PN}-3.0.2-glibc-2.10.patch - # need fix for tk-8.5 - if has_version ">=dev-lang/tk-8.5" ; then - epatch "${FILESDIR}"/${PN}-3.0.2-tk8.5.patch - fi - epatch "${FILESDIR}"/${PN}-3.0.2-makefile-qa.patch - # use system libs - epatch "${FILESDIR}"/${PN}-3.0.2-systemlibs.patch - rm -fr "${S}"/astrotcl/cfitsio/ "${S}"/astrotcl/libwcs/ \ - || die "Failed to remove included libs" - eautoreconf -} - -src_configure() { - econf $(use_enable threads) --enable-merge -} - -src_compile() { - emake - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README CHANGES VERSION - for d in tclutil astrotcl rtd cat skycat; do - for f in README CHANGES VERSION; do - newdoc ${f} ${f}.${d} - done - done -} diff --git a/sci-astronomy/skycat/skycat-3.1.2.ebuild b/sci-astronomy/skycat/skycat-3.1.2.ebuild deleted file mode 100644 index 846df77f493b..000000000000 --- a/sci-astronomy/skycat/skycat-3.1.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/skycat-3.1.2.ebuild,v 1.1 2011/07/25 22:53:22 bicatali Exp $ - -EAPI=4 -inherit eutils autotools - -DESCRIPTION="ESO astronomical image visualizer with catalog access." -HOMEPAGE="http://archive.eso.org/skycat" -SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="threads" - -DEPEND="x11-libs/libXext - >=dev-tcltk/tclx-2.4 - >=dev-tcltk/blt-2.4 - >=dev-tcltk/itcl-3.3 - >=dev-tcltk/iwidgets-4.0.1 - >=dev-tcltk/tkimg-1.3 - sci-libs/cfitsio - sci-astronomy/wcstools" -RDEPEND="${DEPEND}" - -src_prepare() { - # fix buggy tcl.m4 for bash3 - epatch "${FILESDIR}"/${PN}-3.0.1-m4.patch - # need fix for tk-8.5 - if has_version ">=dev-lang/tk-8.5" ; then - epatch "${FILESDIR}"/${PN}-3.0.2-tk8.5.patch - fi - epatch "${FILESDIR}"/${PN}-3.0.2-makefile-qa.patch - # use system libs - epatch "${FILESDIR}"/${PN}-3.0.2-systemlibs.patch - rm -fr astrotcl/{cfitsio,libwcs} \ - || die "Failed to remove included libs" - eautoreconf -} - -src_configure() { - econf $(use_enable threads) --enable-merge -} - -src_install() { - default - local d - for d in tclutil astrotcl rtd cat skycat; do - for f in README CHANGES VERSION; do - newdoc ${f} ${f}.${d} - done - done -} |