summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ehmsen <ehmsen@gentoo.org>2006-01-18 15:57:19 +0000
committerMartin Ehmsen <ehmsen@gentoo.org>2006-01-18 15:57:19 +0000
commit4cc51bc558c6e802ec01deb6eee7c88e2286dd35 (patch)
tree9dc11600e8d1c00ea67bc8ac77822b2104fef265 /dev-tex
parentVersion bump to 2.0_rc19 to resolve some issues with string conversion and sp... (diff)
downloadgentoo-2-4cc51bc558c6e802ec01deb6eee7c88e2286dd35.tar.gz
gentoo-2-4cc51bc558c6e802ec01deb6eee7c88e2286dd35.tar.bz2
gentoo-2-4cc51bc558c6e802ec01deb6eee7c88e2286dd35.zip
Fixes "conflicting types for 'malloc'" compilation error, see bug #116046
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-tex')
-rw-r--r--dev-tex/detex/ChangeLog7
-rw-r--r--dev-tex/detex/Manifest6
-rw-r--r--dev-tex/detex/detex-2.7.ebuild10
3 files changed, 14 insertions, 9 deletions
diff --git a/dev-tex/detex/ChangeLog b/dev-tex/detex/ChangeLog
index 66b94558c72f..a603e12d2a09 100644
--- a/dev-tex/detex/ChangeLog
+++ b/dev-tex/detex/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-tex/detex
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/ChangeLog,v 1.10 2005/05/01 18:26:17 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/ChangeLog,v 1.11 2006/01/18 15:57:19 ehmsen Exp $
+
+ 18 Jan 2006; Martin Ehmsen <ehmsen@gentoo.org> detex-2.7.ebuild:
+ Fixes "conflicting types for 'malloc'" compilation error, see bug #116046
01 May 2005; Michael Hanselmann <hansmi@gentoo.org> detex-2.7.ebuild:
Stable on ppc.
diff --git a/dev-tex/detex/Manifest b/dev-tex/detex/Manifest
index e344e487b554..099d5c60216d 100644
--- a/dev-tex/detex/Manifest
+++ b/dev-tex/detex/Manifest
@@ -1,4 +1,4 @@
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 485e2d44905e11bcd67a44e403358a97 ChangeLog 986
-MD5 cb5464375c5b00960dadf2fc5897b66c detex-2.7.ebuild 934
+MD5 67a43cc04daa575b1b4f2f17c723b7d8 ChangeLog 1130
+MD5 85c7e00b5f2135cb3bb14766229d3a60 detex-2.7.ebuild 1009
MD5 dab2b399b59ec37d22e7c173360029d0 files/digest-detex-2.7 57
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
diff --git a/dev-tex/detex/detex-2.7.ebuild b/dev-tex/detex/detex-2.7.ebuild
index 70f925c8d14b..29d0fb335e3a 100644
--- a/dev-tex/detex/detex-2.7.ebuild
+++ b/dev-tex/detex/detex-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/detex-2.7.ebuild,v 1.12 2005/05/01 18:26:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/detex-2.7.ebuild,v 1.13 2006/01/18 15:57:19 ehmsen Exp $
DESCRIPTION="A filter program that removes the LaTeX (or TeX) control sequences"
HOMEPAGE="http://www.cs.purdue.edu/homes/trinkle/detex/"
@@ -8,10 +8,11 @@ SRC_URI="http://www.cs.purdue.edu/homes/trinkle/detex/${P}.tar"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="x86 ppc ~sparc s390"
+KEYWORDS="~x86 ~ppc ~sparc ~s390"
IUSE=""
-DEPEND="virtual/libc sys-devel/flex"
+DEPEND="virtual/libc
+ sys-devel/flex"
src_unpack() {
unpack ${A}
@@ -20,6 +21,7 @@ src_unpack() {
-e "s:CFLAGS = -O \${DEFS}:CFLAGS = ${CFLAGS} \${DEFS}:" \
-e 's:LEX = lex:#LEX = lex:' \
-e 's:#LEX = flex:LEX = flex:' \
+ -e 's:#DEFS += ${DEFS} -DNO_MALLOC_DECL:DEFS += -DNO_MALLOC_DECL:' \
-e 's: ${CC} ${CFLAGS} -o $@ ${D_OBJ} -ll: ${CC} ${CFLAGS} -o $@ ${D_OBJ} -lfl:' \
Makefile || die "sed failed"
}