Respect CFLAGS/LDFLAGS, bug #240127

(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)

3 files changed, 90 insertions, 1 deletions

diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index ca52cf1dd1c4..5ed923e5e6ac 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/catdoc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.22 2008/08/17 17:25:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.23 2008/10/05 21:33:25 aballier Exp $
+
+*catdoc-0.94.2-r1 (05 Oct 2008)
+
+  05 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/catdoc-0.94.2-flags.patch, +catdoc-0.94.2-r1.ebuild:
+  Respect CFLAGS/LDFLAGS, bug #240127
 
   17 Aug 2008; Alexis Ballier <aballier@gentoo.org> -catdoc-0.94.1.ebuild:
   remove old
diff --git a/app-text/catdoc/catdoc-0.94.2-r1.ebuild b/app-text/catdoc/catdoc-0.94.2-r1.ebuild
new file mode 100644
index 000000000000..524eb6e2a9a4
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.94.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.1 2008/10/05 21:33:25 aballier Exp $
+
+WANT_AUTOCONF=2.1
+WANT_AUTOMAKE=none
+
+inherit autotools eutils
+
+DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+IUSE="tk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD CREDITS NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-flags.patch"
+	eautoconf
+}
+
+src_compile() {
+
+	local myconf="--with-install-root=${D}"
+
+	use tk \
+		&& myconf="${myconf} --with-wish=/usr/bin/wish" \
+		|| myconf="${myconf} --disable-wordview"
+
+	econf ${myconf} || die
+	emake LIB_DIR=/usr/share/catdoc || die
+
+}
+
+src_install() {
+
+	emake -j1 mandir=/usr/share/man/man1 install || die
+	dodoc ${DOCS}
+
+}
diff --git a/app-text/catdoc/files/catdoc-0.94.2-flags.patch b/app-text/catdoc/files/catdoc-0.94.2-flags.patch
new file mode 100644
index 000000000000..eb4e7e469e91
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.2-flags.patch
@@ -0,0 +1,35 @@
+Index: catdoc-0.94.2/configure.in
+===================================================================
+--- catdoc-0.94.2.orig/configure.in
++++ catdoc-0.94.2/configure.in
+@@ -100,10 +100,6 @@ AC_C_CONST
+ dnl Checks for library functions.
+ AC_FUNC_SETVBUF_REVERSED
+ 
+-if test "$GCC" = "yes"; then
+-	CFLAGS="-g -O2 -Wall"
+-fi
+-
+ AC_DEFINE_UNQUOTED([SOURCE_CHARSET],"$sourcecharset",[Character encoding used by default for 8-bit source files])
+ AC_DEFINE_UNQUOTED([TARGET_CHARSET],"$targetcharset",[Output character encoding used by default, if impossible to determine encoding from locale])
+ AC_DEFINE_UNQUOTED([SPEC_EXT],"$specsuffix",[Suffix for files with special symbols map (ones to be replaced regardless of availability in target encoding)])
+Index: catdoc-0.94.2/src/Makefile.in
+===================================================================
+--- catdoc-0.94.2.orig/src/Makefile.in
++++ catdoc-0.94.2/src/Makefile.in
+@@ -74,12 +74,12 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
+ #	$(CC) -c $(CFLAGS) $*
+ all: @buildtargets@
+ catdoc: $(OBJ)
+-	$(CC)  -o catdoc  $(OBJ)
++	$(CC)  $(LDFLAGS) -o catdoc  $(OBJ)
+ xls2csv: $(OBJXLS)
+-	$(CC) -o xls2csv $(OBJXLS) -lm
++	$(CC) $(LDFLAGS) -o xls2csv $(OBJXLS) -lm
+ 
+ catppt: $(OBJPPT)
+-	$(CC) -o catppt $(OBJPPT) -lm
++	$(CC) $(LDFLAGS) -o catppt $(OBJPPT) -lm
+ 
+ install: @installtargets@
+ install-catdoc:catdoc xls2csv catppt