diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-07-02 16:21:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-07-02 16:21:17 +0000 |
| commit | 15a6bdbc51d22c83b6cb64d9a64e6fbb332eac89 (patch) | |
| tree | 52d97103054d59ddbbf235e8a820bf9380d78694 /app-arch | |
| parent | Stable for HPPA (bug #475424). (diff) | |
| download | gentoo-2-15a6bdbc51d22c83b6cb64d9a64e6fbb332eac89.tar.gz gentoo-2-15a6bdbc51d22c83b6cb64d9a64e6fbb332eac89.tar.bz2 gentoo-2-15a6bdbc51d22c83b6cb64d9a64e6fbb332eac89.zip | |
Move `ln` update to the patch rather than sed-ing it after the fact #475334 by Yuta SATOH.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.6-r4.ebuild | 5 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.4-man-links.patch | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index 74704a2532af..8c4dfebed4b2 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/bzip2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.106 2013/06/23 07:42:43 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.107 2013/07/02 16:21:17 vapier Exp $ + + 02 Jul 2013; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild, + files/bzip2-1.0.4-man-links.patch: + Move `ln` update to the patch rather than sed-ing it after the fact #475334 by + Yuta SATOH. *bzip2-1.0.6-r4 (23 Jun 2013) diff --git a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild index a6f51bfe8154..fc4454e0c378 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild +++ b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.1 2013/06/23 07:42:43 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.2 2013/07/02 16:21:17 vapier Exp $ # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly # (since we're building shared libs) ... @@ -34,9 +34,8 @@ src_prepare() { # - pass custom variables to control libdir sed -i \ -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -f -s :' \ + -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - -e 's:ln -s bzip2.1:& -f:g' \ Makefile || die multilib_copy_sources diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch index 2427d6a7fb13..308f5f9b3e89 100644 --- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch +++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch @@ -5,8 +5,8 @@ http://bugs.gentoo.org/172986 @@ -85,4 +85,7 @@ cp -f bzip2.1 $(PREFIX)/share/man/man1 chmod a+r $(PREFIX)/share/man/man1/bzip2.1 -+ ln -s bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1 -+ ln -s bzip2.1 $(PREFIX)/share/man/man1/bzcat.1 -+ ln -s bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1 cp -f bzlib.h $(PREFIX)/include chmod a+r $(PREFIX)/include/bzlib.h |