debian patches 32->34 fixes bug 190631, re-enable sandbox, remove filtering fPIC

Package-Manager: portage-2.1.3.7

4 files changed, 141 insertions, 5 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index 1471b5ad4191..5466c2201a80 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.47 2007/08/31 10:16:53 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.48 2007/08/31 11:12:16 hkbst Exp $
+
+*gcl-2.6.7-r3 (31 Aug 2007)
+
+  31 Aug 2007; Marijn Schouten <hkBst@gentoo.org> +gcl-2.6.7-r3.ebuild:
+  debian patches 32->34 fixes bug 190631, re-enable sandbox, remove filtering
+  fPIC
 
   31 Aug 2007; Marijn Schouten <hkBst@gentoo.org> gcl-2.6.7-r2.ebuild:
   add messages to die-calls
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 8034432f3e99..4e9fdf950d31 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -13,6 +13,7 @@ SHA256 2d3a7ae93b61c453eade2bbb0a3f0a4be1506e1104324c1a68e710266915df18 files/gc
 DIST gcl-2.6.7.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA1 d54f7db5dbd9f49953f80259a5eb44ade65027b5 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06
 DIST gcl.info.tgz 678468 RMD160 16e1f3ffd080a6801f82612ff66789a3ec9e21a7 SHA1 94ff34f1d4a0c3c388e493cf94d4ba4b821f7dbc SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57
 DIST gcl_2.6.7-32.diff.gz 14463119 RMD160 fe20465f30c968558edddf493780fb401b7c42a8 SHA1 b45dd81dfb674ec60936a711c5991d215aee4ac9 SHA256 5041b40bd96a0c73b70022831e6a697e00b64f572bca66d5a6c24978a879678e
+DIST gcl_2.6.7-34.diff.gz 14493530 RMD160 cf065a5fa8d6bf09d4903262237050ea28f696ac SHA1 a4c07f5cf29951dbe3ce6067a94617d2e2257ee2 SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65
 DIST gcl_2.6.7.orig.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA1 d54f7db5dbd9f49953f80259a5eb44ade65027b5 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06
 EBUILD gcl-2.6.7-r1.ebuild 4202 RMD160 0ebce0fd368e5adc02c520d6f0514813f5f0b563 SHA1 935ff7b05bffb751227379c3b8daccc4d8e33b77 SHA256 275d77a3e52df3dc3ab6d57246dab9bbd3d1969ead93c79856bef0cda385edae
 MD5 be183873a3e624c3dd1d0c15da26f22e gcl-2.6.7-r1.ebuild 4202
@@ -22,14 +23,18 @@ EBUILD gcl-2.6.7-r2.ebuild 2891 RMD160 0a46b6c1e221715e9d22af9bf4a820b3079a206b
 MD5 2c72dc438788bc64fa4c9c8070e1bea2 gcl-2.6.7-r2.ebuild 2891
 RMD160 0a46b6c1e221715e9d22af9bf4a820b3079a206b gcl-2.6.7-r2.ebuild 2891
 SHA256 4d08164b8479d4752584e3c672daede695fd4ab56603ba964dab16f4105a468d gcl-2.6.7-r2.ebuild 2891
+EBUILD gcl-2.6.7-r3.ebuild 2967 RMD160 a9e5553d620a57150ddd46ac0e6f1bc0a17af303 SHA1 8772d2a336d971283f1fb0e6bb8b917938fc81aa SHA256 4323b107b1a52ec7657e4801a47bbbaf3c1b8ec6d82e2034b1afd0cd1e6ce594
+MD5 ca1c3be39ebf4a5ea937b569ad9719b1 gcl-2.6.7-r3.ebuild 2967
+RMD160 a9e5553d620a57150ddd46ac0e6f1bc0a17af303 gcl-2.6.7-r3.ebuild 2967
+SHA256 4323b107b1a52ec7657e4801a47bbbaf3c1b8ec6d82e2034b1afd0cd1e6ce594 gcl-2.6.7-r3.ebuild 2967
 EBUILD gcl-2.6.7.ebuild 4133 RMD160 fbeb78697ee16a69c37d676c3201b183f2d00c1c SHA1 21b1f136defc5bb49f91c0af01a1184354ee6786 SHA256 735367ca52d2b9c60e0283601ab9ed414c71de7fb19c223d11b6f5cff826d036
 MD5 e9caa1046fc08f278092cd9f8209e14a gcl-2.6.7.ebuild 4133
 RMD160 fbeb78697ee16a69c37d676c3201b183f2d00c1c gcl-2.6.7.ebuild 4133
 SHA256 735367ca52d2b9c60e0283601ab9ed414c71de7fb19c223d11b6f5cff826d036 gcl-2.6.7.ebuild 4133
-MISC ChangeLog 7175 RMD160 61c107159f516711015060a8e4108ae9ddbf1d47 SHA1 354767b6ebc4d54553392a8cf5074ef70555ac5b SHA256 841ea1786d7a5f3ea1a19e323ef24cee0b4c9a27b8889449c750d78c33772ab8
-MD5 523403966cacbcae14b13d99c83b6da4 ChangeLog 7175
-RMD160 61c107159f516711015060a8e4108ae9ddbf1d47 ChangeLog 7175
-SHA256 841ea1786d7a5f3ea1a19e323ef24cee0b4c9a27b8889449c750d78c33772ab8 ChangeLog 7175
+MISC ChangeLog 7362 RMD160 d3ad17c4b73804fe59e1f77c2e29ff057836982e SHA1 138378fd35a6951c301acc918f19ec7e4f435b89 SHA256 2360a490a17c71f3d4806a83a081fabd0d069da655e1ea097e0d3359c0ea31f8
+MD5 92aaf481a0adcd3a3cbfed497f2555be ChangeLog 7362
+RMD160 d3ad17c4b73804fe59e1f77c2e29ff057836982e ChangeLog 7362
+SHA256 2360a490a17c71f3d4806a83a081fabd0d069da655e1ea097e0d3359c0ea31f8 ChangeLog 7362
 MISC metadata.xml 414 RMD160 d8db93b413e6c6b3e82050a0c25ff275d053a59b SHA1 bffc23b117a0eae6f049f3c129ed07970743286a SHA256 35219c038746ff1bd171a390d1f6af4b37115e483ae8fd0d0ca5ead5c71000fc
 MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414
 RMD160 d8db93b413e6c6b3e82050a0c25ff275d053a59b metadata.xml 414
@@ -43,3 +48,6 @@ SHA256 9a02a865320d6c3fbdcd9b5e4c96bec1ee99b2aa27a48ca6f2645f3adaff4b7d files/di
 MD5 17e0f1881965dc9f8a62d1de868622f5 files/digest-gcl-2.6.7-r2 711
 RMD160 0368ad4e83875c0bd28412e322b77e7035d5e814 files/digest-gcl-2.6.7-r2 711
 SHA256 b9ee5484b99ccc4fb40a938e80cbe2ddd04df7b1f6728267f605486f1f9f855a files/digest-gcl-2.6.7-r2 711
+MD5 8a1365d7818fb44d9f33842bd95e4bc7 files/digest-gcl-2.6.7-r3 711
+RMD160 9f02f8fc030e3779af95cf5e303b43c76716d7ac files/digest-gcl-2.6.7-r3 711
+SHA256 b9661ccc99e507e5dedecad51b5551155c014de8c3b8c1e2fef95a23c7bc141d files/digest-gcl-2.6.7-r3 711
diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.7-r3 b/dev-lisp/gcl/files/digest-gcl-2.6.7-r3
new file mode 100644
index 000000000000..49bade496260
--- /dev/null
+++ b/dev-lisp/gcl/files/digest-gcl-2.6.7-r3
@@ -0,0 +1,9 @@
+MD5 9d16c9987986e1382576e7e7ef384535 gcl.info.tgz 678468
+RMD160 16e1f3ffd080a6801f82612ff66789a3ec9e21a7 gcl.info.tgz 678468
+SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57 gcl.info.tgz 678468
+MD5 c6a9ea759d7813d707695d913bf3b15d gcl_2.6.7-34.diff.gz 14493530
+RMD160 cf065a5fa8d6bf09d4903262237050ea28f696ac gcl_2.6.7-34.diff.gz 14493530
+SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65 gcl_2.6.7-34.diff.gz 14493530
+MD5 c0f42e1f391162e5ac90912a70e8ecc3 gcl_2.6.7.orig.tar.gz 8193901
+RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 gcl_2.6.7.orig.tar.gz 8193901
+SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 gcl_2.6.7.orig.tar.gz 8193901
diff --git a/dev-lisp/gcl/gcl-2.6.7-r3.ebuild b/dev-lisp/gcl/gcl-2.6.7-r3.ebuild
new file mode 100644
index 000000000000..2d60a85a3540
--- /dev/null
+++ b/dev-lisp/gcl/gcl-2.6.7-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/08/31 11:12:16 hkbst Exp $
+
+#removing flag-o-matic results in make install failing due to a segfault
+inherit elisp-common flag-o-matic
+
+DEB_PV=34
+
+DESCRIPTION="GNU Common Lisp"
+HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
+SRC_URI="mirror://debian/pool/main/g/gcl/gcl_${PV}.orig.tar.gz
+	mirror://debian/pool/main/g/gcl/gcl_${PV}-${DEB_PV}.diff.gz
+	ftp://ftp.gnu.org/pub/gnu/gcl/${PN}.info.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="emacs readline debug X tk doc ansi"
+
+RDEPEND="emacs? ( virtual/emacs )
+	readline? ( sys-libs/readline )
+	>=dev-libs/gmp-4.1
+	tk? ( dev-lang/tk )
+	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
+	virtual/tetex"				# pdflatex (see Bug # 157903)
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex )
+	>=app-text/texi2html-1.64
+	>=sys-devel/autoconf-2.52"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ../gcl_${PV}-${DEB_PV}.diff
+	epatch "${FILESDIR}"/flex-configure-LANG.patch
+	sed -ie "s/gcl-doc/${PF}/g" ${S}/info/makefile
+}
+
+src_compile() {
+#	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"
+	if use tk; then
+		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
+	fi
+	myconfig="${myconfig}
+		--enable-locbfd
+		--disable-dynsysbfd
+		--disable-statsysbfd
+		--enable-dynsysgmp
+		$(use_enable readline readline)
+		$(use_with X x)
+		$(use_enable debug debug)
+		$(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}
+	make || die "make failed"
+	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
+}
+
+src_install() {
+#	export SANDBOX_ON=0
+	make DESTDIR="${D}" install || die "make install failed"
+
+	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
+
+	doman gcl.1
+	doinfo info/*.info*
+
+	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
+}