Permalink
Browse files

dev-scheme/guile-2.0.5: Add upstream patch that correctly names /usr/…

…bin/guile-tools to /usr/bin/guile-tools-2.0. Bump to EAPI 4

(Portage version: 2.2.0_alpha104/git/Linux i686, signed Manifest commit with key 0xBE63A96F)
  • Loading branch information...
1 parent 73af45a commit 859824b72668cca4e7985855ec389699b5933977 Cyprien Nicolas (fulax) committed May 14, 2012
View
17 dev-scheme/guile/Manifest
@@ -1,24 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX 3742d778fbc6ea879437c19aeebe09179dceffdf.patch 1502 RMD160 e0f2b98b28b79189ce13e8fa96f2658312b49ada SHA1 a198b101da27ae9fa77532a8112f5bf1e32bf22a SHA256 24b3cf6cf5706e5207aab8b1d8f61cc8291d66e97bcd403a42497eb4b904338c
AUX 50guile-gentoo.el 74 RMD160 e64895b1e48ca842f32301a2ac68ae099e25844e SHA1 ec3a8ab924b595fc5323eec7c33f938e9d26a911 SHA256 ad625c24e5bb48b001eb4a68d441f10037acf467f5f91f68106c538dbee965b5
AUX guile-1.8.8-fix_guile-config.patch 494 RMD160 61fcb0ac730a44ef93df26bdd5e6e0ce3b1a2dbf SHA1 5e9132af1dd7ae7394851c1266b6a85419abca31 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4
DIST guile-1.8.8.tar.gz 3956654 RMD160 8ac185a72ad8394b14d5377549e5bbf02889faaa SHA1 548d6927aeda332b117f8fc5e4e82c39a05704f9 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
DIST guile-2.0.1.tar.gz 6601636 RMD160 7b498f85221a0560978e836b8bc38eb313836bfc SHA1 3276a826f17a5edc0baf2eedc4821a771824141b SHA256 f1198caca27d9de23e9b1cbaf55cbde1915f8a6ee420e2971a6422f9693638d6
DIST guile-2.0.5.tar.gz 6924159 RMD160 51deb23e2ab26e89e9b97f3937ada1609b0329fd SHA1 0cf94962ab637975bf2ad00afa15638dcc67408f SHA256 2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956
EBUILD guile-1.8.8-r2.ebuild 3237 RMD160 70499936053783ea0ab506870852c410bc896846 SHA1 1e9e81f3ab6ecf1df4160b376063165a37af9069 SHA256 3eb095ed8f5482208e662e1c000116254879a05b43e23249bf2c65056b0d378a
EBUILD guile-2.0.1.ebuild 2672 RMD160 7ea161b1e7492d39646d8a64fce08751389bf741 SHA1 d185ad71a44b0338d47d6e12199eae8c02cb50db SHA256 81a4285b38f5e7e220beb750af2bff361445077a01a5587a66d7f6f88964c5ab
-EBUILD guile-2.0.5.ebuild 2772 RMD160 f183ca83d2d8a2257d23b28cc25aaac1add943e0 SHA1 1aa72751e9d608bb084c43d3bd83da49f9e3ccf9 SHA256 cb7bf9fffe2b6c5cb6a47000fd8d01c49cefd3f3a4c31b7b1ac511b6f263fb26
+EBUILD guile-2.0.5.ebuild 2896 RMD160 eb81eeb94efd100bd49e36f9438490c63a3193db SHA1 10b2b178aa45dffff56b982bbbbeae3c1567d7cf SHA256 8618c4556fe9e9c0d125036a707d9e626b3cbfc4882c382c2a9f9bd8e5727dd7
EBUILD guile-999.ebuild 2955 RMD160 c3d48f075ad44ccffadc49d5fdd13ad56b9d3f8b SHA1 62ba7d36f5989864d6037c3eca1d629f99b6e4e9 SHA256 b3b03f216d204a286c1233292d08cf08ec44c7195ad5215cd0119f9ee686f2fe
MISC metadata.xml 1002 RMD160 5f873230234ee982ad825c9ca09d8a9010e08487 SHA1 8f971aa8b60077cfec87acb61540253e08ee7f56 SHA256 60781a2ffcda537e7cf6922542f398e646d219fae385f707f544cf3b27a62688
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJPqSyfAAoJED15R4++Y6lvNwwIAKaXLhsNdJd7hSTYDzKZyQW4
-jkkCjGLLc35vCgxXM/sJEKGqL02wkFupsqngAosxQxvh1aUtm1GpfkQHRoj4VVhX
-K26Zr+WQmwQnrvSc1EAFg6iKCtH6XakD94E3P8OS3Ld5awcFr66VVld6jO9kSef3
-9tbqSGH7qbi6HYc/E5ZNcwWEzYgv4eW6Njwcok/EUoqdtm36I6SazWKLXwxqTyeq
-t8fHj8Me0YyeZdTvuYU2zm01GshL5IG0QBZSvQ3Adw0EU9XmB11hvHtZvTAsGAFO
-3fHhkwsuGr7Y6tlxexxUbbMbKDL5sQ3AYQxy3UNEms6gk7D9J3gdXQeozPFn2gQ=
-=JMl9
+iQEcBAEBAgAGBQJPsY/bAAoJED15R4++Y6lvAhUH/R2cTSW5giX1mXprFGTfJEzN
+kVu5ZUHxnCZO5tbImHiKPFNIxSlywNPb5P3ndX0QpLIvIwUvLnWumHpm9d5a/7Pi
+hfhXnJ9gdt7Igvr5MruSqHqe7BkPPNneQaPEQZljioKEoCEmJQiSTnTQVHsLUEF6
+b5ofXXA4E6kI7ZJbssKcribWmyQvBru1u1yCSwtIycx2dXW351LB208GIXziXtpf
+GQRQwetACvzdbrNlJnfO89Y5807rQB57XabOWnIBgfDd5a77e6RX7SKfjMGZ9FdN
+C2RESXOie1+LdLkVxWdr2bVQ8DQlbV1N+oPl3kLe+66FLiXy5+oVUfItViioqnQ=
+=ku6K
-----END PGP SIGNATURE-----
View
41 dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch
@@ -0,0 +1,41 @@
+From 3742d778fbc6ea879437c19aeebe09179dceffdf Mon Sep 17 00:00:00 2001
+From: Ludovic Courtès <ludo@gnu.org>
+Date: Mon, 14 May 2012 17:21:35 +0000
+Subject: Honor $(program_transform_name) for the `guile-tools' symlink.
+
+Fixes <http://bugs.gnu.org/11451>.
+Reported by Cyprien Nicolas <c.nicolas@gmail.com>.
+
+* meta/Makefile.am (install-data-hook): Honor $(program_transform_name).
+---
+diff --git a/meta/Makefile.am b/meta/Makefile.am
+index f26fc44..a05730d 100644
+--- a/meta/Makefile.am
++++ b/meta/Makefile.am
+@@ -1,7 +1,8 @@
+ ## Process this file with Automake to create Makefile.in
+ ## Jim Blandy <jimb@red-bean.com> --- September 1997
+ ##
+-## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
++## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
++## 2012 Free Software Foundation, Inc.
+ ##
+ ## This file is part of GUILE.
+ ##
+@@ -28,8 +29,12 @@ EXTRA_DIST= \
+
+ # What we now call `guild' used to be known as `guile-tools'.
+ install-data-hook:
+- cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \
+- $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT)
++ guild="`echo $(ECHO_N) guild \
++ | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
++ guile_tools="`echo $(ECHO_N) guile-tools \
++ | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
++ cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" && \
++ $(LN_S) "$$guild" "$$guile_tools"
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = guile-2.0.pc
+--
+cgit v0.9.0.2
View
10 dev-scheme/guile/guile-2.0.5.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-2.0.0.ebuild,v 1.2 2011/04/12 18:20:24 mr_bones_ Exp $
-EAPI=3
-inherit eutils flag-o-matic elisp-common
+EAPI=4
+inherit autotools eutils flag-o-matic elisp-common
DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
HOMEPAGE="http://www.gnu.org/software/guile/"
@@ -28,6 +28,12 @@ RDEPEND="${DEPEND}"
SLOT="2"
MAJOR="2.0"
+src_prepare() {
+ epatch "${FILESDIR}/3742d778fbc6ea879437c19aeebe09179dceffdf.patch"
+ epatch_user
+ eautoreconf
+}
+
src_configure() {
# see bug #178499
filter-flags -ftree-vectorize

0 comments on commit 859824b

Please sign in to comment.