Resepct LDFLAGS, do not link static, unbundle zlib, #298094, #337658, #366197

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

4 files changed, 118 insertions, 2 deletions

diff --git a/sci-biology/maqview/ChangeLog b/sci-biology/maqview/ChangeLog
index 0c70ed74778d..459d63ce0ac8 100644
--- a/sci-biology/maqview/ChangeLog
+++ b/sci-biology/maqview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/maqview
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/ChangeLog,v 1.3 2010/09/16 17:22:19 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/ChangeLog,v 1.4 2011/05/06 08:42:25 jlec Exp $
+
+*maqview-0.2.5-r1 (06 May 2011)
+
+  06 May 2011; Justin Lecher <jlec@gentoo.org> +files/0.2.5-ldflags.patch,
+  +files/0.2.5-zlib.patch, +maqview-0.2.5-r1.ebuild:
+  Resepct LDFLAGS, do not link static, unbundle zlib, #298094, #337658, #366197
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> maqview-0.2.5.ebuild:
   virtual/glut -> media-libs/glut
diff --git a/sci-biology/maqview/files/0.2.5-ldflags.patch b/sci-biology/maqview/files/0.2.5-ldflags.patch
new file mode 100644
index 000000000000..92b9a3ed58ac
--- /dev/null
+++ b/sci-biology/maqview/files/0.2.5-ldflags.patch
@@ -0,0 +1,46 @@
+ configure.ac |   18 +++---------------
+ 1 files changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 90e612b..5a00d15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,17 +9,10 @@ AC_PROG_INSTALL
+ AC_STDC_HEADERS
+ 
+ is_static=0
+-case ${prefix} in
+-  NONE);;
+-  *) is_static=1
+-     AC_MSG_WARN([Library libglut will be statically linked.])
+-     LDFLAGS="-L${prefix}/lib"
+-     CPPFLAGS="-I${prefix}/include";;
+-esac
+ 
+ # set CFLAGS and LDFLAGS
+ 
+-true_CFLAGS="-g -O2 -Wall -W -DMAQ_LONGREADS"
++true_CFLAGS="-DMAQ_LONGREADS"
+ case "${host_os}" in
+   darwin*)
+     GLLIBS="-framework OpenGL -framework GLUT"
+@@ -30,17 +23,12 @@ case "${host_os}" in
+ 	  i?86) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64";;
+ 	esac
+ 	AC_CHECK_LIB([glut], [glutMouseWheelFunc], [CPPFLAGS="$CPPFLAGS -DHAVE_FREEGLUT"])
+-    AC_ARG_ENABLE(static, [  --enable-static         statically link GLUT (Linux Only)],
+-				  [is_static=1])
+-    case $is_static in
+-      1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm";;
+-	  0) GLLIBS="-lGL -lglut -lm";;
+-    esac
++	GLLIBS="-lGL -lglut -lm -lGLU"
+ 	AC_SUBST([GLLIBS]);;
+ #  *) AC_MSG_ERROR([OS is not supported]);;
+ esac
+ AM_CONDITIONAL([HAVE_GL], [test "$isgl" = 1])
+-CFLAGS=$true_CFLAGS
++CFLAGS="${CFLAGS} $true_CFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/sci-biology/maqview/files/0.2.5-zlib.patch b/sci-biology/maqview/files/0.2.5-zlib.patch
new file mode 100644
index 000000000000..cd35273de66b
--- /dev/null
+++ b/sci-biology/maqview/files/0.2.5-zlib.patch
@@ -0,0 +1,33 @@
+ Makefile.am |    6 +++---
+ zrio.c      |    2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dad515a..9617eb7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ bin_PROGRAMS = zrio maqindex maqview maqindex_socks
+-zlib_src = adler32.c compress.c crc32.c deflate.c gzio.c inffast.c inflate.c \
+-		   infback.c inftrees.c trees.c uncompr.c zutil.c
+-generic_src = btree.c maqmap_index.c zrio.c stdhashc.h stdhashc.cc cns_cache.c const.c $(zlib_src)
++generic_src = btree.c maqmap_index.c zrio.c stdhashc.h stdhashc.cc cns_cache.c const.c
++LIBS = -lz
+ zrio_SOURCES = zrio_main.c $(generic_src)
++zrio_LDADD = -lz
+ maqindex_SOURCES = maqmap_index_main.c $(generic_src)
+ maqview_SOURCES = read_cache.c view_goto.c view_panel.c gl_gui.c MainFrame.c \
+ 				  $(generic_src)				  
+diff --git a/zrio.c b/zrio.c
+index ffed00a..fe744df 100644
+--- a/zrio.c
++++ b/zrio.c
+@@ -506,7 +506,7 @@ int build_index(int in, int64_t span, struct access **built, void (*notify)(void
+             totin += strm.avail_in;
+             totout += strm.avail_out;
+ 			tmp = strm.avail_out;
+-            ret = inflate_zr(&strm, Z_BLOCK);      /* return at end of block */
++            ret = inflate(&strm, Z_BLOCK);      /* return at end of block */
+             totin -= strm.avail_in;
+             totout -= strm.avail_out;
+ 			if(notify) notify(obj, window + WINSIZE - tmp, tmp - strm.avail_out, totout);
diff --git a/sci-biology/maqview/maqview-0.2.5-r1.ebuild b/sci-biology/maqview/maqview-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..08a7885c2337
--- /dev/null
+++ b/sci-biology/maqview/maqview-0.2.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/maqview-0.2.5-r1.ebuild,v 1.1 2011/05/06 08:42:25 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="GUI for sci-biology/maq, a short read mapping assembler"
+HOMEPAGE="http://maq.sourceforge.net/"
+SRC_URI="mirror://sourceforge/maq/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/freeglut
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sci-biology/maq"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-zlib.patch
+	eautoreconf
+}