diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-12-12 16:29:58 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-12-12 16:29:58 +0000 |
| commit | 1798f351e6e1161e6f40de29631825e2967adf96 (patch) | |
| tree | e050c112471a012ebb30802412f864f5443adbc8 /app-arch | |
| parent | remove media-sound/picard acoustid wrt to bug #426340 (diff) | |
| download | gentoo-2-1798f351e6e1161e6f40de29631825e2967adf96.tar.gz gentoo-2-1798f351e6e1161e6f40de29631825e2967adf96.tar.bz2 gentoo-2-1798f351e6e1161e6f40de29631825e2967adf96.zip | |
Fix symlinks in /usr/bin and mandir.
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/freeze/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/freeze/files/freeze-2.5.0-gentoo.patch | 55 | ||||
| -rw-r--r-- | app-arch/freeze/freeze-2.5.0-r1.ebuild | 13 |
3 files changed, 63 insertions, 11 deletions
diff --git a/app-arch/freeze/ChangeLog b/app-arch/freeze/ChangeLog index 27c8ec506906..37748800f9af 100644 --- a/app-arch/freeze/ChangeLog +++ b/app-arch/freeze/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/freeze # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/ChangeLog,v 1.21 2012/12/12 16:14:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/ChangeLog,v 1.22 2012/12/12 16:29:58 jer Exp $ + + 12 Dec 2012; Jeroen Roovers <jer@gentoo.org> freeze-2.5.0-r1.ebuild, + +files/freeze-2.5.0-gentoo.patch: + Fix symlinks in /usr/bin and mandir. *freeze-2.5.0-r1 (12 Dec 2012) diff --git a/app-arch/freeze/files/freeze-2.5.0-gentoo.patch b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch new file mode 100644 index 000000000000..3be357c25309 --- /dev/null +++ b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch @@ -0,0 +1,55 @@ +--- a/Makefile.in 1999-05-20 11:07:51.000000000 +0200 ++++ b/Makefile.in 2012-12-12 17:22:36.444775985 +0100 +@@ -3,7 +3,7 @@ + VPATH = $(srcdir) + + CC = @CC@ +-CFLAGS = -I. # -O2 # for gcc 2.2.2 ++CFLAGS += -I. + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -79,15 +79,15 @@ + + freeze$(EXE): $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) +- -strip $@ ++ + + statist$(EXE): statist.$(OBJ) lz.$(OBJ) + $(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS) +- -strip $@ ++ + + showhuf$(EXE): showhuf.$(OBJ) + $(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS) +- -strip $@ ++ + + clobber: clean + rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile +@@ -101,18 +101,18 @@ + + $(DEST)/freeze: freeze + $(INSTALL_PROGRAM) freeze $@ +- -ln -f $@ $(DEST)/melt +- -ln -f $@ $(DEST)/unfreeze +- -ln -f $@ $(DEST)/fcat ++ ln -sf $< $(DEST)/melt ++ ln -sf $< $(DEST)/unfreeze ++ ln -sf $< $(DEST)/fcat + + $(DEST)/statist: statist + $(INSTALL_PROGRAM) statist $@ + + $(MANDEST)/freeze.$(SEC): freeze.1 + $(INSTALL_DATA) $(srcdir)/freeze.1 $@ +- -ln -f $@ $(MANDEST)/melt.$(SEC) +- -ln -f $@ $(MANDEST)/unfreeze.$(SEC) +- -ln -f $@ $(MANDEST)/fcat.$(SEC) ++ ln -sf $< $(MANDEST)/melt.$(SEC) ++ ln -sf $< $(MANDEST)/unfreeze.$(SEC) ++ ln -sf $< $(MANDEST)/fcat.$(SEC) + # This is much better for places which keep preformated manpages. + # echo ".so man1/freeze.$(SEC)" > $(MANDEST)/melt.$(SEC) + # echo ".so man1/freeze.$(SEC)" > $(MANDEST)/unfreeze.$(SEC) diff --git a/app-arch/freeze/freeze-2.5.0-r1.ebuild b/app-arch/freeze/freeze-2.5.0-r1.ebuild index 4f04fd0932cd..89526629de73 100644 --- a/app-arch/freeze/freeze-2.5.0-r1.ebuild +++ b/app-arch/freeze/freeze-2.5.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0-r1.ebuild,v 1.1 2012/12/12 16:14:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0-r1.ebuild,v 1.2 2012/12/12 16:29:58 jer Exp $ EAPI=4 -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="Freeze/unfreeze compression program" HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/compress/" @@ -18,16 +18,9 @@ RDEPEND=" !<=media-libs/mlt-0.4.2 !media-libs/mlt[melt] " -DEPEND="${RDEPEND} - >=sys-apps/sed-4" src_prepare() { - # Hard links confuse prepman and these links are absolute. - # Fix pre-stripped binary and respect CFLAGS as well - sed -i -e 's:ln -f:ln -sf:g' \ - -e 's:-strip $@::g' \ - -e '/^CFLAGS/s:=.*:+= -I.:' \ - Makefile.in || die "sed failed" + epatch "${FILESDIR}"/${P}-gentoo.patch } src_compile() { |