[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/

["Marijn Schouten" <hkbst@gentoo.org>]

commit:     61275f8f2f9c6c8941d34da44976ac6e1d9b2e35
Author:     Marijn Schouten <hkBst <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 08:27:46 2011 +0000
Commit:     Marijn Schouten <hkbst <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 08:27:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=61275f8f

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/guile-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="3"
-
-inherit flag-o-matic elisp-common autotools
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI=" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS=""
-RESTRICT="!regex? ( test )"
-
-DEPEND=">=dev-libs/gmp-4.1
-	>=sys-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 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"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated emacs nls debug-malloc debug +threads"
-
-#src_prepare() {
-#    sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -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=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/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${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=\"/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}" == "/" ] && 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/guile-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="3"
-#inherit eutils autotools flag-o-matic elisp-common
-inherit eutils flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI=" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz"
-#SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS=""
-#IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads readline"
-IUSE="networking +regex +deprecated nls debug-malloc debug +threads readline"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=dev-libs/boehm-gc-7.0
-	>=sys-devel/libtool-1.5.6
-	dev-libs/libunistring
-	virtual/libffi
-	nls? ( sys-devel/gettext )"
-	#emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# 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"
-#MAJOR="1.8"
-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 \
-		--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=no
-		#readline posix  static
-}
-
-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
-#		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=\"${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
-}
-
-#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-999.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: $
 
-inherit eutils autotools
+EAPI=4
 
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/guile"
-ECVS_MODULE="guile"
-#ECVS_MODULE="guile/{guile-core,workbook}"
+# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS
 
-inherit cvs
+inherit eutils flag-o-matic elisp-common
+inherit git
 
-S="${WORKDIR}/${PN}/guile-core"
-
-DESCRIPTION="Scheme interpreter"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="http://www.gnu.org/software/guile/"
+#SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+EGIT_REPO_URI="git://git.sv.gnu.org/guile.git"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
 KEYWORDS=""
-
-DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext dev-libs/gnulib"
-
-# 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"
-MAJOR="1.8"
-
-IUSE="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="networking +regex +deprecated emacs nls debug-malloc debug +threads"
+
+DEPEND="
+	dev-libs/gmp
+	>=sys-devel/libtool-1.5.6
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-libs/libunistring
+	>=dev-libs/boehm-gc-7.0[threads?]
+	dev-libs/libffi
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+SLOT="2"
+MAJOR="2.0"
+
+src_prepare() {
+	# for live ebuilds
+	if [ -x autogen.sh ]; then
+		./autogen.sh || die
+	fi
 }
 
-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=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 || die "install failed"
 
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
 
 	# texmacs needs this, closing bug #23493
 	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > ${D}/etc/env.d/50guile
+	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
+}
+
+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="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="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-#SRC_URI=" ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz"
-#SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS=""
-IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads readline"
-#IUSE="networking +regex +deprecated nls debug-malloc debug +threads readline"
-RESTRICT="!regex? ( test )"
-
-EGIT_REPO_URI="git://git.sv.gnu.org/guile.git"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=dev-libs/boehm-gc-7.0
-	>=sys-devel/libtool-1.5.6
-	dev-libs/libunistring
-	virtual/libffi
-	nls? ( sys-devel/gettext )
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# 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"
-#MAJOR="1.8"
-MAJOR="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=no
-		#readline posix  static
-}
-
-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
-		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=\"${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
-}
-
-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
-}