diff options
| author |   Charlie Shepherd <masterdriverz@gentoo.org> | 2007-01-06 12:35:33 +0000 |
|---|---|---|
| committer | Charlie Shepherd <masterdriverz@gentoo.org> | 2007-01-06 12:35:33 +0000 |
| commit | 8e4ecaab9ada728c8d9994580ad3489a25b5410c (patch) | |
| tree | 444a765c1c9794a377420973f8a15a87a61c4008 /dev-scheme | |
| parent | Dropped gnome USE-flag for 2.6.x (bug #104671) (diff) | |
| download | gentoo-2-8e4ecaab9ada728c8d9994580ad3489a25b5410c.tar.gz gentoo-2-8e4ecaab9ada728c8d9994580ad3489a25b5410c.tar.bz2 gentoo-2-8e4ecaab9ada728c8d9994580ad3489a25b5410c.zip | |
Fix as-needed issues, bug 157188; thanks to Mike Mattie
(Portage version: 2.1.2_rc4-r3)
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/scheme48/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch | 13 | ||||
| -rw-r--r-- | dev-scheme/scheme48/scheme48-1.3-r1.ebuild | 22 |
3 files changed, 31 insertions, 12 deletions
diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog index b1a23b551b7b..b331c2cb147a 100644 --- a/dev-scheme/scheme48/ChangeLog +++ b/dev-scheme/scheme48/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-scheme/scheme48 -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.3 2006/08/31 03:45:58 mkennedy Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.4 2007/01/06 12:35:33 masterdriverz Exp $ + + 06 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org> + +files/scheme48-1.3-as-needed.patch, scheme48-1.3-r1.ebuild: + Fix as-needed issues, bug 157188; thanks to Mike Mattie 31 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org> -scheme48-1.3.ebuild, scheme48-1.3-r1.ebuild: diff --git a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch new file mode 100644 index 000000000000..bbabf1239b12 --- /dev/null +++ b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2007-01-06 12:12:17.000000000 +0000 ++++ Makefile.in 2007-01-06 12:13:11.000000000 +0000 +@@ -222,8 +222,8 @@ + $(EXTERNAL_INITIALIZERS) && \ + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS) \ + /tmp/s48_external_$$$$.c \ +- $(LIBOBJS) $(LIBS) \ +- $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) && \ ++ $(LIBOBJS) \ ++ $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) && \ + rm -f /tmp/s48_external_$$$$.c + + script-interpreter: c/script-interpreter.o diff --git a/dev-scheme/scheme48/scheme48-1.3-r1.ebuild b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild index 26d9d461ddad..dc973d815b20 100644 --- a/dev-scheme/scheme48/scheme48-1.3-r1.ebuild +++ b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.3-r1.ebuild,v 1.2 2006/08/31 03:45:58 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.3-r1.ebuild,v 1.3 2007/01/06 12:35:33 masterdriverz Exp $ -inherit elisp-common multilib +inherit elisp-common multilib eutils DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language." HOMEPAGE="http://www.s48.org/" @@ -13,20 +13,22 @@ SLOT="0" KEYWORDS="~x86 -amd64" IUSE="doc emacs" -DEPEND="virtual/libc" +DEPEND="" RDEPEND="" SITEFILE=50scheme48-gentoo.el src_unpack() { unpack ${A} - sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in - sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in + cd "${S}" + sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" Makefile.in + sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" Makefile.in # Set the correct values for the paths show by the man pages - sed -i "s:=\$(bindir)=:=/usr/bin/=:" ${S}/Makefile.in - sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" ${S}/Makefile.in + sed -i "s:=\$(bindir)=:=/usr/bin/=:" Makefile.in + sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" Makefile.in # From Bug #127105 - sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" ${S}/Makefile.in - sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" ${S}/Makefile.in + sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" Makefile.in + sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" Makefile.in + epatch "${FILESDIR}/${P}-as-needed.patch" } src_compile() { |