summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-04-27 07:16:20 +0000
committerMike Frysinger <vapier@gentoo.org>2004-04-27 07:16:20 +0000
commit7ef6cadb037ff3c7dc1df975d980ac6d940c6aa0 (patch)
tree0d576d625c121b9a594c4e4cd9e42d84ec390cef /app-text
parentok, screw you echangelog (diff)
downloadgentoo-2-7ef6cadb037ff3c7dc1df975d980ac6d940c6aa0.tar.gz
gentoo-2-7ef6cadb037ff3c7dc1df975d980ac6d940c6aa0.tar.bz2
gentoo-2-7ef6cadb037ff3c7dc1df975d980ac6d940c6aa0.zip
Add gcc-3.4 patch #47667 by Tamran Lengyel
Diffstat (limited to 'app-text')
-rw-r--r--app-text/a2ps/ChangeLog6
-rw-r--r--app-text/a2ps/a2ps-4.13c.ebuild7
-rw-r--r--app-text/a2ps/files/4.13c-gcc34.patch12
3 files changed, 21 insertions, 4 deletions
diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 0fcdb3066463..1a660c0bda12 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/a2ps
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.24 2004/03/09 05:31:59 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.25 2004/04/27 07:16:20 vapier Exp $
+
+ 27 Apr 2004; Mike Frysinger <vapier@gentoo.org> +files/4.13c-gcc34.patch,
+ a2ps-4.13c.ebuild:
+ Add gcc-3.4 patch #47667 by Tamran Lengyel
07 Mar 2004; Bret Curtis <psi29a@gentoo.org> a2ps-4.13c.ebuild:
Added ~mips to KEYWORDS.
diff --git a/app-text/a2ps/a2ps-4.13c.ebuild b/app-text/a2ps/a2ps-4.13c.ebuild
index 8e01daf4dee6..272fe8f4211a 100644
--- a/app-text/a2ps/a2ps-4.13c.ebuild
+++ b/app-text/a2ps/a2ps-4.13c.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.9 2004/03/09 05:31:59 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.10 2004/04/27 07:16:20 vapier Exp $
inherit gnuconfig eutils
@@ -10,9 +10,9 @@ HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
SRC_URI="mirror://gentoo/${P}.tar.gz
cjk? ( http://dev.gentoo.org/~usata/distfiles/${P}-ja_nls.patch.gz ) "
-SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha amd64 hppa ~mips"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa amd64 ~ia64"
IUSE="nls tetex cjk"
DEPEND=">=sys-devel/automake-1.6
@@ -35,6 +35,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-locale-gentoo.diff
epatch ${FILESDIR}/a2ps-4.13-stdout.diff
+ epatch ${FILESDIR}/${PV}-gcc34.patch
use cjk && epatch ${DISTDIR}/${P}-ja_nls.patch.gz
}
diff --git a/app-text/a2ps/files/4.13c-gcc34.patch b/app-text/a2ps/files/4.13c-gcc34.patch
new file mode 100644
index 000000000000..926e28f62005
--- /dev/null
+++ b/app-text/a2ps/files/4.13c-gcc34.patch
@@ -0,0 +1,12 @@
+--- a2ps-4.13/lib/path-concat.c 2002-03-04 13:46:25.000000000 -0500
++++ a2ps-4.13/lib/path-concat_.c 2004-04-13 01:47:03.596895984 -0400
+@@ -31,7 +31,8 @@
+ #endif
+ #include <sys/types.h>
+
+-char *malloc ();
++/* Commented out by Tamran to work with gcc 3.4 */
++/* char *malloc (); */
+
+ #ifndef DIRECTORY_SEPARATOR
+ # define DIRECTORY_SEPARATOR '/'