diff options
author | Matthew Kennedy <mkennedy@gentoo.org> | 2006-01-27 19:42:18 +0000 |
---|---|---|
committer | Matthew Kennedy <mkennedy@gentoo.org> | 2006-01-27 19:42:18 +0000 |
commit | 66d7891f28c3077c930093ab6626d0e91bde4f80 (patch) | |
tree | 702a4cc55dc78bb020bb813b5a2fe87205efe8f8 /dev-lisp | |
parent | dev-php/PEAR-XML_Parser stable on ppc. (diff) | |
download | gentoo-2-66d7891f28c3077c930093ab6626d0e91bde4f80.tar.gz gentoo-2-66d7891f28c3077c930093ab6626d0e91bde4f80.tar.bz2 gentoo-2-66d7891f28c3077c930093ab6626d0e91bde4f80.zip |
Modular X dependencies; Resolves Bug #120514.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-lisp')
-rw-r--r-- | dev-lisp/gcl/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lisp/gcl/Manifest | 12 | ||||
-rw-r--r-- | dev-lisp/gcl/files/digest-gcl-2.6.7-r1 | 1 | ||||
-rw-r--r-- | dev-lisp/gcl/gcl-2.6.7-r1.ebuild | 170 |
4 files changed, 179 insertions, 11 deletions
diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog index b862bd50f491..e36b042d011a 100644 --- a/dev-lisp/gcl/ChangeLog +++ b/dev-lisp/gcl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lisp/gcl # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.35 2006/01/12 22:51:19 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.36 2006/01/27 19:42:18 mkennedy Exp $ + +*gcl-2.6.7-r1 (27 Jan 2006) + + 27 Jan 2006; Matthew Kennedy <mkennedy@gentoo.org> +gcl-2.6.7-r1.ebuild: + Modular X dependencies; Resolves Bug #120514. 12 Jan 2006; Matthew Kennedy <mkennedy@gentoo.org> +files/2.6.7-fix-configure.in-gentoo.patch, gcl-2.6.7.ebuild: diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest index a342a1dbd2b7..fdc5075ee4e8 100644 --- a/dev-lisp/gcl/Manifest +++ b/dev-lisp/gcl/Manifest @@ -1,17 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 144b253ac958a78e0a19730618133667 ChangeLog 5320 MD5 1d2903807a9ecc5ea090f1daebe0f956 files/2.6.7-fix-configure.in-gentoo.patch 1452 MD5 91930d3515af8406b00bbddaa287b9a3 files/digest-gcl-2.6.6 62 MD5 bc36d4fbf49d4faa858862d3551da607 files/digest-gcl-2.6.7 62 +MD5 bc36d4fbf49d4faa858862d3551da607 files/digest-gcl-2.6.7-r1 62 MD5 8ff2948460c4a0929a03fcdd99283577 gcl-2.6.6.ebuild 3802 +MD5 485b85d05e9593e14018ff9bf34a1ba0 gcl-2.6.7-r1.ebuild 4110 MD5 51dda308ace95c7621dea73a9af0935c gcl-2.6.7.ebuild 4032 MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxt10yiNZaEAZA+ARAqQYAJ9QtGU0/T4nHxbOYrUlWvTE7K4jnACggi/0 -p8fOZAsfnLK24GLg1VVlCbw= -=jO8l ------END PGP SIGNATURE----- diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.7-r1 b/dev-lisp/gcl/files/digest-gcl-2.6.7-r1 new file mode 100644 index 000000000000..7c9e5b93be54 --- /dev/null +++ b/dev-lisp/gcl/files/digest-gcl-2.6.7-r1 @@ -0,0 +1 @@ +MD5 c0f42e1f391162e5ac90912a70e8ecc3 gcl-2.6.7.tar.gz 8193901 diff --git a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild new file mode 100644 index 000000000000..a7d236b8e2d9 --- /dev/null +++ b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7-r1.ebuild,v 1.1 2006/01/27 19:42:18 mkennedy Exp $ + +inherit elisp-common flag-o-matic autotools + +DESCRIPTION="GNU Common Lisp" +HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html" +SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64 ~sparc" +IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi" + +RDEPEND="emacs? ( virtual/emacs ) + readline? ( sys-libs/readline ) + >=dev-libs/gmp-4.1 + tcltk? ( dev-lang/tk ) + X? ( || ( ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/x11 ) )" + +DEPEND="$RDEPEND + doc? ( virtual/tetex ) + >=app-text/texi2html-1.64 + >=sys-devel/autoconf-2.52" + +src_unpack() { + unpack ${A} + sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile + mv ${T}/makefile ${S}/info/makefile + epatch ${FILESDIR}/${PV}-fix-configure.in-gentoo.patch || die +} + +src_compile() { + eautoconf || die + + export SANDBOX_ON=0 + local myconfig="" + + # Hardened gcc may automatically use PIE building, which does not + # work for this package so far + + filter-flags "-fPIC" + + # -fomit-frame-pointer cannot be used with gprof + + if use gprof; then + filter-flags "-fomit-frame-pointer" + fi + + # Unfortunately, we need to override any relocation choices below + # while upstream doesn't work with system BFD. SuSE has the same + # problem apparently. + + if false; then + + # Linking options are enumerated at + # http://www.gnu.org/software/gcl/RELEASE-2.6.2.html + + local dlopen_config=" + --disable-custreloc + --enable-dlopen + --disable-dynsysbfd + --disable-statsysbfd"; + + local bfd_config=" + --disable-custreloc + --disable-dlopen + --enable-dynsysbfd + --disable-statsysbfd"; + + local custreloc_config=" + --enable-custreloc + --disable-dlopen + --disable-dynsysbfd + --disable-statsysbfd"; + + if use custreloc; then + case "${ARCH}" in + x86 | sparc) + myconfig="${myconfig} ${custreloc_config}";; + *) + ewarn "--enable-custreloc is not supported on your architecture (${ARCH})." + ewarn "Using --enable-dlopen instead." + myconfig="${myconfig} ${dlopen_config}" + + esac + elif use dlopen; then + myconfig="${myconfig} ${dlopen_config}" + else + case "${ARCH}" in + x86 | sparc | ppc | amd64 | s390) + myconfig="${myconfig} ${bfd_config}";; + *) + ewarn "BFD is not supported on your architecture (${ARCH})." + ewarn "Using --enable-dlopen instead." + myconfig="${myconfig} ${dlopen_config}";; + esac + fi + + else + myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd" + fi + + if use tcltk; then + myconfig="${myconfig} + --enable-tkconfig=/usr/lib + --enable-tclconfig=/usr/lib" + fi + + myconfig="${myconfig} + --enable-dynsysgmp + `use_enable readline readline` + `use_with X x` + `use_enable debug debug` + `use_enable gprof gprof` + `use_enable ansi ansi` + --enable-xdr=no + --enable-infodir=/usr/share/info + --enable-emacsdir=/usr/share/emacs/site-lisp/gcl" + + einfo "Configuring with the following: +${myconfig}" + econf ${myconfig} || die + make || die +} + +src_install() { + export SANDBOX_ON=0 + make DESTDIR=${D} install || die + + rm -rf ${D}/usr/lib/${P}/info + mv ${D}/default.el elisp/ + + if use emacs; then + mv elisp/add-default.el ${T}/50gcl-gentoo.el + elisp-site-file-install ${T}/50gcl-gentoo.el + elisp-install ${PN} elisp/* + fperms 0644 /usr/share/emacs/site-lisp/gcl/* + else + rm -rf ${D}/usr/share/emacs + fi + + dosed /usr/bin/gcl + fperms 0755 /usr/bin/gcl + + # fix the GCL_TK_DIR=/var/tmp/portage/${P}/image// + dosed /usr/lib/${P}/gcl-tk/gcltksrv + fperms 0755 /usr/lib/${P}/gcl-tk/gcltksrv + + #repair gcl.exe symlink + #rm ${D}/usr/bin/gcl.exe + dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe + + dodoc readme* RELEASE* ChangeLog* doc/* + + for i in ${D}/usr/share/doc/gcl-{tk,si}; do + mv $i ${D}/usr/share/doc/${PF} + done + + find ${D}/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \; +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |