From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q27Ap-0005OG-L9 for garchives@archives.gentoo.org; Tue, 22 Mar 2011 19:23:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AC031C037; Tue, 22 Mar 2011 19:23:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C1D311C037 for ; Tue, 22 Mar 2011 19:23:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E8432AC094 for ; Tue, 22 Mar 2011 19:23:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A0E008006A for ; Tue, 22 Mar 2011 19:23:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/emboss/files/, sci-biology/emboss/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/emboss/ChangeLog sci-biology/emboss/files/emboss-6.3.1_p4-r1.patch X-VCS-Directories: sci-biology/emboss/files/ sci-biology/emboss/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: dfccde9c75eeb9191772d8e03787ddeef89d905e Date: Tue, 22 Mar 2011 19:23:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2c2b9f1107d5e5df294330b0fb7a933d commit: dfccde9c75eeb9191772d8e03787ddeef89d905e Author: Justin Lecher gentoo org> AuthorDate: Tue Mar 22 19:21:58 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Mar 22 19:21:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Ddfccde9c Fix compile correctly against postgresql, #359959 (Portage version: 2.2.0_alpha28/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-biology/emboss/ChangeLog | 3 ++ sci-biology/emboss/files/emboss-6.3.1_p4-r1.patch | 32 +++++++++++++++= +++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/sci-biology/emboss/ChangeLog b/sci-biology/emboss/ChangeLog index 002c99c..8b56592 100644 --- a/sci-biology/emboss/ChangeLog +++ b/sci-biology/emboss/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.61 2= 011/03/09 16:29:05 jlec Exp $ =20 + 22 Mar 2011; Justin Lecher files/emboss-6.3.1_p4-r1.= patch: + Fix compile correctly against postgresql, #359959 + 21 Mar 2011; Justin Lecher files/emboss-6.3.1_p4-r1.= patch: Implicit decs fix, thanks bicatali for help =20 diff --git a/sci-biology/emboss/files/emboss-6.3.1_p4-r1.patch b/sci-biol= ogy/emboss/files/emboss-6.3.1_p4-r1.patch index 6bc6351..9bb97c1 100644 --- a/sci-biology/emboss/files/emboss-6.3.1_p4-r1.patch +++ b/sci-biology/emboss/files/emboss-6.3.1_p4-r1.patch @@ -1,3 +1,27 @@ + Makefile.am | 13 +++++++++- + README.fixes | 9 +++++++ + ajax/Makefile.am | 4 +- + ajax/acd/Makefile.am | 8 +++++- + ajax/ajaxdb/Makefile.am | 6 +++- + ajax/core/Makefile.am | 12 +++++++-- + ajax/core/ajax-pcre-config.h.in | 1 + + ajax/core/ajreg.h | 9 +++++++ + ajax/ensembl/Makefile.am | 8 ++++-- + ajax/graphics/Makefile.am | 9 ++++++- + ajax/graphics/ajgraph.c | 14 +++++++++++- + configure.in | 45 +++++++++++++++++++++++++-------= ------ + doc/manuals/Makefile.am | 2 +- + doc/programs/html/Makefile.am | 4 +- + doc/programs/text/Makefile.am | 4 +- + doc/tutorials/Makefile.am | 2 +- + emboss/Makefile.am | 12 ++++++---- + m4/hpdf.m4 | 16 ++++--------- + m4/mysql.m4 | 14 ++++++------ + m4/pngdriver.m4 | 29 +++++++++++++------------ + m4/postgresql.m4 | 8 +++--- + nucleus/Makefile.am | 10 ++++++-- + 22 files changed, 156 insertions(+), 83 deletions(-) + diff --git a/Makefile.am b/Makefile.am index 4fe2ed1..7f3a95f 100644 --- a/Makefile.am @@ -104,7 +128,7 @@ index da57727..857ca5f 100644 libajaxdb_la_LDFLAGS =3D $(LINKFLAGS) +libajaxdb_la_LIBADD =3D ../core/libajax.la ../ensembl/libensembl.la diff --git a/ajax/core/Makefile.am b/ajax/core/Makefile.am -index af27cb0..8fa4a3a 100644 +index af27cb0..fa57e93 100644 --- a/ajax/core/Makefile.am +++ b/ajax/core/Makefile.am @@ -12,13 +12,18 @@ CYGWIN_LDAJAX =3D -L../../plplot -L../expat -L../pcr= e -L../zlib \ @@ -141,7 +165,7 @@ index af27cb0..8fa4a3a 100644 endif =20 libajax_la_LDFLAGS =3D $(LINKFLAGS) -+libajax_la_LIBADD =3D $(EXTRA_LIBS) $(POSTGRESQL_LDFLAGS) $(MYSQL_LDFLA= GS) ++libajax_la_LIBADD =3D $(EXTRA_LIBS) $(POSTGRESQL_LIBS) $(MYSQL_LIBS) diff --git a/ajax/core/ajax-pcre-config.h.in b/ajax/core/ajax-pcre-confi= g.h.in new file mode 100644 index 0000000..b09e4e6 @@ -654,7 +678,7 @@ index 5934321..de970ae 100644 -fi ]) diff --git a/m4/postgresql.m4 b/m4/postgresql.m4 -index e6a804d..ef4d49c 100644 +index e6a804d..eb14d5c 100644 --- a/m4/postgresql.m4 +++ b/m4/postgresql.m4 @@ -26,7 +26,7 @@ @@ -680,7 +704,7 @@ index e6a804d..ef4d49c 100644 =20 POSTGRESQL_CFLAGS=3D"-I`$PG_CONFIG --includedir`" - POSTGRESQL_LDFLAGS=3D"-L`$PG_CONFIG --libdir` -lpq" -+ POSTGRESQL_LIBS=3D"-L`$PG_CONFIG --libdir` `$PG_CONFIG --li= bs`" ++ POSTGRESQL_LIBS=3D"-L`$PG_CONFIG --libdir` `$PG_CONFIG --li= bs` -lpq" =20 POSTGRESQL_VERSION=3D`$PG_CONFIG --version | sed -e 's#Post= greSQL ##'` =20