diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-28 04:04:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-28 04:04:36 +0000 |
| commit | 728e9243b1cec6feee70e605bb36bc7226f63421 (patch) | |
| tree | 6d3142ac73a928e1ff91cb2d6a45d487c1c8f8e5 /dev-util | |
| parent | old (diff) | |
| download | historical-728e9243b1cec6feee70e605bb36bc7226f63421.tar.gz historical-728e9243b1cec6feee70e605bb36bc7226f63421.tar.bz2 historical-728e9243b1cec6feee70e605bb36bc7226f63421.zip | |
add a workaround so yacc + bison dont collide with /usr/bin/yacc #90089
Package-Manager: portage-2.0.51.20-r4
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/yacc/Manifest | 14 | ||||
| -rw-r--r-- | dev-util/yacc/yacc-1.9.1-r2.ebuild | 29 |
2 files changed, 23 insertions, 20 deletions
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest index 324b58775648..3c998a3c4fa6 100644 --- a/dev-util/yacc/Manifest +++ b/dev-util/yacc/Manifest @@ -1,17 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 019c908d0c797b529bc9bae03f1f7030 ChangeLog 1881 -MD5 ee90750e25982cdcb8b49cd38d6bd9f8 yacc-1.9.1-r1.ebuild 1072 -MD5 e31c11e35dfecafe1196be1c84100aeb yacc-1.9.1-r2.ebuild 1111 -MD5 afeab71394d9c421389458f63b2cb173 files/digest-yacc-1.9.1-r1 60 +MD5 f21a09bfa9a7ce70018b9f45f7069cf9 yacc-1.9.1-r2.ebuild 1510 MD5 afeab71394d9c421389458f63b2cb173 files/digest-yacc-1.9.1-r2 60 MD5 df645d0e6382050201af35e3002dfc5b files/mkstemp.patch 413 MD5 c5a221a78a10f6156ea9ddb2ade30598 files/yacc-1.9.1-ia64.patch 504 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.14 (GNU/Linux) - -iD8DBQFB5wVLroRuSHgZdywRAjpSAJ0R3oDPkIb70VVIk2mnskGEwAxK3gCfctU0 -s2jwNiZS9h0EKuVDyJa3qF8= -=MTbi ------END PGP SIGNATURE----- diff --git a/dev-util/yacc/yacc-1.9.1-r2.ebuild b/dev-util/yacc/yacc-1.9.1-r2.ebuild index d403f271e585..bef85cd6c855 100644 --- a/dev-util/yacc/yacc-1.9.1-r2.ebuild +++ b/dev-util/yacc/yacc-1.9.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r2.ebuild,v 1.5 2005/01/13 23:32:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r2.ebuild,v 1.6 2005/04/28 04:04:36 vapier Exp $ inherit eutils toolchain-funcs @@ -13,23 +13,21 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" IUSE="" -RDEPEND="virtual/libc" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" +DEPEND="" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Use our CFLAGS sed -i -e 's: -O : $(CFLAGS) :' Makefile || die 'sed failed' # mkstemp patch from byacc ebuild - epatch ${FILESDIR}/mkstemp.patch + epatch "${FILESDIR}"/mkstemp.patch # The following patch fixes yacc to run correctly on ia64 (and # other 64-bit arches). See bug 46233 - epatch ${FILESDIR}/yacc-1.9.1-ia64.patch + epatch "${FILESDIR}"/yacc-1.9.1-ia64.patch } src_compile() { @@ -42,3 +40,20 @@ src_install() { doman yacc.1 dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README* } + +pkg_preinst() { + # bison installs a /usr/bin/yacc symlink ... + # we need to remove it to avoid triggering + # collision-protect errors #90089 + if [[ -L ${ROOT}/usr/bin/yacc ]] ; then + rm -f "${ROOT}"/usr/bin/yacc + fi +} + +pkg_postrm() { + # and if we uninstall yacc but keep bison, + # lets restore the /usr/bin/yacc symlink + if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/bison ]] ; then + ln -s bison "${ROOT}"/usr/bin/yacc + fi +} |