pngnq as-needed fix

(Portage version: 2.1.7.16/cvs/Linux x86_64)

3 files changed, 50 insertions, 9 deletions

diff --git a/media-gfx/pngnq/ChangeLog b/media-gfx/pngnq/ChangeLog
index e0f3c614558a..d28e8ff63a8d 100644
--- a/media-gfx/pngnq/ChangeLog
+++ b/media-gfx/pngnq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pngnq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.5 2010/01/08 13:34:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.6 2010/01/17 22:32:13 hanno Exp $
+
+  17 Jan 2010; Hanno Boeck <hanno@gentoo.org> pngnq-1.0.ebuild,
+  +files/pngnq-1.0-as-needed.patch:
+  Fix for --as-needed thanks to Kacper Kowalik in #301002. Cleanup.
 
 *pngnq-1.0 (08 Jan 2010)
 
diff --git a/media-gfx/pngnq/files/pngnq-1.0-as-needed.patch b/media-gfx/pngnq/files/pngnq-1.0-as-needed.patch
new file mode 100644
index 000000000000..912364f5fa10
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.0-as-needed.patch
@@ -0,0 +1,39 @@
+--- pngnq-1.0.orig/configure.ac	2009-05-20 14:05:52.000000000 +0200
++++ pngnq-1.0/configure.ac	2010-01-16 19:51:43.087613985 +0100
+@@ -24,6 +24,10 @@
+ AC_FUNC_STAT
+ AC_HEADER_STDBOOL
+ 
++AC_SEARCH_LIBS([zlibVersion],[z])
++AC_SEARCH_LIBS([sqrt],[m])
++PKG_CHECK_MODULES([PNG], [libpng >= 1.2.0])
++
+ # checks for library functions
+ AC_CHECK_FUNCS([getopt])
+ AC_CHECK_FUNCS([floor])
+@@ -35,5 +39,5 @@
+ AC_CHECK_FUNCS([strrchr])
+ 
+ AC_CONFIG_HEADERS([src/config.h])
+-AC_CONFIG_FILES([Makefile src/Makefile freegetopt/Makefile])
++AC_CONFIG_FILES([Makefile src/Makefile])
+ AC_OUTPUT
+--- pngnq-1.0.orig/Makefile.am	2009-05-20 14:05:52.000000000 +0200
++++ pngnq-1.0/Makefile.am	2010-01-16 19:50:25.127860135 +0100
+@@ -1,3 +1,3 @@
+-SUBDIRS = freegetopt src
++SUBDIRS = src
+ 
+ dist_man_MANS = pngnq.1
+--- pngnq-1.0.orig/src/Makefile.am	2009-05-20 14:04:15.000000000 +0200
++++ pngnq-1.0/src/Makefile.am	2010-01-16 20:06:48.150861688 +0100
+@@ -1,6 +1,7 @@
+-AM_LDFLAGS = ${shell libpng-config --ldflags} -lz
+-AM_CFLAGS = ${shell libpng-config --I_opts} -Wall --pedantic -std=gnu99
++AM_CFLAGS = -Wall --pedantic -std=gnu99 @PNG_CFLAGS@
+ 
+ bin_PROGRAMS = pngnq pngcomp
+ pngnq_SOURCES = pngnq.c neuquant32.c rwpng.c  neuquant32.h rwpng.h errors.h
++pngnq_LDADD  = @PNG_LIBS@
+ pngcomp_SOURCES = pngcomp.c rwpng.c colorspace.c  colorspace.h
++pngcomp_LDADD  = @PNG_LIBS@
diff --git a/media-gfx/pngnq/pngnq-1.0.ebuild b/media-gfx/pngnq/pngnq-1.0.ebuild
index 67d4b094c4f5..a0646cfd2157 100644
--- a/media-gfx/pngnq/pngnq-1.0.ebuild
+++ b/media-gfx/pngnq/pngnq-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.1 2010/01/08 13:34:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.2 2010/01/17 22:32:13 hanno Exp $
 
 EAPI=2
 
@@ -9,7 +9,6 @@ inherit eutils autotools
 DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format."
 HOMEPAGE="http://pngnq.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	# mirror://sourceforge/${PN}/${P}-makefile.patch"
 
 LICENSE="as-is"
 SLOT="0"
@@ -18,13 +17,12 @@ IUSE=""
 
 DEPEND="media-libs/libpng"
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_prepare() {
+	epatch "${FILESDIR}/pngnq-1.0-as-needed.patch"
+	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	rm -rf "${D}/usr/share/doc/pngnq/"
-	dodoc README || die "dodoc failed"
-	doman pngnq.1
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README NEWS || die "dodoc failed"
 }