From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q9YyF-0003yL-Qb for garchives@archives.gentoo.org; Tue, 12 Apr 2011 08:29:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFBBA1C008; Tue, 12 Apr 2011 08:29:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E7171C008 for ; Tue, 12 Apr 2011 08:29:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 780531B4033 for ; Tue, 12 Apr 2011 08:29:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D9EB880065 for ; Tue, 12 Apr 2011 08:29:01 +0000 (UTC) From: "Marijn Schouten" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marijn Schouten" Message-ID: <61275f8f2f9c6c8941d34da44976ac6e1d9b2e35.hkbst@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-scheme/guile/guile-1.9.12.ebuild dev-scheme/guile/guile-1.9.14.ebuild dev-scheme/guile/guile-999.ebuild dev-scheme/guile/guile-9999.ebuild X-VCS-Directories: dev-scheme/guile/ X-VCS-Committer: hkbst X-VCS-Committer-Name: Marijn Schouten X-VCS-Revision: 61275f8f2f9c6c8941d34da44976ac6e1d9b2e35 Date: Tue, 12 Apr 2011 08:29:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ec2ecdf6fcce4c7603b70b0c5a25fd84 commit: 61275f8f2f9c6c8941d34da44976ac6e1d9b2e35 Author: Marijn Schouten gentoo org> AuthorDate: Tue Apr 12 08:27:46 2011 +0000 Commit: Marijn Schouten gentoo org> CommitDate: Tue Apr 12 08:27:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3D61275f8f Bump live guile ebuild --- dev-scheme/guile/guile-1.9.12.ebuild | 107 ----------------------------= -- dev-scheme/guile/guile-1.9.14.ebuild | 107 ----------------------------= -- dev-scheme/guile/guile-999.ebuild | 119 ++++++++++++++++++++++------= ------ dev-scheme/guile/guile-9999.ebuild | 114 ----------------------------= ---- 4 files changed, 77 insertions(+), 370 deletions(-) diff --git a/dev-scheme/guile/guile-1.9.12.ebuild b/dev-scheme/guile/guil= e-1.9.12.ebuild deleted file mode 100644 index 7eae381..0000000 --- a/dev-scheme/guile/guile-1.9.12.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" - -inherit flag-o-matic elisp-common autotools - -DESCRIPTION=3D"Scheme interpreter" -HOMEPAGE=3D"http://www.gnu.org/software/guile/" -SRC_URI=3D" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz" - -LICENSE=3D"LGPL-2.1" -#KEYWORDS=3D"~amd64 ~x86" -KEYWORDS=3D"" -RESTRICT=3D"!regex? ( test )" - -DEPEND=3D">=3Ddev-libs/gmp-4.1 - >=3Dsys-devel/libtool-1.5.6 - sys-devel/gettext - dev-libs/libunistring - emacs? ( virtual/emacs )" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slo= tted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefo= re -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT=3D"12" -MAJOR=3D"1.8" - -IUSE=3D"networking +regex discouraged +deprecated emacs nls debug-malloc= debug +threads" - -#src_prepare() { -# sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-conf= ig\])/' -i configure.ac || die -# eautoreconf -#} - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use deprecated || use_enable discouraged) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - --disable-rpath \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - --with-modules \ - EMACS=3Dno -} - -src_compile() { - emake || die "make failed" - - # Above we have disabled the build system's Emacs support; - # for USE=3Demacs we compile (and install) the files manually - if use emacs; then - cd emacs/ - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR=3D"${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # texmacs needs this, closing bug #23493 - dodir /etc/env.d || die - echo "GUILE_LOAD_PATH=3D\"/usr/share/guile/${MAJOR}\"" > "${D}"/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-install failed" - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \ - || die "elisp-site-file-install failed" - fi -} - -pkg_postinst() { - [ "${ROOT}" =3D=3D "/" ] && 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 "${ROOT}"/usr/share/guile/site/slibcat -} diff --git a/dev-scheme/guile/guile-1.9.14.ebuild b/dev-scheme/guile/guil= e-1.9.14.ebuild deleted file mode 100644 index 8413997..0000000 --- a/dev-scheme/guile/guile-1.9.14.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" -#inherit eutils autotools flag-o-matic elisp-common -inherit eutils flag-o-matic elisp-common - -DESCRIPTION=3D"Scheme interpreter" -HOMEPAGE=3D"http://www.gnu.org/software/guile/" -SRC_URI=3D" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz" -#SRC_URI=3D"mirror://gnu/guile/${P}.tar.gz" - -LICENSE=3D"LGPL-3" -KEYWORDS=3D"" -#IUSE=3D"networking +regex +deprecated emacs nls debug-malloc debug +thr= eads readline" -IUSE=3D"networking +regex +deprecated nls debug-malloc debug +threads re= adline" -RESTRICT=3D"!regex? ( test )" - -DEPEND=3D" - >=3Ddev-libs/gmp-4.1 - >=3Ddev-libs/boehm-gc-7.0 - >=3Dsys-devel/libtool-1.5.6 - dev-libs/libunistring - virtual/libffi - nls? ( sys-devel/gettext )" - #emacs? ( virtual/emacs )" -RDEPEND=3D"${DEPEND}" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slo= tted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefo= re -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT=3D"12" -#MAJOR=3D"1.8" -MAJOR=3D"2.0" - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - --disable-rpath \ - --with-modules \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - $(use !readline && echo "--without-libreadline-prefix") - #EMACS=3Dno - #readline posix static -} - -src_compile() { - emake || die "make failed" - - # Above we have disabled the build system's Emacs support; - # for USE=3Demacs we compile (and install) the files manually -# if use emacs; then -# cd emacs -# elisp-compile *.el || die -# fi -} - -src_install() { - einstall || die "install failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # texmacs needs this, closing bug #23493 - dodir /etc/env.d - echo "GUILE_LOAD_PATH=3D\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${E= D}"/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}" =3D=3D "/" ] && 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 -} diff --git a/dev-scheme/guile/guile-999.ebuild b/dev-scheme/guile/guile-9= 99.ebuild index efa539c..7cfd51f 100644 --- a/dev-scheme/guile/guile-999.ebuild +++ b/dev-scheme/guile/guile-999.ebuild @@ -1,76 +1,111 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -inherit eutils autotools +EAPI=3D4 =20 -ECVS_SERVER=3D"cvs.savannah.gnu.org:/sources/guile" -ECVS_MODULE=3D"guile" -#ECVS_MODULE=3D"guile/{guile-core,workbook}" +# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYW= ORDS =20 -inherit cvs +inherit eutils flag-o-matic elisp-common +inherit git =20 -S=3D"${WORKDIR}/${PN}/guile-core" - -DESCRIPTION=3D"Scheme interpreter" +DESCRIPTION=3D"GNU Ubiquitous Intelligent Language for Extensions" HOMEPAGE=3D"http://www.gnu.org/software/guile/" +#SRC_URI=3D"mirror://gnu/guile/${P}.tar.gz" +EGIT_REPO_URI=3D"git://git.sv.gnu.org/guile.git" =20 -LICENSE=3D"GPL-2" +LICENSE=3D"LGPL-3" KEYWORDS=3D"" - -DEPEND=3D">=3Ddev-libs/gmp-4.1 >=3Dsys-devel/libtool-1.5.6 sys-devel/get= text dev-libs/gnulib" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slo= tted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefo= re -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT=3D"12" -MAJOR=3D"1.8" - -IUSE=3D"networking regex discouraged deprecated elisp nls debug-freelist= debug-malloc debug threads" - -_src_unpack() { - cvs_src_unpack - sed 's#gnulib-tool --update#strace -f -e open,stat,stat64 gnulib-tool -= -update#' -i ${S}/autogen.sh +IUSE=3D"networking +regex +deprecated emacs nls debug-malloc debug +thre= ads" + +DEPEND=3D" + dev-libs/gmp + >=3Dsys-devel/libtool-1.5.6 + sys-devel/gettext + dev-util/pkgconfig + dev-libs/libunistring + >=3Ddev-libs/boehm-gc-7.0[threads?] + dev-libs/libffi + emacs? ( virtual/emacs )" +RDEPEND=3D"${DEPEND}" + +SLOT=3D"2" +MAJOR=3D"2.0" + +src_prepare() { + # for live ebuilds + if [ -x autogen.sh ]; then + ./autogen.sh || die + fi } =20 -src_compile() { -# mv configure.in configure.ac - echo "pwd: "; pwd - echo "ls: "; ls -# rm configure.in -# test -f configure.in && echo "yes" || echo "no" -# exit - sh ./autogen.sh - -#will fail for me if posix is disabled or without modules -- hkBst - ls +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + #will fail for me if posix is disabled or without modules -- hkBst econf \ - --enable-maintainer-mode \ --disable-error-on-warning \ --disable-static \ --enable-posix \ $(use_enable networking) \ $(use_enable regex) \ - $(use deprecated || use_enable discouraged) \ $(use_enable deprecated) \ - $(use_enable elisp) \ $(use_enable nls) \ --disable-rpath \ - $(use_enable debug-freelist) \ $(use_enable debug-malloc) \ $(use_enable debug guile-debug) \ $(use_with threads) \ - --with-modules + --with-modules # \ +# EMACS=3Dno +} =20 +src_compile() { emake || die "make failed" + + # Above we have disabled the build system's Emacs support; + # for USE=3Demacs we compile (and install) the files manually + # if use emacs; then + # cd emacs + # make + # elisp-compile *.el || die + # fi } =20 src_install() { einstall || die "install failed" =20 - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THA= NKS + dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die =20 # texmacs needs this, closing bug #23493 dodir /etc/env.d - echo "GUILE_LOAD_PATH=3D\"/usr/share/guile/${MAJOR}\"" > ${D}/etc/env.d= /50guile + echo "GUILE_LOAD_PATH=3D\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${E= D}"/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}" =3D=3D "/" ] && 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 +} \ No newline at end of file diff --git a/dev-scheme/guile/guile-9999.ebuild b/dev-scheme/guile/guile-= 9999.ebuild deleted file mode 100644 index a1b06f9..0000000 --- a/dev-scheme/guile/guile-9999.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" -#inherit eutils autotools flag-o-matic elisp-common -#inherit eutils flag-o-matic elisp-common git -inherit eutils autotools flag-o-matic git elisp-common - -DESCRIPTION=3D"Scheme interpreter" -HOMEPAGE=3D"http://www.gnu.org/software/guile/" -#SRC_URI=3D" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz" -#SRC_URI=3D"mirror://gnu/guile/${P}.tar.gz" - -LICENSE=3D"LGPL-3" -KEYWORDS=3D"" -IUSE=3D"networking +regex +deprecated emacs nls debug-malloc debug +thre= ads readline" -#IUSE=3D"networking +regex +deprecated nls debug-malloc debug +threads r= eadline" -RESTRICT=3D"!regex? ( test )" - -EGIT_REPO_URI=3D"git://git.sv.gnu.org/guile.git" - -DEPEND=3D" - >=3Ddev-libs/gmp-4.1 - >=3Ddev-libs/boehm-gc-7.0 - >=3Dsys-devel/libtool-1.5.6 - dev-libs/libunistring - virtual/libffi - nls? ( sys-devel/gettext ) - emacs? ( virtual/emacs )" -RDEPEND=3D"${DEPEND}" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slo= tted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefo= re -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT=3D"12" -#MAJOR=3D"1.8" -MAJOR=3D"2.0" - -src_prepare() { - sh autogen.sh || die "guile's autogen script failed" - eautoreconf || die "eautoreconf failed" -} -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --disable-error-on-warning \ - --disable-static \ - --enable-posix \ - --disable-rpath \ - --with-modules \ - $(use_enable networking) \ - $(use_enable regex) \ - $(use_enable deprecated) \ - $(use_enable nls) \ - $(use_enable debug-malloc) \ - $(use_enable debug guile-debug) \ - $(use_with threads) \ - $(use !readline && echo "--without-libreadline-prefix") - #EMACS=3Dno - #readline posix static -} - -src_compile() { - emake || die "make failed" - - # Above we have disabled the build system's Emacs support; - # for USE=3Demacs we compile (and install) the files manually - if use emacs; then - cd emacs - elisp-compile *.el || die - fi -} - -src_install() { - einstall || die "install failed" - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die - - # texmacs needs this, closing bug #23493 - dodir /etc/env.d - echo "GUILE_LOAD_PATH=3D\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${E= D}"/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}" =3D=3D "/" ] && 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 -}