Fix as-needed issues wrt #379943 by Sijus <sijus@freemail.lt>. Add missing SONAMEs

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 345 insertions, 1 deletions

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 <xarthisius@gentoo.org> +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 <sijus@freemail.lt>. Add missing
+  SONAMEs
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
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
+}