commit: ae8b51c7bb047af5478e3747d62463f2efe8718b Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Wed Dec 21 00:05:43 2016 +0000 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> CommitDate: Wed Dec 21 00:05:43 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ae8b51c7
dev-scheme/guile: sync with tree to get patch for sec bug #596864 dev-scheme/guile/Manifest | 10 +++- .../guile/files/guile-1.8.8-fix-defines.patch | 24 ++++++++ dev-scheme/guile/files/guile-1.8.8-gcc5.patch | 15 +++++ .../guile/files/guile-1.8.8-gtexinfo-5.patch | 15 +++++ .../guile/files/guile-1.8.8-mkdir-mask.patch | 35 ++++++++++++ dev-scheme/guile/files/guile-1.8.8-os_dep.patch | 10 ---- dev-scheme/guile/files/guile-1.8.8-readline.patch | 34 +++++++++++ dev-scheme/guile/files/guile-1.8.8-sandbox.patch | 15 +++++ dev-scheme/guile/files/guile-1.8.8-tinfo.patch | 15 +++++ ...uile-1.8.8-r99.ebuild => guile-1.8.8-r3.ebuild} | 66 ++++++++++++---------- 10 files changed, 198 insertions(+), 41 deletions(-) diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest index 58e394e..2cd3840 100644 --- a/dev-scheme/guile/Manifest +++ b/dev-scheme/guile/Manifest @@ -1,8 +1,14 @@ AUX 50guile-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14 +AUX guile-1.8.8-fix-defines.patch 701 SHA256 b6986585ee61662d6c13a294bd51c97ef4ead7754694ab9207bb7018c2f072bf SHA512 b19d72a179cae13bafe8aa9af15661b79406816d296042f0b39a2daa61446f3db82763fe17aa74d3a7f0194a63fe2d80424acaccda4e7288bb8047efdd0197ad WHIRLPOOL aab775be68e698c002dfbe34cd8fb1db494eec34dee9508801640f4ad406e979a980f74a29de4e3779fe6db00cc86eb49f6d516f92b4e73c77c7deb961e1d27f AUX guile-1.8.8-fix_guile-config.patch 494 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4 SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970 WHIRLPOOL f6ccd01b09a7aab46fab36464ab49539c9dddb954cc2d1ed709074175273df306d8527bae0d3d83f212903693af00fdf087533611ea416036b1c557ebc0fd283 AUX guile-1.8.8-gcc46.patch 1004 SHA256 9f11b3095ed4aa622a58e3a0805e49f56c258e81c9813c5053cea980cd93948b SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa WHIRLPOOL cf2ff22da564656387c7a42985d8c4fd004ff411739e1a081f71931c458287bf1166079f5a39b842f7e8b988e62e24e04d541e125340f0256c62b23de602d80b +AUX guile-1.8.8-gcc5.patch 575 SHA256 4e9a1da6b8d68636f07a6ff33e071be1ef57e67e2191d7d7410fc50ec63472ac SHA512 844a585679f8d1cbdbe9c4c7c5feb21ebca095a522d75db264c0f4c244153a1435a01647955fc98a0743fec48aeac28c1570dbce78bfd026544addba945a1cee WHIRLPOOL 73742a12d87c1ca11327bb7f9d391394bdb9a6eeb1ad8c7e95b9201812b080c8e408c5b0428309896ee21fff302b01e1fa5bf7a75b0a48bde10fb34443599b97 +AUX guile-1.8.8-gtexinfo-5.patch 460 SHA256 bae4abbfb50e895ff12d7d49192b64e64be4ca270d424a59ad209c0c67bc281f SHA512 19185a96bb6dcf7f1cac1908633d65d8cb673148469553cce4099256d05a94688834a61ddc0a18957f9fe253fffb2821817b4b29a4a604e8c152debb6e3323a6 WHIRLPOOL 2c0249fae9e0197cddca53d84743f9134e6e7f15f3862953f3fc36d4554f6539f80e2d67cc604c6c25c099e5667512f4fc6204e091142d5af07e2943c4f34a96 AUX guile-1.8.8-makeinfo-5.patch 2361 SHA256 f1bfbe27280f6105735a2b4f0cf7883a9a825d4df756b74663112612b7a72438 SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09 WHIRLPOOL c392c00f99d68cba17db8f14c68dc153f9cf146a3a6e197c4101959e93eb634a451cf8cdf957216f1c24fafcebf377a93e81682d5c0692506a0dd4c7ac00fa48 -AUX guile-1.8.8-os_dep.patch 440 SHA256 e4b54c94aa2087495dc0b4a93e004cc053e5018bbb556c8ea5b674977ea31a52 SHA512 df1681a3e311de4c3f7d4097ab4f92990d1a36f4f47507e967252039479822be9a82d64d483b0f1025c3ecf0ff070d8c7a30ccc4ef0d19db0895f5b9622019c7 WHIRLPOOL 412b0509fdc78b8bd28ee6236c94ed213c95b1da4a666ac1cfef824746ab7dae5cc10bc159d38070c8a17e3363b8f289f27bb6804f50870936ba939116b88a13 +AUX guile-1.8.8-mkdir-mask.patch 1300 SHA256 005fb7443f6daa49ceed237ce486a33bfac0092724df69c84d65e0c5bb87ddf0 SHA512 e02fa50af16fb545b26560064cc7adb19caf523691dfb22044c1e01fe9c98c42804c3d13ac28d65cb61bf7667fb0f1d4aa703949cea321d382b871abd083454e WHIRLPOOL e125edc37ef68524632cecd5a0d61b2f5e59368549c189aa4d4177965ba28ce1be8e71b02c85cc58242e7fd28a22d5cdb957cacb4faba40b7d6d434ac874aa40 +AUX guile-1.8.8-readline.patch 953 SHA256 1c33023ccaa03c204e74fbe2cb3cff9d7948fa3bdc3a9e4b820af0076617f40c SHA512 e86e6e7f035f9ff9d541b44987d7cb0e5a1f80f62b7b4a112dc933f5831b90a33b506c6601165e957a3973c38ca56d0e84eafaa76c78ae5db26d7887669f1443 WHIRLPOOL a865c1b517c0c77cb8d23cceb1a7f2f9f29826f14ea8d97ce7e6eacf93d83ea94f731a54066cccbb7da4fba77b76181e358988cc85855417496efa88c19e4e10 +AUX guile-1.8.8-sandbox.patch 514 SHA256 ad20e02a81b7d0a6d9246e7b1d59be9da1e2c897bebaf26a9780466bb37908a8 SHA512 6786c4c8254ebf0dbfe69402f4781151fcecec0fad8b282b831cb0300721ef22b8c11d4feecbe30643e3783d488c53e3f1158c0b0c76f6beda15fd7c0d6515db WHIRLPOOL eb8944149c2fe2e1eb0863c61e71b44e0aa13e7b8bd11c16ea69ab1949e80ca6af8e1ba4988f75b80c1128c37b1a32b8c07b8e0ce2e3ab68b7a756709d682acb +AUX guile-1.8.8-tinfo.patch 450 SHA256 ec01f6b9f8c5571f78b8332d31cc5d8df187d9929fe233b68617fe362337a498 SHA512 0ea33680a57b1adb0821bd00cd73955e8c2fd5f31c4bd20a291c3e4fbb6a3dd9e2f4977b135f05fa3e2b65b1f5e0f5253db642e7b0b0fcd2e78ff8b6dd1cf37a WHIRLPOOL 6f806c6efb52f5a5d039faa0435054d2e1f9f090e523c6c31d00342c043454b375695ce27f32212baaf0da59a2034bc53278ada1b64e2b11d34ee72a089f546b DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2 -EBUILD guile-1.8.8-r99.ebuild 2779 SHA256 45fab2d11afc92127e17118a13d17785949dd83cea5eb9642643176ca3f69de3 SHA512 506a49b657b5652b1876cb622c05efab745eb05cadc231496f21cf741c24b0aa9781374956e3d692740c64aaa886bcf97ed48642018c11f3473cd31296a395e2 WHIRLPOOL 6e0ed98a1a4de2225f3dfdcaa1f3c9bc6b1228aa4ae1739b94e71134bb08f837960b41dc6807649658c4a611d14af81729e98f66ea608128a051457b9d4d3cdb +EBUILD guile-1.8.8-r3.ebuild 3013 SHA256 28f89d81906c3aa085d75dfca20ba2aa65a16ada768f7e13a65f8c1042c98a92 SHA512 64273e03ef617d77a6d9bd7cae28cbb844e1a47b753208a3c69c1e475f3e02cb56c0fab21afff72229ecb02f67df72a5cf797670330c125cd48d8a6cf44a55cb WHIRLPOOL 6f02364fdd712f23f23c17b4ec2b94163db287db44f43ef900c2a3ff780be72fde4d2a30bad0f326d2333d37420b27ae56dd223cf3397fb0ffcf334bc521d50e MISC metadata.xml 1040 SHA256 a39b8cf38ffdbf8a5d6e2a302ee3b661bb7680f15c51f93ae9ac40eab70ca72b SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3 WHIRLPOOL 6003d8faba29536e6a44b854082ce41ae28fea03552809f6ad7b34023755f81b8156148fc7616c8ba7a9ee8eb917de257434f87084b66c6e0107afcace974f52 diff --git a/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch b/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch new file mode 100644 index 0000000..341354d --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch @@ -0,0 +1,24 @@ +--- guile-1.8.8.orig/libguile/fports.c ++++ guile-1.8.8/libguile/fports.c +@@ -78,8 +78,8 @@ + #define OFF_T_MAX LONG_MAX + #define OFF_T_MIN LONG_MIN + #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG +-#define OFF_T_MAX LONG_LONG_MAX +-#define OFF_T_MIN LONG_LONG_MIN ++#define OFF_T_MAX LLONG_MAX ++#define OFF_T_MIN LLONG_MIN + #else + #error Oops, unknown OFF_T size + #endif +--- guile-1.8.8.orig/libguile/gc_os_dep.c ++++ guile-1.8.8/libguile/gc_os_dep.c +@@ -1459,7 +1459,7 @@ + # undef __KERNEL__ + # endif + +-# else ++# elif defined(__GLIBC__) + + /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ + /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch new file mode 100644 index 0000000..742ea0b --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch @@ -0,0 +1,15 @@ +Preprocessor changes in GCC 5 cause guile-snarf to output garbage. + +https://bugs.gentoo.org/560736 + +--- a/libguile/guile-snarf.in ++++ b/libguile/guile-snarf.in +@@ -50,7 +50,7 @@ + ## Apparently, AIX's preprocessor is unhappy if you try to #include an + ## empty file. + echo "/* cpp arguments: $@ */" ; +- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true ++ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true + grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" + } + diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch new file mode 100644 index 0000000..d7fbda1 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp $ + +Compatibility with gtexinfo 5.2 + +--- doc/tutorial/guile-tut.texi 2010-12-14 06:24:39.000000000 +1300 ++++ doc/tutorial/guile-tut.texi 2013-11-30 19:44:28.304575529 +1300 +@@ -446,7 +446,7 @@ + Schemer} from that list.} + + +-@subsection Hello World ++@section Hello World + @cindex hello world + + Our first program is the typical Scheme "hello world" program. Put the \ No newline at end of file diff --git a/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch new file mode 100644 index 0000000..7d1c703 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch @@ -0,0 +1,35 @@ +--- a/libguile/filesys.c 2016-11-05 15:03:52.131894648 +0100 ++++ b/libguile/filesys.c 2016-11-05 15:07:13.275894481 +0100 +@@ -791,24 +791,18 @@ + SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0, + (SCM path, SCM mode), + "Create a new directory named by @var{path}. If @var{mode} is omitted\n" +- "then the permissions of the directory file are set using the current\n" +- "umask. Otherwise they are set to the decimal value specified with\n" +- "@var{mode}. The return value is unspecified.") ++ "then the permissions of the directory are set to @code{#o777}\n" ++ "masked with the current umask (@pxref{Processes, @code{umask}}).\n" ++ "Otherwise they are set to the value specified with @var{mode}.\n" ++ "The return value is unspecified.") + #define FUNC_NAME s_scm_mkdir + { + int rv; +- mode_t mask; ++ mode_t c_mode; + +- if (SCM_UNBNDP (mode)) +- { +- mask = umask (0); +- umask (mask); +- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask)); +- } +- else +- { +- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode))); +- } ++ c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode); ++ ++ STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode)); + if (rv != 0) + SCM_SYSERROR; + return SCM_UNSPECIFIED; diff --git a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch b/dev-scheme/guile/files/guile-1.8.8-os_dep.patch deleted file mode 100644 index 9fab8da..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/guile-1.8.8/libguile/gc_os_dep.c -+++ b/guile-1.8.8/libguile/gc_os_dep.c -@@ -1472,6 +1472,7 @@ - /* has the right declaration for glibc 2.1. */ - # include <sigcontext.h> - # endif /* 0 == __GLIBC_MINOR__ */ -+# elif 1 - # else /* not 2 <= __GLIBC__ */ - /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ - /* one. Check LINUX_VERSION_CODE to see which we should reference. */ diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch new file mode 100644 index 0000000..68f64c5 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch @@ -0,0 +1,34 @@ +Make guile-readline optional + +https://bugs.gentoo.org/392553 + +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ + # + AUTOMAKE_OPTIONS = 1.10 + +-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \ ++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \ + scripts srfi doc examples test-suite benchmark-suite lang am + + bin_SCRIPTS = guile-tools +--- a/configure.in ++++ b/configure.in +@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) + # + #-------------------------------------------------------------------- + +-AC_CONFIG_SUBDIRS(guile-readline) ++GUILE_READLINE= ++AC_ARG_ENABLE([readline], ++ [AS_HELP_STRING([--disable-readline], ++ [disable building guile-readline])], ++ if test "x$enable_readline" != xno; then ++ AC_CONFIG_SUBDIRS([guile-readline]) ++ GUILE_READLINE="guile-readline" ++ fi) ++AC_SUBST([GUILE_READLINE]) + + #-------------------------------------------------------------------- + diff --git a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch new file mode 100644 index 0000000..70d752f --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch @@ -0,0 +1,15 @@ +Prevent sandbox violation when installing + +https://bugs.gentoo.org/521546 + +--- a/guile-config/Makefile.am ++++ b/guile-config/Makefile.am +@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config +- +-## Get rid of any copies of the configuration script under the old +-## name, so people don't end up running ancient copies of it. +-install-exec-local: +- rm -f ${bindir}/build-guile diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch new file mode 100644 index 0000000..6c4d011 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch @@ -0,0 +1,15 @@ +With ncurses[tinfo] tgoto will be in libtinfo + +https://bugs.gentoo.org/539316 + +--- a/guile-readline/configure.in ++++ b/guile-readline/configure.in +@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then + fi + AC_SUBST(EXTRA_DEFS) + +-for termlib in ncurses curses termcap terminfo termlib ; do ++for termlib in ncurses curses termcap terminfo termlib tinfo ; do + AC_CHECK_LIB(${termlib}, tgoto, + [LIBS="-l${termlib} $LIBS"; break]) + done diff --git a/dev-scheme/guile/guile-1.8.8-r99.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild similarity index 68% rename from dev-scheme/guile/guile-1.8.8-r99.ebuild rename to dev-scheme/guile/guile-1.8.8-r3.ebuild index 5a74319..3d1866f 100644 --- a/dev-scheme/guile/guile-1.8.8-r99.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild @@ -2,40 +2,59 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=3 +EAPI=5 inherit eutils autotools flag-o-matic elisp-common DESCRIPTION="Scheme interpreter" -HOMEPAGE="http://www.gnu.org/software/guile/"; +HOMEPAGE="https://www.gnu.org/software/guile/"; SRC_URI="mirror://gnu/guile/${P}.tar.gz" LICENSE="LGPL-2.1" KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads" +IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads" + RESTRICT="!regex? ( test )" -DEPEND=" - >=dev-libs/gmp-4.1 - >=sys-devel/libtool-1.5.6 +RDEPEND=" + >=dev-libs/gmp-4.1:0= + dev-libs/libltdl:0= sys-devel/gettext - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND}" + sys-libs/ncurses:0= + emacs? ( virtual/emacs ) + readline? ( sys-libs/readline:0= )" +DEPEND="${RDEPEND} + sys-apps/texinfo + sys-devel/libtool" # Guile seems to contain some slotting support, /usr/share/guile/ is slotted, # but there are lots of collisions. Most in /usr/share/libguile. Therefore # I'm slotting this in the same slot as guile-1.6* for now. -SLOT="12" +SLOT="12/8" MAJOR="1.8" src_prepare() { epatch "${FILESDIR}/${P}-fix_guile-config.patch" \ "${FILESDIR}/${P}-gcc46.patch" \ - "${FILESDIR}/${P}-os_dep.patch" \ - "${FILESDIR}/${P}-makeinfo-5.patch" + "${FILESDIR}/${P}-gcc5.patch" \ + "${FILESDIR}/${P}-makeinfo-5.patch" \ + "${FILESDIR}/${P}-gtexinfo-5.patch" \ + "${FILESDIR}/${P}-readline.patch" \ + "${FILESDIR}/${P}-tinfo.patch" \ + "${FILESDIR}/${P}-sandbox.patch" \ + "${FILESDIR}/${P}-mkdir-mask.patch" + + epatch "${FILESDIR}/${P}-fix-defines.patch" + sed \ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ -e "/AM_PROG_CC_STDC/d" \ - -i guile-readline/configure.in + -i guile-readline/configure.in || die + + epatch_user + + mv "${S}"/configure.{in,ac} || die + mv "${S}"/guile-readline/configure.{in,ac} || die + eautoreconf } @@ -49,6 +68,7 @@ src_configure() { --disable-static \ --enable-posix \ $(use_enable networking) \ + $(use_enable readline) \ $(use_enable regex) \ $(use deprecated || use_enable discouraged) \ $(use_enable deprecated) \ @@ -64,24 +84,24 @@ src_configure() { } src_compile() { - emake || die "make failed" + emake # Above we have disabled the build system's Emacs support; # for USE=emacs we compile (and install) the files manually if use emacs; then - cd emacs + cd emacs || die elisp-compile *.el || die fi } src_install() { - einstall || die "install failed" + emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die + dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS # texmacs needs this, closing bug #23493 dodir /etc/env.d - echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile + echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile || die # necessary for registering slib, see bug 206896 keepdir /usr/share/guile/site @@ -93,21 +113,9 @@ src_install() { } pkg_postinst() { - [ "${EROOT}" == "/" ] && pkg_config use emacs && elisp-site-regen } pkg_postrm() { use emacs && elisp-site-regen } - -pkg_config() { - if has_version dev-scheme/slib; then - einfo "Registering slib with guile" - install_slib_for_guile - fi -} - -_pkg_prerm() { - rm -f "${EROOT}"/usr/share/guile/site/slibcat -}
