Sync up with Debian versioning; Remove extraneous USE flags.

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 142 insertions, 9 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index faf0040bda66..1405a6d594cc 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.39 2006/11/29 15:42:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.40 2006/12/09 21:53:12 mkennedy Exp $
+
+*gcl-2.6.7-r2 (09 Dec 2006)
+
+  09 Dec 2006; Matthew Kennedy <mkennedy@gentoo.org> +gcl-2.6.7-r2.ebuild:
+  Sync up with Debian versioning; Remove extraneous USE flags.
 
   29 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gcl-2.6.7.ebuild,
   gcl-2.6.7-r1.ebuild:
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index fc6f1ea7db8c..c8d6921a364c 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -9,19 +9,26 @@ AUX flex-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd8
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
-DIST gcl-2.6.7.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06
+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.orig.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA1 d54f7db5dbd9f49953f80259a5eb44ade65027b5 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06
 EBUILD gcl-2.6.7-r1.ebuild 4224 RMD160 59d19e62c92cce27043b94275a0b0268194b074e SHA1 36ee404cff9c59eb54cff7de381cb7e363e88eab SHA256 6706c2dcc42655f10093f5b5d88efe5811ef276b9520b9c1724ce5fd38921d57
 MD5 b540ed5100018e4afc13b8fb3f03bd32 gcl-2.6.7-r1.ebuild 4224
 RMD160 59d19e62c92cce27043b94275a0b0268194b074e gcl-2.6.7-r1.ebuild 4224
 SHA256 6706c2dcc42655f10093f5b5d88efe5811ef276b9520b9c1724ce5fd38921d57 gcl-2.6.7-r1.ebuild 4224
+EBUILD gcl-2.6.7-r2.ebuild 2806 RMD160 9abc30094df80a218f9a0bba7e5428d17685927a SHA1 c8603c650a5d777ea10c335e52eaf7f1c1e93efa SHA256 a52dbf7c102720ba520101c3f4663a5cb1c075d3327ae14fa034f3d75161d97c
+MD5 5bf31b90d41126317ab2013d794b1787 gcl-2.6.7-r2.ebuild 2806
+RMD160 9abc30094df80a218f9a0bba7e5428d17685927a gcl-2.6.7-r2.ebuild 2806
+SHA256 a52dbf7c102720ba520101c3f4663a5cb1c075d3327ae14fa034f3d75161d97c gcl-2.6.7-r2.ebuild 2806
 EBUILD gcl-2.6.7.ebuild 4095 RMD160 f0a4008ef369ee5ff953d127c4d023f0cdcecbef SHA1 7dd94742b5068c22ff6d030a1e4b0b5cc7c5b619 SHA256 d7be7fe3c56f358ff3e8e3314998f7e066fd742eab609376f0702397fcde75e2
 MD5 f3ca5f54e32181066828b97f5880348c gcl-2.6.7.ebuild 4095
 RMD160 f0a4008ef369ee5ff953d127c4d023f0cdcecbef gcl-2.6.7.ebuild 4095
 SHA256 d7be7fe3c56f358ff3e8e3314998f7e066fd742eab609376f0702397fcde75e2 gcl-2.6.7.ebuild 4095
-MISC ChangeLog 6017 RMD160 e7c252e287a9a4828355288f958b17c23b4ac969 SHA1 63df7f2267417ed73dc647c7c15f31e245a00f94 SHA256 6a8c76a514058b935dfc283e42f50d86e5f30a01e3e40a4de55583a6c3e52ce8
-MD5 f92687cb9335c2d6aeed7c50abe1fad6 ChangeLog 6017
-RMD160 e7c252e287a9a4828355288f958b17c23b4ac969 ChangeLog 6017
-SHA256 6a8c76a514058b935dfc283e42f50d86e5f30a01e3e40a4de55583a6c3e52ce8 ChangeLog 6017
+MISC ChangeLog 6188 RMD160 379fa0e0ec320d6a106bc9272b07f868d8f0bd2f SHA1 b7bb885160891d8ec19a541bb5dec2928b3ad075 SHA256 8e53b86639f4f356e9fb301077788df8691539edc1e2282cd5931324d829cdf3
+MD5 b66bc8b28b38833a02667c77baa5e344 ChangeLog 6188
+RMD160 379fa0e0ec320d6a106bc9272b07f868d8f0bd2f ChangeLog 6188
+SHA256 8e53b86639f4f356e9fb301077788df8691539edc1e2282cd5931324d829cdf3 ChangeLog 6188
 MISC metadata.xml 414 RMD160 d8db93b413e6c6b3e82050a0c25ff275d053a59b SHA1 bffc23b117a0eae6f049f3c129ed07970743286a SHA256 35219c038746ff1bd171a390d1f6af4b37115e483ae8fd0d0ca5ead5c71000fc
 MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414
 RMD160 d8db93b413e6c6b3e82050a0c25ff275d053a59b metadata.xml 414
@@ -32,10 +39,13 @@ SHA256 9a02a865320d6c3fbdcd9b5e4c96bec1ee99b2aa27a48ca6f2645f3adaff4b7d files/di
 MD5 58424d28ec2819751d10de59987f5f4d files/digest-gcl-2.6.7-r1 232
 RMD160 84639052b9edbba3577ad5896756d56b006a4d06 files/digest-gcl-2.6.7-r1 232
 SHA256 9a02a865320d6c3fbdcd9b5e4c96bec1ee99b2aa27a48ca6f2645f3adaff4b7d files/digest-gcl-2.6.7-r1 232
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFbaprNQqtfCuFneMRAgPAAJ4xS2rraQTcQD4QN0ukPmvRCEr6hQCfTxv+
-2i4okfjUBdTmATO5B6hAY3A=
-=ZOW3
+iD8DBQFFezCYyiNZaEAZA+ARAtKZAKCCOC/Cf9M2pqoeQKixJjIDnLVNzACcDwa7
+CU8Fw6WIx2kfU+y5L34EIHE=
+=JOf7
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.7-r2 b/dev-lisp/gcl/files/digest-gcl-2.6.7-r2
new file mode 100644
index 000000000000..ba669825cf40
--- /dev/null
+++ b/dev-lisp/gcl/files/digest-gcl-2.6.7-r2
@@ -0,0 +1,9 @@
+MD5 9d16c9987986e1382576e7e7ef384535 gcl.info.tgz 678468
+RMD160 16e1f3ffd080a6801f82612ff66789a3ec9e21a7 gcl.info.tgz 678468
+SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57 gcl.info.tgz 678468
+MD5 ec7061fca245f0f4312a684ce586a6e6 gcl_2.6.7-32.diff.gz 14463119
+RMD160 fe20465f30c968558edddf493780fb401b7c42a8 gcl_2.6.7-32.diff.gz 14463119
+SHA256 5041b40bd96a0c73b70022831e6a697e00b64f572bca66d5a6c24978a879678e gcl_2.6.7-32.diff.gz 14463119
+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-r2.ebuild b/dev-lisp/gcl/gcl-2.6.7-r2.ebuild
new file mode 100644
index 000000000000..fc75f40e4ad1
--- /dev/null
+++ b/dev-lisp/gcl/gcl-2.6.7-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/12/09 21:53:12 mkennedy Exp $
+
+inherit elisp-common flag-o-matic autotools
+
+DEB_PV=32
+
+DESCRIPTION="GNU Common Lisp"
+HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/g/gcl/gcl_${PV}.orig.tar.gz
+	http://ftp.debian.org/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="~x86 ~ppc ~amd64 ~sparc"
+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/x11 ) )"
+
+DEPEND="$RDEPEND
+	doc? ( virtual/tetex )
+	>=app-text/texi2html-1.64
+	>=sys-devel/autoconf-2.52"
+
+src_unpack() {
+	unpack ${A}
+	epatch gcl_${PV}-${DEB_PV}.diff
+	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} || die
+	make || die
+	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
+}
+
+src_install() {
+	export SANDBOX_ON=0
+	make DESTDIR=${D} install || die
+
+	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
+}