From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-509122-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 97A73138010
for <garchives@archives.gentoo.org>; Wed, 26 Sep 2012 18:57:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4846421C03E;
Wed, 26 Sep 2012 18:56:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id F3A8621C03E
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2012 18:56:55 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1747A33C394
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2012 18:56:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id B5633E5449
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2012 18:56:53 +0000 (UTC)
From: "Cyprien Nicolas" <c.nicolas+gentoo@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Cyprien Nicolas" <c.nicolas+gentoo@gmail.com>
Message-ID: <1348685804.8f4cf676e1be5d5277688e02a1dd5fa1d7bc86c9.fulax@gentoo>
Subject: [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/
X-VCS-Repository: proj/lisp
X-VCS-Files: dev-scheme/guile/guile-2.0.1.ebuild dev-scheme/guile/guile-2.0.5.ebuild dev-scheme/guile/guile-2.0.6.ebuild
X-VCS-Directories: dev-scheme/guile/
X-VCS-Committer: fulax
X-VCS-Committer-Name: Cyprien Nicolas
X-VCS-Revision: 8f4cf676e1be5d5277688e02a1dd5fa1d7bc86c9
X-VCS-Branch: master
Date: Wed, 26 Sep 2012 18:56:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7718fbef-fff2-4857-8656-a6180e987482
X-Archives-Hash: 72246b7074ed65dbad9d630b1cccea86
commit: 8f4cf676e1be5d5277688e02a1dd5fa1d7bc86c9
Author: Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Sep 26 18:56:44 2012 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Wed Sep 26 18:56:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=8f4cf676
dev-scheme/guile: Workout the emacs issue for 2.0.6. Remove 'emacs' USE flag. Remove old guile 2 versions.
According to dsmith in #guile, emacs files provide a debugger, but
guile internals changed a lot in 2.0.x, so those files became useless.
The emacs directory is still part of the distribution, but of no use.
(Portage version: 2.2.0_alpha131/git/Linux i686, signed Manifest commit with key 0xBE63A96F)
---
dev-scheme/guile/guile-2.0.1.ebuild | 108 ---------------------------------
dev-scheme/guile/guile-2.0.5.ebuild | 114 -----------------------------------
dev-scheme/guile/guile-2.0.6.ebuild | 30 +--------
3 files changed, 4 insertions(+), 248 deletions(-)
diff --git a/dev-scheme/guile/guile-2.0.1.ebuild b/dev-scheme/guile/guile-2.0.1.ebuild
deleted file mode 100644
index af88dd8..0000000
--- a/dev-scheme/guile/guile-2.0.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit eutils flag-o-matic elisp-common
-
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads"
-
-RDEPEND="
- app-admin/eselect-guile
- dev-libs/gmp
- >=sys-devel/libtool-1.5.6
- sys-devel/gettext
- dev-libs/libunistring
- >=dev-libs/boehm-gc-7.0[threads?]
- dev-libs/libffi
- emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-SLOT="2"
-MAJOR="2.0"
-
-src_configure() {
- # see bug #178499
- filter-flags -ftree-vectorize
-
- #will fail for me if posix is disabled or without modules -- hkBst
- econf \
- --program-suffix="-${MAJOR}" \
- --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
- --disable-error-on-warning \
- --disable-static \
- --enable-posix \
- $(use_enable networking) \
- $(use_enable regex) \
- $(use_enable deprecated) \
- $(use_enable nls) \
- --disable-rpath \
- $(use_enable debug-malloc) \
- $(use_enable debug guile-debug) \
- $(use_with threads) \
- --with-modules # \
-# EMACS=no
-}
-
-src_compile() {
- emake || die "make failed"
-
- # 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
- # make
- # elisp-compile *.el || die
- # fi
-}
-
-src_install() {
- einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
-
- # Maybe there is a proper way to do this? Symlink handled by eselect
- mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
-
- dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
- # Replaced by app-admin/eselect-guile
- ## texmacs needs this, closing bug #23493
- #dodir /etc/env.d
- #echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
- # necessary for registering slib, see bug 206896
- keepdir /usr/share/guile/site
-
- # if use emacs; then
- # elisp-install ${PN} emacs/*.{el,elc} || die
- # elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- # fi
-}
-
-pkg_postinst() {
- [ "${EROOT}" == "/" ] && pkg_config
- use emacs && elisp-site-regen
- eselect guile update ifunset
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- eselect guile update ifunset
-}
-
-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
-}
diff --git a/dev-scheme/guile/guile-2.0.5.ebuild b/dev-scheme/guile/guile-2.0.5.ebuild
deleted file mode 100644
index ba5d2e8..0000000
--- a/dev-scheme/guile/guile-2.0.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# 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=4
-inherit autotools eutils flag-o-matic elisp-common
-
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads"
-
-RDEPEND="
- app-admin/eselect-guile
- dev-libs/gmp
- >=sys-devel/libtool-1.5.6
- sys-devel/gettext
- dev-libs/libunistring
- >=dev-libs/boehm-gc-7.0[threads?]
- dev-libs/libffi
- emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-SLOT="2"
-MAJOR="2.0"
-
-src_prepare() {
- epatch "${FILESDIR}/3742d778fbc6ea879437c19aeebe09179dceffdf.patch"
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- # see bug #178499
- filter-flags -ftree-vectorize
-
- #will fail for me if posix is disabled or without modules -- hkBst
- econf \
- --program-suffix="-${MAJOR}" \
- --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
- --disable-error-on-warning \
- --disable-static \
- --enable-posix \
- $(use_enable networking) \
- $(use_enable regex) \
- $(use_enable deprecated) \
- $(use_enable nls) \
- --disable-rpath \
- $(use_enable debug-malloc) \
- $(use_enable debug guile-debug) \
- $(use_with threads) \
- --with-modules # \
-# EMACS=no
-}
-
-src_compile() {
- emake || die "make failed"
-
- # 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
- # make
- # elisp-compile *.el || die
- # fi
-}
-
-src_install() {
- einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
-
- # Maybe there is a proper way to do this? Symlink handled by eselect
- mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
-
- dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
- # Replaced by app-admin/eselect-guile
- ## texmacs needs this, closing bug #23493
- #dodir /etc/env.d
- #echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
- # necessary for registering slib, see bug 206896
- keepdir /usr/share/guile/site
-
- # if use emacs; then
- # elisp-install ${PN} emacs/*.{el,elc} || die
- # elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- # fi
-}
-
-pkg_postinst() {
- [ "${EROOT}" == "/" ] && pkg_config
- use emacs && elisp-site-regen
- eselect guile update ifunset
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- eselect guile update ifunset
-}
-
-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
-}
diff --git a/dev-scheme/guile/guile-2.0.6.ebuild b/dev-scheme/guile/guile-2.0.6.ebuild
index 3af87a0..c1c5d8a 100644
--- a/dev-scheme/guile/guile-2.0.6.ebuild
+++ b/dev-scheme/guile/guile-2.0.6.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit autotools eutils flag-o-matic elisp-common
+inherit autotools eutils flag-o-matic
DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
HOMEPAGE="http://www.gnu.org/software/guile/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3"
KEYWORDS="~amd64 ~x86"
-IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads"
+IUSE="networking +regex +deprecated nls debug-malloc debug +threads"
RDEPEND="
app-admin/eselect-guile
@@ -20,8 +20,7 @@ RDEPEND="
dev-libs/libffi
dev-libs/libunistring
sys-devel/gettext
- >=sys-devel/libtool-1.5.6
- emacs? ( virtual/emacs )"
+ >=sys-devel/libtool-1.5.6"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -52,20 +51,11 @@ src_configure() {
$(use_enable debug-malloc) \
$(use_enable debug guile-debug) \
$(use_with threads) \
- --with-modules # \
-# EMACS=no
+ --with-modules
}
src_compile() {
emake || die "make failed"
-
- # 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
- # make
- # elisp-compile *.el || die
- # fi
}
src_install() {
@@ -76,28 +66,16 @@ src_install() {
dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
- # Replaced by app-admin/eselect-guile
- ## texmacs needs this, closing bug #23493
- #dodir /etc/env.d
- #echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
# necessary for registering slib, see bug 206896
keepdir /usr/share/guile/site
-
- # if use emacs; then
- # elisp-install ${PN} emacs/*.{el,elc} || die
- # elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- # fi
}
pkg_postinst() {
[ "${EROOT}" == "/" ] && pkg_config
- use emacs && elisp-site-regen
eselect guile update ifunset
}
pkg_postrm() {
- use emacs && elisp-site-regen
eselect guile update ifunset
}