Install the Debian man-page; Resolves Bug #126859; Removed old ebuilds; Port to modular X.

Package-Manager: portage-2.1_pre7-r4

7 files changed, 37 insertions, 175 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index e36b042d011a..8478975589f0 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.36 2006/01/27 19:42:18 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.37 2006/04/08 23:37:58 mkennedy Exp $
+
+  08 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org> -gcl-2.6.6.ebuild,
+  gcl-2.6.7.ebuild, gcl-2.6.7-r1.ebuild:
+  Install the Debian man-page; Resolves Bug #126859; Removed old ebuilds; Port
+  to modular X.
 
 *gcl-2.6.7-r1 (27 Jan 2006)
 
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 62acd81315d1..1936be3c89c4 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f007aac13f77ed5f6d26dc3bb1727e72 ChangeLog 5473
+MD5 dc8b7a325283d6a2f95c8f6487dabe23 ChangeLog 5682
+RMD160 59d87db5040bf7dff2d0950599bddf63e8ba7e73 ChangeLog 5682
+SHA256 15d15643ec2cb5341c377d5da3f1643d59a321672449f225946a13b036c64e12 ChangeLog 5682
 MD5 1d2903807a9ecc5ea090f1daebe0f956 files/2.6.7-fix-configure.in-gentoo.patch 1452
-MD5 91930d3515af8406b00bbddaa287b9a3 files/digest-gcl-2.6.6 62
+RMD160 8c072036a83592782e6d4a8329f996bf0591f734 files/2.6.7-fix-configure.in-gentoo.patch 1452
+SHA256 64c31840a4bb3c2484b8556e7f40791b3ffba83dd147a89c44e8838be244711f files/2.6.7-fix-configure.in-gentoo.patch 1452
 MD5 bc36d4fbf49d4faa858862d3551da607 files/digest-gcl-2.6.7 62
-MD5 bc36d4fbf49d4faa858862d3551da607 files/digest-gcl-2.6.7-r1 62
-MD5 8ff2948460c4a0929a03fcdd99283577 gcl-2.6.6.ebuild 3802
-MD5 24870a5ec3fe495b8ef2dd2c402b7345 gcl-2.6.7-r1.ebuild 4113
-MD5 51dda308ace95c7621dea73a9af0935c gcl-2.6.7.ebuild 4032
+RMD160 522e130cd8fbe8d8e65dc233146c5789beda2ea2 files/digest-gcl-2.6.7 62
+SHA256 ee525ecd43ce72bd35eb05ee57ee1ce33e0759297700bd97f80612234f39a37d files/digest-gcl-2.6.7 62
+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 d81dcadc963c99650e7b5cd13e6063f5 gcl-2.6.7-r1.ebuild 4172
+RMD160 ccaf62aca62d2d11013afc4b08a2aaaeebcad923 gcl-2.6.7-r1.ebuild 4172
+SHA256 93bd444896a2785c15c94c21ae93afd353ca7cf5fac46e9e1860f0e99eaa42e1 gcl-2.6.7-r1.ebuild 4172
+MD5 d058f88272d693917b2213194f7dd909 gcl-2.6.7.ebuild 4107
+RMD160 e71bf0eeb2d85b2f3f138350e096104e5fd8f8c8 gcl-2.6.7.ebuild 4107
+SHA256 b557f994ce6f9acbb133dd07360573b9b63e0e034af85e26042a9c711b4fc590 gcl-2.6.7.ebuild 4107
 MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414
+RMD160 d8db93b413e6c6b3e82050a0c25ff275d053a59b metadata.xml 414
+SHA256 35219c038746ff1bd171a390d1f6af4b37115e483ae8fd0d0ca5ead5c71000fc metadata.xml 414
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD2nesyiNZaEAZA+ARAlqQAJ9zO7RZSFmdESAP0NU8cbm+uGYaJwCdGHMQ
-iDURVf30vJ10UypuCXPFSjw=
-=vL9B
+iD8DBQFEOElkyiNZaEAZA+ARAvazAKCApdXoSZhZdJaYq00sbfW2DheKngCeNML0
+DtPweFp6nBnYZIvMtS/hHQ8=
+=1Hk7
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.6 b/dev-lisp/gcl/files/digest-gcl-2.6.6
deleted file mode 100644
index 14dbff3eb30c..000000000000
--- a/dev-lisp/gcl/files/digest-gcl-2.6.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45d67331b29cafc3e9b1eacb488044ec gcl-2.6.6.tar.gz 8186053
diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.7-r1 b/dev-lisp/gcl/files/digest-gcl-2.6.7-r1
index 7c9e5b93be54..def6da0faec9 100644
--- a/dev-lisp/gcl/files/digest-gcl-2.6.7-r1
+++ b/dev-lisp/gcl/files/digest-gcl-2.6.7-r1
@@ -1 +1,3 @@
 MD5 c0f42e1f391162e5ac90912a70e8ecc3 gcl-2.6.7.tar.gz 8193901
+RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 gcl-2.6.7.tar.gz 8193901
+SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 gcl-2.6.7.tar.gz 8193901
diff --git a/dev-lisp/gcl/gcl-2.6.6.ebuild b/dev-lisp/gcl/gcl-2.6.6.ebuild
deleted file mode 100644
index 53c86d9e9d01..000000000000
--- a/dev-lisp/gcl/gcl-2.6.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.6.ebuild,v 1.5 2005/08/22 07:09:57 mkennedy Exp $
-
-inherit elisp-common flag-o-matic
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi"
-
-DEPEND=">=app-text/texi2html-1.64
-	emacs? ( virtual/emacs )
-	X? ( virtual/x11 )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	doc? ( virtual/tetex )
-	tcltk? ( dev-lang/tk )"
-
-src_unpack() {
-	unpack ${A}
-	sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile
-	mv ${T}/makefile ${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"
-
-	# -fomit-frame-pointer cannot be used with gprof
-
-	if use gprof; then
-		filter-flags "-fomit-frame-pointer"
-	fi
-
-	# Unfortunately, we need to override any relocation choices below
-	# while upstream doesn't work with system BFD.	SuSE has the same
-	# problem apparently.
-
-	if false; then
-
-	# Linking options are enumerated at
-	# http://www.gnu.org/software/gcl/RELEASE-2.6.2.html
-
-	local dlopen_config="
-		--disable-custreloc
-		--enable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	local bfd_config="
-		--disable-custreloc
-		--disable-dlopen
-		--enable-dynsysbfd
-		--disable-statsysbfd";
-
-	local custreloc_config="
-		--enable-custreloc
-		--disable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	if use custreloc; then
-		case "${ARCH}" in
-			x86 | sparc)
-				myconfig="${myconfig} ${custreloc_config}";;
-			*)
-				ewarn "--enable-custreloc is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}"
-
-		esac
-	elif use dlopen; then
-		myconfig="${myconfig} ${dlopen_config}"
-	else
-		case "${ARCH}" in
-			x86 | sparc | ppc | amd64 | s390)
-				myconfig="${myconfig} ${bfd_config}";;
-			*)
-				ewarn "BFD is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}";;
-		esac
-	fi
-
-	else
-		myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd"
-	fi
-
-	if use tcltk; then
-		myconfig="${myconfig}
-		--enable-tkconfig=/usr/lib
-		--enable-tclconfig=/usr/lib"
-	fi
-
-	myconfig="${myconfig}
-		--enable-dynsysgmp
-		`use_enable readline readline`
-		`use_with X x`
-		`use_enable debug debug`
-		`use_enable gprof gprof`
-		`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
-}
-
-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/*
-
-	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
-}
diff --git a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
index a7d236b8e2d9..7b83a4038e9f 100644
--- a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2006/01/27 19:42:18 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7-r1.ebuild,v 1.2 2006/04/08 23:37:58 mkennedy Exp $
 
 inherit elisp-common flag-o-matic autotools
 
@@ -123,6 +123,8 @@ src_compile() {
 ${myconfig}"
 	econf ${myconfig} || die
 	make || die
+
+	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
 }
 
 src_install() {
@@ -158,6 +160,8 @@ src_install() {
 		mv $i ${D}/usr/share/doc/${PF}
 	done
 
+	doman gcl.1
+
 	find ${D}/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \;
 }
 
diff --git a/dev-lisp/gcl/gcl-2.6.7.ebuild b/dev-lisp/gcl/gcl-2.6.7.ebuild
index 2fe04f3c5c6d..ed177fa9decb 100644
--- a/dev-lisp/gcl/gcl-2.6.7.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.6 2006/01/12 22:51:19 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7.ebuild,v 1.7 2006/04/08 23:37:58 mkennedy Exp $
 
 inherit elisp-common flag-o-matic autotools
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc amd64 sparc"
 IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi"
 
 RDEPEND="emacs? ( virtual/emacs )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/x11 ) )
 	readline? ( sys-libs/readline )
 	>=dev-libs/gmp-4.1
 	tcltk? ( dev-lang/tk )"