From 20014af7733fe937a6de404cdd3d195f2be0d075 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Tue, 23 Aug 2011 11:48:46 +0000 Subject: [PATCH] Fix as-needed issues wrt #379943 by Sijus . Add missing SONAMEs Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- sci-astronomy/skycat/ChangeLog | 9 +- sci-astronomy/skycat/Manifest | 17 +- .../skycat/files/skycat-3.1.2-m4.patch | 150 ++++++++++++++++++ .../files/skycat-3.1.2-makefile-qa.patch | 132 +++++++++++++++ sci-astronomy/skycat/skycat-3.1.2-r1.ebuild | 55 +++++++ 5 files changed, 356 insertions(+), 7 deletions(-) create mode 100644 sci-astronomy/skycat/files/skycat-3.1.2-m4.patch create mode 100644 sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch create mode 100644 sci-astronomy/skycat/skycat-3.1.2-r1.ebuild diff --git a/sci-astronomy/skycat/ChangeLog b/sci-astronomy/skycat/ChangeLog index 217ea604fe3b..2f00e6f3c8cd 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.9 2011/08/04 18:32:53 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skycat/ChangeLog,v 1.10 2011/08/23 11:48:46 xarthisius Exp $ + +*skycat-3.1.2-r1 (23 Aug 2011) + + 23 Aug 2011; Kacper Kowalik +skycat-3.1.2-r1.ebuild, + +files/skycat-3.1.2-m4.patch, +files/skycat-3.1.2-makefile-qa.patch: + Fix as-needed issues wrt #379943 by Sijus . Add missing + SONAMEs 04 Aug 2011; Sébastien Fabbro metadata.xml: Switched herd to sci-astronomy diff --git a/sci-astronomy/skycat/Manifest b/sci-astronomy/skycat/Manifest index 4d716db71d35..9a55f7a92090 100644 --- a/sci-astronomy/skycat/Manifest +++ b/sci-astronomy/skycat/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX skycat-3.0.1-gcc43.patch 14345 RMD160 c5ecd0297985771a67cb006d903fde8782ef6869 SHA1 197536250bdc05e821ba2f2714b5e06fc59e10ec SHA256 5603d0e2ed5be2731806fcc641078d7ad53b3e429b4323a4a82d0cca86c3db41 AUX skycat-3.0.1-m4.patch 4791 RMD160 643951b4bec86dfae40687eaa4d10969ff39c8e4 SHA1 48a4826349b6c905cae1130c47bd5c1757500d88 SHA256 08ad86b09220ab931264d7d7ec145193abec39d1ab168e3f4853696f5ef48f76 @@ -8,18 +8,23 @@ AUX skycat-3.0.2-makefile-qa.patch 4636 RMD160 4c8425b632110063c74128f27eeed7ead AUX skycat-3.0.2-systemlibs.patch 5290 RMD160 f6f3f3ada0b53a1a9fea6000c6e9ddedc63af098 SHA1 6474193397cbb3901337b2b9980625a8691dd68c SHA256 b510c3b97029b5619a81f4130c01df80ec18a34a2825e809811deef946afe4e2 AUX skycat-3.0.2-tk8.5.patch 877 RMD160 35f2575f00b2f4bf2ddab84ebf2560f28d528378 SHA1 85fd1ed7040935567934b70e0e4c202d62f29686 SHA256 6a9048f16a88fca2db57efd2599220508bb283274766f0cb6b85e1c0c445a889 AUX skycat-3.1.1-gcc45.patch 795 RMD160 155993020c11f39e05ba3d590e7bb89e8b6252a2 SHA1 2bb191682329da3940413f3bc18c71724dddaece SHA256 1a4afbc7b9611cbf883f92f0d06aa7751567311d70b8e9bb15d1e80df369dfaf +AUX skycat-3.1.2-m4.patch 5106 RMD160 0d863ba717cc408a83c04726cb0a7332a4097bff SHA1 9509362b13907e227e547c364f10d690d8f06403 SHA256 1938684fb0bf581b620797ac49932d457fc4fbd055c99ec86b866b6b20db4efd +AUX skycat-3.1.2-makefile-qa.patch 4443 RMD160 1ff7290662ba38faf05af886d86b80c4962932bd SHA1 85e0dd7e47acce54e8fbf939bd918deee0c92738 SHA256 59800dcd3c1cf091fbf97f31342c769e93d26a92f7a8892d0d4af06ceae94da5 DIST skycat-3.0.2.tar.gz 3200649 RMD160 1552cab99e1fcd0d38d4bab89e01da862e8982df SHA1 9c293017ee6b74478ff744fbfde5b2bfc4c1cd6e SHA256 ebacfc988b39a32e59a8947f67c8dacf468cdab1e80783576c26b7124dc1bd77 DIST skycat-3.1.1.tar.gz 3031492 RMD160 8bd5fc7c43401491a220c4ade0e944119a765c66 SHA1 de6bb7f81d54ba320bf07d0982cfca6ffe4cd0e2 SHA256 3177228d85a2e8baf6feba5284577a9d158de8228ef76b84e96608dd58bfee73 DIST skycat-3.1.2.tar.gz 3091874 RMD160 2f94427cff3b0ccc622dccf362a62f52d020a145 SHA1 5d51878294be614de1a542ec4b4375e0a96e0919 SHA256 559ae26f044601517f8787eadcb93ebda85ebea971f8f961cedefbafb3b9d0ac EBUILD skycat-3.0.2-r2.ebuild 1620 RMD160 b7573c7fa95275347c8c85cadb54804dba5258bb SHA1 0c259251101fae781d87c52a0a02d01176a12975 SHA256 2017270a5a4da969f3bc5aa87731844ad219f0e2732a7b5e8e60786a17716f5b EBUILD skycat-3.1.1.ebuild 1617 RMD160 7a1293a30b05f85df23527c23e426b9c09223040 SHA1 5adad1db470fcdab6f779f3b4d22a803ea1bf921 SHA256 840c4f841ea95a02bcdf4782c3612161506ad643c9cc69e9433ed077b6378834 +EBUILD skycat-3.1.2-r1.ebuild 1375 RMD160 46dd28ed842c62cd902a06eb0c52120b3f547a61 SHA1 f60c1c6182a30485923382a3fbc440edf58ddb8e SHA256 e1149a0c88ed44cdc919613902124d96621a60f44b4ebc1c6b55034e7592b455 EBUILD skycat-3.1.2.ebuild 1369 RMD160 726e9148ab6a2b473eac44bb399ef5dfab8ebad2 SHA1 87b3a484000cff357708866d6a7b3a14938e6379 SHA256 d71561f873f9e413e154105a1ce86eceb678f262f24efea1586776343deafedd -MISC ChangeLog 2132 RMD160 f0beb0fcdbad599925d2b8855cee10e62a6eeeab SHA1 bd3f8868e35ce3db145fcaf95817a5f7c5f30661 SHA256 fe2da9452cd57ceab5db698565945e5ddb79ddd7474feefa20cf67c92e52997b +MISC ChangeLog 2405 RMD160 45d90f47bbb4d1ff1574d01d820a8b61613c3e5d SHA1 5284b83a1cf6ef2e653cd2a58b6fa81bc0b5f8a1 SHA256 213d788f058b6dd9baab1d7ee0b35388b0e7641b2230b3dc10310c9544a09b2e MISC metadata.xml 384 RMD160 7359820f2f792ce7bc63adde334a31b3fa953f64 SHA1 4b5a7f144d1c3a6ae648d9ce16d8741745e35668 SHA256 6ae66027db624becdd4b62ef75efd7ca501c10286ffdd7bac5173c2bfca9278f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk465d0ACgkQ1ycZbhPLE2BY5gCcDVNiErY7JKmXoFW75P46nRhr -+/kAnRDOxs72dMpiNuZM8ZC0Abww27vt -=wAv1 +iJwEAQEIAAYFAk5Tk6cACgkQIiMqcbOVdxS6cAQAlbT+LqPyCTWNTetqKoT+UG6C +noFEgI2Vp1eqODu4o49ZKObqF0OjKza9Gk7LNUil0mJWurReiu0MWHZiqx+7Uvnl +LMB3U2e5Pcm69bmNXrStMyQ1f5Gj4vniU6H8uDteKQ4juXPzip+56M6ZwZAIy40S +1gU004W/kzddIqt5qZg= +=sTXg -----END PGP SIGNATURE----- diff --git a/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch b/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch new file mode 100644 index 000000000000..ff61c99f05ca --- /dev/null +++ b/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch @@ -0,0 +1,150 @@ +--- a/tclconfig/tcl.m4 ++++ b/tclconfig/tcl.m4 +@@ -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 + ]) + +@@ -3169,7 +3173,7 @@ + MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)" + else + MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" +- MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" ++ MAKE_SHARED_LIB="\${SHLIB_LD} -Wl,-soname=\[$]@ -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" + MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" + 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.1.2-makefile-qa.patch b/sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch new file mode 100644 index 000000000000..e36e1ece665f --- /dev/null +++ b/sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch @@ -0,0 +1,132 @@ +--- a/astrotcl/Makefile.in ++++ b/astrotcl/Makefile.in +@@ -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@ +--- a/rtd/Makefile.in ++++ b/rtd/Makefile.in +@@ -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} + + #======================================================================== +--- a/tclutil/Makefile.in ++++ b/tclutil/Makefile.in +@@ -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@ +--- a/skycat/Makefile.in ++++ b/skycat/Makefile.in +@@ -112,7 +112,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@ +@@ -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@ +--- a/cat/Makefile.in ++++ b/cat/Makefile.in +@@ -116,7 +116,7 @@ + CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.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@ +@@ -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 --git a/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild b/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild new file mode 100644 index 000000000000..19c5e294dfef --- /dev/null +++ b/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild @@ -0,0 +1,55 @@ +# 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-r1.ebuild,v 1.1 2011/08/23 11:48:46 xarthisius 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 and add soname + epatch "${FILESDIR}"/${P}-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}"/${P}-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 +} -- 2.26.2