diff options
| -rw-r--r-- | dev-lisp/gcl/Manifest | 6 | ||||
| -rw-r--r-- | dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch | 33 | ||||
| -rw-r--r-- | dev-lisp/gcl/gcl-2.6.8_pre20090419-r1.ebuild (renamed from dev-lisp/gcl/gcl-2.6.7-r6.ebuild) | 112 |
3 files changed, 78 insertions, 73 deletions
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest index e4c01778..840b9c65 100644 --- a/dev-lisp/gcl/Manifest +++ b/dev-lisp/gcl/Manifest @@ -1,7 +1,7 @@ AUX bootstrap-gcl 336 RMD160 eaf7dafe2d4b22eb0e6f9242de059b4c286c667c SHA1 8a865c10a2529a6b6876bebf103eeae876680f5c SHA256 4d9f19e461b5bfc3e570b6812cf35dcf8ae98788b7eb4d4e04368a2f801f4244 -DIST gcl_2.6.7-36.diff.gz 14499091 RMD160 531cabda910ea411adf9eb61757b1cb6eb81483b SHA1 bdaea26648ccd005355f71ada71f0f0dcf39778d SHA256 fca3e5e0aad0b1b904487aa25cb2c06edb4f00cbd480414c82f98556a70841d9 -DIST gcl_2.6.7.orig.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA1 d54f7db5dbd9f49953f80259a5eb44ade65027b5 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 +AUX gcl-2.6.8_pre20090419-configure.patch 1616 RMD160 62f7c7eda4f9e50a9819fbcfdf61684bad8aba9f SHA1 8715b88b1c5c3fa0e9c9f6e8fe1c0060b04fe65f SHA256 32ae77911287e9cbcfbbecd62f4b3279e0628ba13a8a3ea98654bbdda27c4550 +DIST gcl-2.6.8_pre20090419.tar.bz2 15688731 RMD160 09a815de1bcda7952ac0dd575297c17fc725cbd7 SHA1 e88e207093ef166f7cb7b3dfc52b40ad9f15f18a SHA256 63cf13ca6a9f1d2b1167385f50665d550e0f63dce5a99bb7a88191ae480e8b5b DIST gclcvs_2.7.0-84.1.tar.gz 23327656 RMD160 3b3b8d648cb7c2947e2ec75c7476ecdbe4dd8930 SHA1 c1dac9c4414069c3d6284c8b10a1da279425656c SHA256 44991c3cfe98c579d5fd28862ac7c2ef9a0e1baac347fa0ee82859f1cb250669 -EBUILD gcl-2.6.7-r6.ebuild 3934 RMD160 17bac0b77230dc2480644a3ffe38dcf94821168c SHA1 eca541cdffbcf8c8a1214a14d2c8e4223b5ea0a1 SHA256 29491d7082fb351126af174343f82e34d104a2a8bbdbf94571a44d38929b82bc +EBUILD gcl-2.6.8_pre20090419-r1.ebuild 3170 RMD160 4cc7ebab27c585e8a80aaf6dc3d6f9c5cc4d874d SHA1 2e7003ee3f057f7e6e7eb05a7e3b905b2978dc78 SHA256 0d2157ae960741c5948289d97eff83cc1dcc7fc019285fa4f1df44987a6cf2c0 EBUILD gcl-2.7.0_alpha.ebuild 865 RMD160 64724fd83c11328275e27b169db1af48eeda9b2e SHA1 bfa089d9958cd2f2bab881845a389ea6d2492bbb SHA256 56d48e90667cdfb0213e1866e89e853c2b5f46da34163d5de712ac504d1033fd MISC metadata.xml 529 RMD160 9b45ab49293b873b2696bf6e8d1844002ba1c4f9 SHA1 e9c77b4586c5fd122cb1e8e4ce437078018c258d SHA256 d96ec4f57c0971f6d3ae59b3189c4b5715500e4a85a32c4568ef2db31a358c85 diff --git a/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch b/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch new file mode 100644 index 00000000..f0865009 --- /dev/null +++ b/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch @@ -0,0 +1,33 @@ +diff -r -U2 gcl-2.6.8_pre20090419.orig/configure gcl-2.6.8_pre20090419/configure +--- gcl-2.6.8_pre20090419.orig/configure 2009-02-24 04:12:22.000000000 +0100 ++++ gcl-2.6.8_pre20090419/configure 2009-04-20 01:26:40.000000000 +0200 +@@ -118,4 +118,14 @@ + mandir='${prefix}/man' + ++# NLS nuisances. ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. ++if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++ + # Initialize some other variables. + subdirs= +@@ -506,14 +516,4 @@ + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h diff --git a/dev-lisp/gcl/gcl-2.6.7-r6.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20090419-r1.ebuild index 1114c8ed..5642424e 100644 --- a/dev-lisp/gcl/gcl-2.6.7-r6.ebuild +++ b/dev-lisp/gcl/gcl-2.6.8_pre20090419-r1.ebuild @@ -2,25 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=1 +EAPI=2 #removing flag-o-matic results in make install failing due to a segfault inherit elisp-common flag-o-matic -DEB_PV=36 -MY_PV="2.6.8" - DESCRIPTION="GNU Common Lisp" HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html" -SRC_URI="mirror://debian/pool/main/g/gcl/gcl_${PV}.orig.tar.gz - mirror://debian/pool/main/g/gcl/gcl_${PV}-${DEB_PV}.diff.gz" +SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -#Tested on ~x86 and ~amd64 only KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="emacs +readline debug X tk doc +ansi" +IUSE="+ansi debug doc emacs +readline tk X" +# See bug #205803 RESTRICT="strip" RDEPEND="emacs? ( virtual/emacs ) @@ -30,33 +26,37 @@ RDEPEND="emacs? ( virtual/emacs ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base" DEPEND="${RDEPEND} + doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52" -src_unpack() { - unpack ${A} && cd "${S}" - epatch ../gcl_${PV}-${DEB_PV}.diff +src_prepare() { + # The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in + # option parsing, it may break. + epatch "${FILESDIR}"/${P}-configure.patch } -src_compile() { +src_configure() { local myconfig="" if use tk; then - myconfig="${myconfig} \ - --enable-tkconfig=/usr/lib \ - --enable-tclconfig=/usr/lib" + myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib" fi myconfig="${myconfig} \ - $(use_enable readline readline) \ - $(use_with X x) \ - $(use_enable debug debug) \ - $(use_enable ansi ansi) \ - --enable-infodir=/usr/share/info \ - --enable-emacsdir=/usr/share/emacs/site-lisp/gcl" - - einfo "Configuring with the following:${myconfig}" - econf ${myconfig} || die "Configure failed" - make || die "make failed" - sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1 + --enable-dynsysgmp \ + --disable-xdr + $(use_enable readline) \ + $(use_with X x) \ + $(use_enable debug) \ + $(use_enable ansi)" + + einfo "Configuring with the following: +${myconfig}" + econf ${myconfig} +} + +src_compile() { + emake -j1 + sed -e 's,@EXT@,,g' debian/in.gcl.1 > gcl.1 } src_test() { @@ -102,56 +102,28 @@ src_test() { fi } - src_install() { - make DESTDIR="${D}" install || die "make install failed" - mv -v "${D}"/default.el elisp/ - - if use emacs; then - mv -v elisp/add-default.el "${T}"/50gcl-gentoo.el - elisp-site-file-install "${T}"/50gcl-gentoo.el - elisp-install ${PN} elisp/* - chmod -Rv 0644 "${D}"/usr/share/emacs/site-lisp/gcl/* - else - rm -Rv "${D}"/usr/share/emacs - fi - - if use doc; then - mv -v "${D}"/usr/share/doc/dwdoc.* "${D}"/usr/share/doc/dwdoc - mv -v "${D}"/usr/share/doc/*.dvi "${D}"/usr/share/doc/dwdoc - mkdir -pv "${D}"/usr/share/doc/${PF}/tex - cp -Rv "${D}"/usr/share/doc/dwdoc "${D}"/usr/share/doc/${PF}/tex - rm -Rv "${D}"/usr/share/doc/dwdoc - else - rm -Rv "${D}"/usr/share/doc/dwd* - fi + emake DESTDIR="${D}" install + # the build system need to be seriously patched + # to install docs into the proper places + rm -rf "${D}"/usr/share/{doc,info,emacs,lib/info} - cat "${D}"/usr/bin/gcl - dosed /usr/bin/gcl - cat "${D}"/usr/bin/gcl - fperms 0755 /usr/bin/gcl + if use emacs ; then + mv elisp/add-default.el 50${PN}-gentoo.el + elisp-site-file-install 50${PN}-gentoo.el + elisp-install ${PN} elisp/*.el + fi - dosed /usr/lib/${PN}-${MY_PV}/gcl-tk/gcltksrv - fperms 0755 /usr/lib/${PN}-${MY_PV}/gcl-tk/gcltksrv + if use doc ; then + dodoc info/*.dvi + dodoc xgcl-2/dwdoc.pdf + dohtml -r xgcl-2/dwdoc + fi - rm -Rv doc/CVS dodoc readme* RELEASE* ChangeLog* doc/* - - for i in "${D}"/usr/share/doc/gcl-{tk,si}; do - mv -v $i "${D}"/usr/share/doc/${PF} - done - doman gcl.1 + # FIXME: info files are broken: "Cannot find node `Top'" + # OTOH, Konqueror has no problem with them doinfo info/*.info* - find "${D}"/usr/lib/gcl-${MY_PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod -v 0644 '{}' \; } - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} - |