[gentoo-commits] proj/sci:master commit in: sci-biology/embassy-topo/, sci-biology/embassy-topo/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     38f4dc85dab6775a5b1a4203ee5a53621e733219
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 13:11:24 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 13:11:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=38f4dc85

Fixed for reviewed eclass

(Portage version: 2.2.0_alpha28/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sci-biology/embassy-topo/ChangeLog                 |    4 +
 sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild |    4 +-
 .../embassy-topo/files/embassy-topo-2.0.0.patch    |  254 +++++++++++++++++++-
 3 files changed, 257 insertions(+), 5 deletions(-)

diff --git a/sci-biology/embassy-topo/ChangeLog b/sci-biology/embassy-topo/ChangeLog
index 46fea5e..bc25e4e 100644
--- a/sci-biology/embassy-topo/ChangeLog
+++ b/sci-biology/embassy-topo/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-topo/ChangeLog,v 1.29 2010/01/01 21:54:52 fauli Exp $
 
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-topo-2.0.0.ebuild,
+  files/embassy-topo-2.0.0.patch:
+  Fixed for reviewed eclass
+
   15 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-topo-2.0.0.ebuild:
   Naming of eclass changed
 

diff --git a/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild b/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
index e1d00ce..3090d47 100644
--- a/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
+++ b/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-topo/embassy-topo-1.0.0-r6.ebuild,v 1.2 2010/01/01 21:54:52 fauli Exp $
 
-EBO_DESCRIPTION="TOPO - Transmembrane protein display"
+EAPI="4"
+
+EBO_DESCRIPTION="Transmembrane protein display"
 
 inherit emboss
 

diff --git a/sci-biology/embassy-topo/files/embassy-topo-2.0.0.patch b/sci-biology/embassy-topo/files/embassy-topo-2.0.0.patch
index 5ed12f3..baeb345 100644
--- a/sci-biology/embassy-topo/files/embassy-topo-2.0.0.patch
+++ b/sci-biology/embassy-topo/files/embassy-topo-2.0.0.patch
@@ -11,7 +11,7 @@ index 277d1fa..151a388 100644
  
  EXTRA_DIST = depcomp ltmain.sh install-sh config.sub config.guess
 diff --git a/configure.in b/configure.in
-index 7d76246..bcd5520 100644
+index 7d76246..f4d24dd 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -187,15 +187,6 @@ AC_PROG_INSTALL
@@ -30,14 +30,17 @@ index 7d76246..bcd5520 100644
  
  dnl Check for header files
  AC_PATH_XTRA
-@@ -250,8 +241,8 @@ AX_LIB_POSTGRESQL
+@@ -248,10 +239,10 @@ AX_LIB_MYSQL
+ AX_LIB_POSTGRESQL
+ 
  CFLAGS="$CFLAGS $MYSQL_CFLAGS"
- LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
+-LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
++LIBS="${MYSQL_LIBS} ${LIBS}"
  
 -CFLAGS="$CFLAGS $POSTGRESQL_CFLAGS"
 -LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
 +CFLAGS="$POSTGRESQL_CFLAGS $CFLAGS"
-+LDFLAGS="$POSTGRESQL_LDFLAGS $LDFLAGS"
++LIBS="$POSTGRESQL_LIBS $LIBS"
  
  
  dnl "Export" these variables for PCRE
@@ -72,6 +75,249 @@ index 7d76246..bcd5520 100644
  
  
  
+diff --git a/emboss_doc/html/Makefile.am b/emboss_doc/html/Makefile.am
+index f512c33..7210583 100644
+--- a/emboss_doc/html/Makefile.am
++++ b/emboss_doc/html/Makefile.am
+@@ -2,4 +2,4 @@ pkgdata_DATA = topo.1.topo.gif \
+ 	index.html \
+ 	topo.html
+ 
+-pkgdatadir=$(prefix)/share/EMBOSS/doc/html/embassy/topo
++pkgdatadir=$(docdir)/html/embassy/topo
+diff --git a/emboss_doc/text/Makefile.am b/emboss_doc/text/Makefile.am
+index fcf98c3..39bd241 100644
+--- a/emboss_doc/text/Makefile.am
++++ b/emboss_doc/text/Makefile.am
+@@ -1,3 +1,3 @@
+ pkgdata_DATA =  topo.txt
+ 
+-pkgdatadir=$(prefix)/share/EMBOSS/doc/programs/text
++pkgdatadir=$(docdir)/programs/text
+diff --git a/m4/hpdf.m4 b/m4/hpdf.m4
+index a37940f..80b329c 100644
+--- a/m4/hpdf.m4
++++ b/m4/hpdf.m4
+@@ -33,8 +33,8 @@ ALT_HOME=/usr
+ #
+ # Locate hpdf
+ #
+-if test -d "${ALT_HOME}"
+-then
++#if test -d "${ALT_HOME}"
++#then
+ 
+ #
+ # Keep a copy if it fails
+@@ -45,13 +45,13 @@ then
+ #
+ # Set 
+ #
+-        LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib"
+-        CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include"
++#        LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib"
++#        CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include"
+ 
+ #
+ # Check for libharu in ALT_HOME
+ #
+-        AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0, -L${ALT_HOME}/lib)
++        AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0)
+ #
+ #
+ # If everything found okay then proceed to include png driver in config.
+@@ -80,10 +80,4 @@ then
+ 	  echo "No pdf support (libhpdf) found."
+ 	fi
+ 
+-else
+-        if test $withval != "no"; then
+-		echo "Directory $ALT_HOME does not exist"
+-		exit 0
+-        fi
+-fi
+ ])
+diff --git a/m4/mysql.m4 b/m4/mysql.m4
+index 12f8fe9..5cd8b90 100644
+--- a/m4/mysql.m4
++++ b/m4/mysql.m4
+@@ -26,7 +26,7 @@
+ #   This macro calls:
+ #
+ #     AC_SUBST(MYSQL_CFLAGS)
+-#     AC_SUBST(MYSQL_LDFLAGS)
++#     AC_SUBST(MYSQL_LIBS)
+ #     AC_SUBST(MYSQL_VERSION)
+ #
+ #   And sets:
+@@ -68,7 +68,7 @@ AC_DEFUN([AX_LIB_MYSQL],
+     )
+ 
+     MYSQL_CFLAGS=""
+-    MYSQL_LDFLAGS=""
++    MYSQL_LIBS=""
+     MYSQL_VERSION=""
+ 
+     dnl
+@@ -86,7 +86,7 @@ AC_DEFUN([AX_LIB_MYSQL],
+ 
+ dnl         MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
+             MYSQL_CFLAGS="`$MYSQL_CONFIG --include`"
+-            MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
++            MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
+ 
+             MYSQL_VERSION=`$MYSQL_CONFIG --version`
+ 
+@@ -97,7 +97,7 @@ dnl not be installed
+     	    EMBCFLAGS=$CFLAGS
+ 	    EMBLDFLAGS=$LDFLAGS
+ 	    CFLAGS="$MYSQL_CFLAGS $EMBCFLAGS"
+-	    LDFLAGS="$MYSQL_LDFLAGS $EMBLDFLAGS"
++        LIBS="${MYSQL_LIBS} ${LIBS}"
+ 
+             AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+                                               #include "mysql.h"]],
+@@ -115,7 +115,7 @@ dnl not be installed
+                 AC_MSG_RESULT([yes])
+             else
+ 	        MYSQL_CFLAGS=""
+-	        MYSQL_LDFLAGS=""
++	        MYSQL_LIBS=""
+                 found_mysql="no"
+                 AC_MSG_RESULT([no])
+             fi
+@@ -172,5 +172,5 @@ dnl not be installed
+ 
+     AC_SUBST([MYSQL_VERSION])
+     AC_SUBST([MYSQL_CFLAGS])
+-    AC_SUBST([MYSQL_LDFLAGS])
++    AC_SUBST([MYSQL_LIBS])
+ ])
+diff --git a/m4/pngdriver.m4 b/m4/pngdriver.m4
+index 5934321..de970ae 100644
+--- a/m4/pngdriver.m4
++++ b/m4/pngdriver.m4
+@@ -44,8 +44,8 @@ ALT_HOME=/usr
+ #
+ # Locate png/gd/zlib, if wanted
+ #
+-if test -d "${ALT_HOME}"
+-then
++#if test -d "${ALT_HOME}"
++#then
+ 
+ #
+ # Keep a copy if it fails
+@@ -69,20 +69,26 @@ then
+           fi
+ 
+ 
++PKG_CHECK_MODULES([PNG], [libpng])
++PKG_CHECK_MODULES([ZLIB], [zlib])
++AC_CHECK_PROG(GD_LIBS, [gdlib-config])
++GD_LIBS="`gdlib-config --libs` -lgd"
++GD_CFLAGS="`gdlib-config --cflags`"
++
+ 
+ 
+ 
+ #
+ # Check for zlib in ALT_HOME
+ #
+-        AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, -L${ALT_HOME}/lib -lz)
++        AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, ${ZLIB_LIBS})
+ #
+ 
+ #
+ # Check for png
+ #
+ 	if test $CHECK = "1" ; then
+-	  AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lz)
++	  AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , ${ZLIB_LIBS})
+ 	fi
+ 	
+ 
+@@ -92,7 +98,7 @@ then
+ # Check for gd
+ #
+ 	if test $CHECK = "1"; then
+-	  AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lgd -lpng -lz -lm)
++	  AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS})
+           if test $CHECK = "0"; then
+ 		echo need to upgrade gd for png driver for plplot
+ 	  fi
+@@ -101,7 +107,7 @@ then
+ # If everything found okay then proceed to include png driver in config.
+ #
+ 	if test $CHECK = "1" ; then
+-	  LIBS="$LIBS -lgd -lpng -lz -lm"
++	  LIBS="$LIBS ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS}"
+ 
+ 	  if test $ICCHECK = "1" ; then
+ 		  LIBS="$LIBS -liconv"
+@@ -114,10 +120,11 @@ then
+ 	  AC_DEFINE(PLD_png)
+ 	  AM_CONDITIONAL(AMPNG, true)
+ 	  echo PNG libraries found
+-	    if test $ALT_HOME = "/usr" ; then
++#	    if test $ALT_HOME = "/usr" ; then
+ 		  LDFLAGS="$ALT_LDFLAGS"
+ 		  CPPFLAGS="$ALT_CPPFLAGS"
+-	    fi
++        CFLAGS="${CFLAGS} ${PNG_CFLAGS} ${ZLIB_CFLAGS} ${GD_CFLAGS}"
++#	    fi
+ 	else
+ #
+ # If not okay then reset FLAGS.
+@@ -134,10 +141,4 @@ then
+ #       echo CPPFLAGS = $CPPFLAGS
+ 
+ 
+-else
+-        if test $withval != "no"; then
+-		echo "Directory $ALT_HOME does not exist"
+-		exit 0
+-        fi
+-fi
+ ])
+diff --git a/m4/postgresql.m4 b/m4/postgresql.m4
+index e6a804d..ef4d49c 100644
+--- a/m4/postgresql.m4
++++ b/m4/postgresql.m4
+@@ -26,7 +26,7 @@
+ #   This macro calls:
+ #
+ #     AC_SUBST(POSTGRESQL_CFLAGS)
+-#     AC_SUBST(POSTGRESQL_LDFLAGS)
++#     AC_SUBST(POSTGRESQL_LIBS)
+ #     AC_SUBST(POSTGRESQL_VERSION)
+ #
+ #   And sets:
+@@ -65,7 +65,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+     )
+ 
+     POSTGRESQL_CFLAGS=""
+-    POSTGRESQL_LDFLAGS=""
++    POSTGRESQL_LIBS=""
+     POSTGRESQL_POSTGRESQL=""
+ 
+     dnl
+@@ -82,7 +82,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+             AC_MSG_CHECKING([for PostgreSQL libraries])
+ 
+             POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
+-            POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
++            POSTGRESQL_LIBS="-L`$PG_CONFIG --libdir` `$PG_CONFIG --libs`"
+ 
+             POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+ 
+@@ -144,5 +144,5 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+ 
+     AC_SUBST([POSTGRESQL_VERSION])
+     AC_SUBST([POSTGRESQL_CFLAGS])
+-    AC_SUBST([POSTGRESQL_LDFLAGS])
++    AC_SUBST([POSTGRESQL_LIBS])
+ ])
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 6df86a0..ddd3ba9 100644
 --- a/src/Makefile.am