pkg_{post,pre}* fixes, new upstream (masked)

6 files changed, 263 insertions, 12 deletions

diff --git a/dev-lisp/sbcl-mt/Manifest b/dev-lisp/sbcl-mt/Manifest
index a1a28eb9c7e7..14e532841949 100644
--- a/dev-lisp/sbcl-mt/Manifest
+++ b/dev-lisp/sbcl-mt/Manifest
@@ -1,8 +1,8 @@
-MD5 25c31a6da22fea8ec8880e7778986802 ChangeLog 903
+MD5 c6c7f055b4f75934bec704585987f721 ChangeLog 903
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 a812b309fc98292496c25705998ddccc sbcl-mt-0.8.4.20.ebuild 3889
-MD5 8ce6cc035ab8c19aed99f0d06e1dc8cc sbcl-mt-0.8.4.35.ebuild 3934
-MD5 2b1ad81d39d95aabed985f99c83dc711 sbcl-mt-0.8.4.20-r1.ebuild 3932
+MD5 56aabbea7700e1bc93d3930b6328283c sbcl-mt-0.8.4.20.ebuild 3889
+MD5 5eedd6788a60dfa627b316d546e99463 sbcl-mt-0.8.4.35.ebuild 3934
+MD5 25639d8f67b4d39d6c75c008e7fe3b75 sbcl-mt-0.8.4.20-r1.ebuild 3935
 MD5 738c5c7d7535f7b9b8297fc13827af81 files/customize-target-features.lisp 70
 MD5 40b2d24e6e377144d83e098abd83d2be files/digest-sbcl-mt-0.8.4.20 224
 MD5 332a3c014d85b29da7ef39caa1b147b7 files/sbcl-mt.rc 296
diff --git a/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.20-r1 b/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.20-r1
new file mode 100644
index 000000000000..ba2322611559
--- /dev/null
+++ b/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.20-r1
@@ -0,0 +1,3 @@
+MD5 fb9e202f00f62b7071ce265dd51f2c77 sbcl-mt_0.8.4.20.orig.tar.gz 2541493
+MD5 05a78ba3560a6f4ae85943ab50e688b0 sbcl-mt_0.8.4.20-1.diff.gz 7587
+MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
diff --git a/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.35 b/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.35
new file mode 100644
index 000000000000..8ea36770039c
--- /dev/null
+++ b/dev-lisp/sbcl-mt/files/digest-sbcl-mt-0.8.4.35
@@ -0,0 +1,3 @@
+MD5 0b82dc17ff21bff851259539c6b428e6 sbcl-mt_0.8.4.35.orig.tar.gz 2546781
+MD5 3671c8326a2840183976b3fa7a53ed71 sbcl-mt_0.8.4.35-1.diff.gz 7536
+MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
diff --git a/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20-r1.ebuild b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20-r1.ebuild
new file mode 100644
index 000000000000..70ab66311cce
--- /dev/null
+++ b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20-r1.ebuild,v 1.1 2003/10/22 19:53:13 mkennedy Exp $
+
+inherit common-lisp-common
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is a Open Source development system for ANSI Common Lisp. It provides an interactive environment including an integrated native compiler, interpreter, and debugger.  This is the multreaded version of SBCL"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+BV_X86=0.8.1
+DEB_PV=1
+SRC_URI="http://ftp.debian.org/debian/pool/main/s/sbcl-mt/sbcl-mt_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/s/sbcl-mt/sbcl-mt_${PV}-${DEB_PV}.diff.gz
+	x86? ( mirror://sourceforge/sbcl/sbcl-${BV_X86}-x86-linux-binary.tar.bz2 )"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+PROVIDE="virtual/commonlisp"
+# the SRC_URI trickery needs this
+DEPEND=">=sys-apps/portage-2.0.27
+	dev-lisp/common-lisp-controller
+	doc? ( app-text/openjade )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	if use x86; then
+		unpack sbcl-${BV_X86}-x86-linux-binary.tar.bz2
+		mv sbcl-${BV_X86} x86-binary
+	fi
+	unpack sbcl-mt_${PV}.orig.tar.gz
+	unpack sbcl-mt_${PV}-${DEB_PV}.diff.gz
+	epatch sbcl-mt_${PV}-${DEB_PV}.diff
+	cp ${FILESDIR}/customize-target-features.lisp ${S}/
+}
+
+src_compile() {
+	local bindir
+	use x86 && bindir=../x86-binary
+#	use ppc && bindir=../ppc-binary
+#	use sparc && bindir=../sparc-binary
+#	use mips && bindir=../mips-binary
+	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
+	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
+		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --noprogrammer --core ${bindir}/output/sbcl.core' || die
+	if use doc; then
+		cd doc && chmod +x make-doc.sh
+		./make-doc.sh
+	fi
+}
+
+src_install() {
+	unset SBCL_HOME
+
+	insinto /etc/
+	doins ${FILESDIR}/sbcl-mt.rc
+
+	exeinto /usr/lib/common-lisp/bin
+	doexe debian/sbcl-mt.sh
+
+	INSTALL_ROOT=${D}/usr sh install.sh
+	mv ${D}/usr/lib/sbcl ${D}/usr/lib/sbcl-mt
+	mv ${D}/usr/bin/sbcl ${D}/usr/bin/sbcl-mt
+#	dosym /usr/lib/sbcl-mt/asdf-install/asdf-install /usr/bin/sbcl-asdf-install
+	rm ${D}/usr/bin/sbcl-asdf-install
+	mv ${D}/usr/lib/sbcl-mt/sbcl.core ${D}/usr/lib/sbcl-mt/sbcl-dist.core
+
+	insinto /usr/lib/sbcl-mt
+	doins debian/install-clc.lisp
+
+	dodir /usr/share
+	mv ${D}/usr/man ${D}/usr/share/
+	mv ${D}/usr/share/man/man1/sbcl.1 ${D}/usr/share/man/man1/sbcl-mt.1
+
+#	doman debian/sbcl-asdf-install.1
+
+	use doc && dohtml doc/html/*
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES \
+		README STYLE TLA TODO
+	do-debian-credits
+
+	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
+	find ${D} -type f -name \*.c -exec chmod 644 '{}' \;
+
+	# Since the Portage emerge step kills file timestamp information,
+	# we need to compensate by ensuring all .fasl files are more recent
+	# than their .lisp source.
+
+	dodir /usr/share/sbcl-mt
+	tar cpvzf ${D}/usr/share/sbcl-mt/portage-timestamp-compensate \
+		-C ${D}/usr/lib/sbcl-mt .
+}
+
+pkg_postinst() {
+	tar xvpzf /usr/share/sbcl-mt/portage-timestamp-compensate -C /usr/lib/sbcl-mt
+	# force existing CLC-managed sources to re-compile (possibly unnecessary)
+	rm -rf /usr/lib/common-lisp/sbcl-mt/* &>/dev/null || true
+	/usr/bin/clc-autobuild-impl sbcl-mt yes
+	/usr/sbin/register-common-lisp-implementation sbcl-mt
+}
+
+# we do the clean up in postrm since the existence of /usr/bin/scbl-mt
+# in postrm implies that we're doing an upgrade and DONT want our new
+# version unreigistered.
+
+# pkg_prerm() {
+# 	/usr/sbin/unregister-common-lisp-implementation sbcl-mt
+# }
+
+pkg_postrm() {
+	# Since we keep our own time stamps we must manually remove them
+	# here.
+	if [ ! -x /usr/bin/sbcl-mt ]; then
+		rm -rf /usr/lib/sbcl-mt || true
+		einfo "Unregistering Common Lisp implementation ${PN}"
+		rm -f /usr/lib/common-lisp/bin/${PN}.sh || die
+		rm -rf /usr/lib/common-lisp/${PN} || die
+	fi
+}
diff --git a/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild
index 25947d8767d0..619cea793a48 100644
--- a/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild
+++ b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild,v 1.1 2003/10/16 20:49:51 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.20.ebuild,v 1.2 2003/10/22 19:53:13 mkennedy Exp $
 
 inherit common-lisp-common
 
@@ -74,8 +74,8 @@ src_install() {
 #	doman debian/sbcl-asdf-install.1
 
 	use doc && dohtml doc/html/*
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE TLA TODO
-
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES \
+		README STYLE TLA TODO
 	do-debian-credits
 
 	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
@@ -86,24 +86,32 @@ src_install() {
 	# than their .lisp source.
 
 	dodir /usr/share/sbcl-mt
-	tar cpvzf ${D}/usr/share/sbcl-mt/portage-timestamp-compensate -C ${D}/usr/lib/sbcl-mt .
+	tar cpvzf ${D}/usr/share/sbcl-mt/portage-timestamp-compensate \
+		-C ${D}/usr/lib/sbcl-mt .
 }
 
 pkg_postinst() {
 	tar xvpzf /usr/share/sbcl-mt/portage-timestamp-compensate -C /usr/lib/sbcl-mt
+	# force existing CLC-managed sources to re-compile (possibly unnecessary)
 	rm -rf /usr/lib/common-lisp/sbcl-mt/* &>/dev/null || true
 	/usr/bin/clc-autobuild-impl sbcl-mt yes
 	/usr/sbin/register-common-lisp-implementation sbcl-mt
 }
 
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl-mt
-}
+# we do the clean up in postrm since the existence of /usr/bin/scbl-mt
+# in postrm implies that we're doing an upgrade and DONT want our new
+# version unreigistered.
+
+# pkg_prerm() {
+# 	/usr/sbin/unregister-common-lisp-implementation sbcl-mt
+# }
 
 pkg_postrm() {
 	# Since we keep our own time stamps we must manually remove them
 	# here.
 	if [ ! -x /usr/bin/sbcl-mt ]; then
-		rm -rf /usr/lib/sbcl-mt
+		rm -rf /usr/lib/sbcl-mt || true
+		einfo "Unregistering Common Lisp implementation ${PN}"
+		rm -f /usr/lib/common-lisp/bin/${PN}.sh || die
 	fi
 }
diff --git a/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.35.ebuild b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.35.ebuild
new file mode 100644
index 000000000000..dd0284f2c923
--- /dev/null
+++ b/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.35.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl-mt/sbcl-mt-0.8.4.35.ebuild,v 1.1 2003/10/22 19:53:13 mkennedy Exp $
+
+inherit common-lisp-common
+
+DEB_PV=1
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is a Open Source development system for ANSI Common Lisp. It provides an interactive environment including an integrated native compiler, interpreter, and debugger.  This is the multreaded version of SBCL"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+BV_X86=0.8.1
+SRC_URI="http://ftp.debian.org/debian/pool/main/s/sbcl-mt/sbcl-mt_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/s/sbcl-mt/sbcl-mt_${PV}-${DEB_PV}.diff.gz
+	x86? ( mirror://sourceforge/sbcl/sbcl-${BV_X86}-x86-linux-binary.tar.bz2 )"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-x86"
+PROVIDE="virtual/commonlisp"
+# the SRC_URI trickery needs this
+DEPEND=">=sys-apps/portage-2.0.27
+	dev-lisp/common-lisp-controller
+	doc? ( app-text/openjade )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	if use x86; then
+		unpack sbcl-${BV_X86}-x86-linux-binary.tar.bz2
+		mv sbcl-${BV_X86} x86-binary
+	fi
+	unpack sbcl-mt_${PV}.orig.tar.gz
+	unpack sbcl-mt_${PV}-${DEB_PV}.diff.gz
+	epatch sbcl-mt_${PV}-${DEB_PV}.diff
+	cp ${FILESDIR}/customize-target-features.lisp ${S}/
+}
+
+src_compile() {
+	local bindir
+	use x86 && bindir=../x86-binary
+#	use ppc && bindir=../ppc-binary
+#	use sparc && bindir=../sparc-binary
+#	use mips && bindir=../mips-binary
+	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
+	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
+		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --noprogrammer --core ${bindir}/output/sbcl.core' || die
+	if use doc; then
+		cd doc && chmod +x make-doc.sh
+		./make-doc.sh
+	fi
+}
+
+src_install() {
+	unset SBCL_HOME
+
+	insinto /etc/
+	doins ${FILESDIR}/sbcl-mt.rc
+
+	exeinto /usr/lib/common-lisp/bin
+	doexe debian/sbcl-mt.sh
+
+	INSTALL_ROOT=${D}/usr sh install.sh
+	mv ${D}/usr/lib/sbcl ${D}/usr/lib/sbcl-mt
+	mv ${D}/usr/bin/sbcl ${D}/usr/bin/sbcl-mt
+#	dosym /usr/lib/sbcl-mt/asdf-install/asdf-install /usr/bin/sbcl-asdf-install
+	rm ${D}/usr/bin/sbcl-asdf-install
+	mv ${D}/usr/lib/sbcl-mt/sbcl.core ${D}/usr/lib/sbcl-mt/sbcl-dist.core
+
+	insinto /usr/lib/sbcl-mt
+	doins debian/install-clc.lisp
+
+	dodir /usr/share
+	mv ${D}/usr/man ${D}/usr/share/
+	mv ${D}/usr/share/man/man1/sbcl.1 ${D}/usr/share/man/man1/sbcl-mt.1
+
+#	doman debian/sbcl-asdf-install.1
+
+	use doc && dohtml doc/html/*
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES \
+		README STYLE TLA TODO
+	do-debian-credits
+
+	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
+	find ${D} -type f -name \*.c -exec chmod 644 '{}' \;
+
+	# Since the Portage emerge step kills file timestamp information,
+	# we need to compensate by ensuring all .fasl files are more recent
+	# than their .lisp source.
+
+	dodir /usr/share/sbcl-mt
+	tar cpvzf ${D}/usr/share/sbcl-mt/portage-timestamp-compensate \
+		-C ${D}/usr/lib/sbcl-mt .
+}
+
+pkg_postinst() {
+	tar xvpzf /usr/share/sbcl-mt/portage-timestamp-compensate -C /usr/lib/sbcl-mt
+	# force existing CLC-managed sources to re-compile (possibly unnecessary)
+	rm -rf /usr/lib/common-lisp/sbcl-mt/* &>/dev/null || true
+	/usr/bin/clc-autobuild-impl sbcl-mt yes
+	/usr/sbin/register-common-lisp-implementation sbcl-mt
+}
+
+# we do the clean up in postrm since the existence of /usr/bin/scbl-mt
+# in postrm implies that we're doing an upgrade and DONT want our new
+# version unreigistered.
+
+# pkg_prerm() {
+# 	/usr/sbin/unregister-common-lisp-implementation sbcl-mt
+# }
+
+pkg_postrm() {
+	# Since we keep our own time stamps we must manually remove them
+	# here.
+	if [ ! -x /usr/bin/sbcl-mt ]; then
+		rm -rf /usr/lib/sbcl-mt || true
+		einfo "Unregistering Common Lisp implementation ${PN}"
+		rm -f /usr/lib/common-lisp/bin/${PN}.sh || die
+		rm -rf /usr/lib/common-lisp/${PN}/ || die
+	fi
+}