Changed "bison -y" to "yacc" for YACC. Closing bug 29691.

5 files changed, 23 insertions, 9 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 81927f774971..5d5e54bb4afc 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.19 2003/10/30 18:03:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.20 2003/11/06 14:59:21 usata Exp $
 
 *a2ps-4.13c (27 Sep 2003)
 
@@ -16,6 +16,10 @@
 
 *a2ps-4.13b-r5 (16 Jul 2003)
 
+  06 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13b-r5.ebuild,
+  a2ps-4.13c.ebuild:
+  Force "yacc" instead of "bison -y". Closing bug #29691.
+
   31 Oct 2003; Mamoru KOMACHI <usata@gentoo.org>
   files/a2ps-4.13-autoconf-gentoo.diff:
   Updated autoconf patch, see #32163
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index bb7d51699dfc..0a20c5fa3417 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,8 +1,8 @@
-MD5 39890bfce53ad8d4fc58fb6e8ad823d3 ChangeLog 3082
+MD5 9e362e1c402120a4779f391b96737d4e ChangeLog 3233
 MD5 ace8354c5ef6feb07640ca561f18cda3 a2ps-4.13b-r4.ebuild 1162
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 9903e6e3352019ea6a18cc911ba208c2 a2ps-4.13c.ebuild 1665
-MD5 d38a31821def1515496c3c191c8a4709 a2ps-4.13b-r5.ebuild 1647
+MD5 371fcfa7df5cce26e00f0270b2baaba5 metadata.xml 526
+MD5 ece65a1501c4839b82676dc4a5fd2af8 a2ps-4.13c.ebuild 1624
+MD5 6d062c508e943d1a7193d1a86b01f8c7 a2ps-4.13b-r5.ebuild 1689
 MD5 404552b249e258ffb606be0cc60f89d5 files/a2ps-4.13-autoconf-gentoo.diff 2247
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 MD5 98bf324f9bbeef13a3a5f875d2f0198f files/digest-a2ps-4.13b-r4 63
diff --git a/app-text/a2ps/a2ps-4.13b-r5.ebuild b/app-text/a2ps/a2ps-4.13b-r5.ebuild
index e76096f9b787..d8cdf5bdd0e7 100644
--- a/app-text/a2ps/a2ps-4.13b-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.13b-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.9 2003/10/31 20:13:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.10 2003/11/06 14:59:21 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -25,6 +25,7 @@ IUSE="nls tetex cjk"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.57
 	>=dev-util/gperf-2.7.2
+	>=dev-util/yacc-1.9.1
 	cjk? ( >=sys-apps/sed-4 )"
 RDEPEND=">=app-text/ghostscript-6.23
 	>=app-text/psutils-1.17
@@ -44,6 +45,7 @@ src_unpack() {
 
 src_compile() {
 
+	export YACC=yacc
 	export WANT_AUTOCONF_2_5=1 ; autoreconf
 
 	econf --sysconfdir=/etc/a2ps \
diff --git a/app-text/a2ps/a2ps-4.13c.ebuild b/app-text/a2ps/a2ps-4.13c.ebuild
index 4c523c1b4f80..8b59244b1ba3 100644
--- a/app-text/a2ps/a2ps-4.13c.ebuild
+++ b/app-text/a2ps/a2ps-4.13c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.4 2003/10/16 04:59:06 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.5 2003/11/06 14:59:21 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -21,7 +21,6 @@ DEPEND=">=sys-devel/automake-1.6
 	>=dev-util/yacc-1.9.1
 	>=app-text/ghostscript-6.23
 	>=app-text/psutils-1.17
-	>=sys-apps/sed-4
 	tetex? ( virtual/tetex )"
 RDEPEND=">=app-text/ghostscript-6.23
 	>=app-text/psutils-1.17
@@ -59,7 +58,7 @@ src_install() {
 		lispdir=${D}/usr/share/emacs/site-lisp \
 		|| die "einstall failed"
 
-	sed -i -e "s,${D},,g" ${D}/etc/a2ps/a2ps.cfg
+	dosed /etc/a2ps/a2ps.cfg
 
 	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
 }
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index 1fa0ca569505..99d1d62258e2 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>printing</herd>
+<maintainer>
+  <email>usata@gentoo.org</email>
+  <name>Mamoru KOMACHI</name>
+  <description>I list my name as a maintainer because I added cjk
+  patch for a2ps so I have the responsibility for that part (in fact,
+  it caused many troubles with autoconf ;-/) , but the package should
+  belong to and be maintained by printing herd ;-)
+  </description>
+</maintainer>
 </pkgmetadata>