Changed app-text/tetex to virtual/tetex. Added emacs IUSE flag.

5 files changed, 105 insertions, 72 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index edc0790ebd65..648b0f2e3c05 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.12 2003/07/14 01:17:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.13 2003/10/11 13:21:01 usata Exp $
 
 *gcl-2.5.3 (13 Jul 2003)
 
+  11 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> gcl-2.5.2.ebuild,
+  gcl-2.5.3.ebuild:
+  Changed app-text/tetex to virtual/tetex. Added emacs IUSE flag.
+
   13 Jul 2003; George Shapovalov <george@gentoo.org> gcl-2.5.3.ebuild :
   new version (# 23471)
   
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 4cb105632491..db776a3f7a2e 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,8 +1,9 @@
-MD5 5d64659b4afbcc70f9a19dd6b8a06983 ChangeLog 2133
+MD5 4cab96d7c1f8c872bcc29849fba3f4d9 ChangeLog 2286
 MD5 9f93de011d0082d1b4b6a2994133fe9f gcl-2.4.0.ebuild 1358
 MD5 a1e8e397da8995b1fa413ff36f48e486 gcl-2.4.3.ebuild 2140
-MD5 48ed2d24912e502b5952e6828e943b66 gcl-2.5.2.ebuild 1877
-MD5 2bf08055b1b1403ef2caaec6c862db50 gcl-2.5.3.ebuild 1845
+MD5 35ae5e016b1b7ffdc4ca2b95613b851c gcl-2.5.2.ebuild 1605
+MD5 556bebf85d0d3a33adff3396a42dab3c gcl-2.5.3.ebuild 1606
+MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
 MD5 ebf9ac3ed9129b8c967416164e1b8dcf files/digest-gcl-2.4.0 59
 MD5 156148113705b926d9ef1c4bf5611c80 files/digest-gcl-2.4.3 59
 MD5 0a7011ac48a39981a19619ec9f53e37d files/digest-gcl-2.5.2 62
diff --git a/dev-lisp/gcl/gcl-2.5.2.ebuild b/dev-lisp/gcl/gcl-2.5.2.ebuild
index 4463991f7012..c854eb5e3b07 100644
--- a/dev-lisp/gcl/gcl-2.5.2.ebuild
+++ b/dev-lisp/gcl/gcl-2.5.2.ebuild
@@ -1,68 +1,77 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.5.2.ebuild,v 1.4 2003/07/12 09:37:51 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.5.2.ebuild,v 1.5 2003/10/11 13:21:01 usata Exp $
 
-IUSE=""
+inherit elisp-common
+
+IUSE="emacs"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Common Lisp"
-SRC_URI="ftp://ftp.gnu.org/gnu/gcl/gcl-${PV}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
 PROVIDE="virtual/commonlisp"
 
 DEPEND=">=app-text/texi2html-1.64
 	>=dev-libs/gmp-4.1
-	app-text/tetex"
+	virtual/tetex"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-src_compile() {
+src_unpack() {
 
-	cd ${S} ;  echo `pwd`
-	./configure --disable-statsysbfd --enable-locbfd --prefix=/usr || die
+	unpack ${A}
+	sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile
+	mv ${T}/makefile ${S}/info/makefile
+}
 
-	cd ${S}
-	make || die
+src_compile() {
 
+	econf --enable-locbfd \
+		--disable-statsysbfd \
+		--enable-readline \
+		--enable-infodir=/usr/share/info \
+		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
+		|| die
+	make || die
 }
 
 src_install() {
 
-	dodir /usr/share/info
-	dodir /usr/share/emacs/site-lisp/gcl
-
-	make install prefix=${D}/usr MANDIR=${D}/usr/share/man \
-		INFO_DIR=${D}/usr/share/info EMACS_SITE_LISP=${D}/usr/share/emacs/site-lisp/gcl \
-		EMACS_DEFAULT_EL=${D}/usr/share/emacs/site-lisp/gcl/default.el \
-		|| die
-
-	rm -f ${D}/usr/share/infodir
+	make DESTDIR=${D} install || die
 
-	mv ${D}/usr/lib/${P}/info/* ${D}/usr/share/info
-	rmdir ${D}/usr/lib/${P}/info/
-	rm ${D}/usr/share/emacs/site-lisp/gcl/default.el
+	rm -rf ${D}/usr/lib/${P}/info
 
-	mv ${D}/usr/bin/gcl ${D}/usr/bin/gcl.orig
-	sed -e "s:${D}::g" < ${D}/usr/bin/gcl.orig > ${D}/usr/bin/gcl
-	rm ${D}/usr/bin/gcl.orig
+	if [ -n "`use emacs`" ] ; then
+		mv elisp/add-default.el ${T}/50gcl-gentoo.el
+		elisp-site-file-install ${T}/50gcl-gentoo.el
+		elisp-install ${PN} elisp/*
+	fi
 
-	# fix the GCL_TK_DIR=/var/tmp/portage/gcl-2.4.3/image//
-	mv ${D}/usr/lib/${P}/gcl-tk/gcltksrv ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig
-	sed -e "s:${D}::g" < ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig > ${D}/usr/lib/${P}/gcl-tk/gcltksrv
-	rm ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig
-	chmod 0755 ${D}/usr/lib/${P}/gcl-tk/gcltksrv
+	dosed /usr/bin/gcl
+	fperms 0755 /usr/bin/gcl
 
-	chmod 0755 ${D}/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
+	#rm ${D}/usr/bin/gcl.exe
 	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
 
-	#move docs to proper place
-	cd ${S}
-	dodoc readme* RELEASE* doc/*
-	mv ${D}/usr/share/info../doc/gcl-doc/* ${D}/usr/share/doc/${PF}
-	rm -rf ${D}/usr/share/info../
+	dodoc readme* RELEASE* ChangeLog* doc/*
+}
+
+pkg_postinst() {
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+
+	use emacs && elisp-site-regen
 }
diff --git a/dev-lisp/gcl/gcl-2.5.3.ebuild b/dev-lisp/gcl/gcl-2.5.3.ebuild
index b4b99e52c956..0bf3f0eebe44 100644
--- a/dev-lisp/gcl/gcl-2.5.3.ebuild
+++ b/dev-lisp/gcl/gcl-2.5.3.ebuild
@@ -1,63 +1,77 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.5.3.ebuild,v 1.1 2003/07/14 01:17:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.5.3.ebuild,v 1.2 2003/10/11 13:21:01 usata Exp $
 
-IUSE=""
+inherit elisp-common
+
+IUSE="emacs"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Common Lisp"
-SRC_URI="ftp://ftp.gnu.org/gnu/gcl/gcl-${PV}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
 PROVIDE="virtual/commonlisp"
 
 DEPEND=">=app-text/texi2html-1.64
 	>=dev-libs/gmp-4.1
-	app-text/tetex"
+	virtual/tetex"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
+src_unpack() {
+
+	unpack ${A}
+	sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile
+	mv ${T}/makefile ${S}/info/makefile
+}
+
 src_compile() {
-	./configure --disable-statsysbfd --enable-locbfd --prefix=/usr || die
+
+	econf --enable-locbfd \
+		--disable-statsysbfd \
+		--enable-readline \
+		--enable-infodir=/usr/share/info \
+		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
+		|| die
 	make || die
 }
 
 src_install() {
 
-	dodir /usr/share/info
-	dodir /usr/share/emacs/site-lisp/gcl
-
-	make install prefix=${D}/usr MANDIR=${D}/usr/share/man \
-		INFO_DIR=${D}/usr/share/info EMACS_SITE_LISP=${D}/usr/share/emacs/site-lisp/gcl \
-		EMACS_DEFAULT_EL=${D}/usr/share/emacs/site-lisp/gcl/default.el \
-		|| die
+	make DESTDIR=${D} install || die
 
-	rm -f ${D}/usr/share/infodir
+	rm -rf ${D}/usr/lib/${P}/info
 
-	mv ${D}/usr/lib/${P}/info/* ${D}/usr/share/info
-	rmdir ${D}/usr/lib/${P}/info/
-	rm ${D}/usr/share/emacs/site-lisp/gcl/default.el
+	if [ -n "`use emacs`" ] ; then
+		mv elisp/add-default.el ${T}/50gcl-gentoo.el
+		elisp-site-file-install ${T}/50gcl-gentoo.el
+		elisp-install ${PN} elisp/*
+	fi
 
-	mv ${D}/usr/bin/gcl ${D}/usr/bin/gcl.orig
-	sed -e "s:${D}::g" < ${D}/usr/bin/gcl.orig > ${D}/usr/bin/gcl
-	rm ${D}/usr/bin/gcl.orig
+	dosed /usr/bin/gcl
+	fperms 0755 /usr/bin/gcl
 
-	# fix the GCL_TK_DIR=/var/tmp/portage/gcl-2.4.3/image//
-	mv ${D}/usr/lib/${P}/gcl-tk/gcltksrv ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig
-	sed -e "s:${D}::g" < ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig > ${D}/usr/lib/${P}/gcl-tk/gcltksrv
-	rm ${D}/usr/lib/${P}/gcl-tk/gcltksrv.orig
-	chmod 0755 ${D}/usr/lib/${P}/gcl-tk/gcltksrv
-
-	chmod 0755 ${D}/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
+	#rm ${D}/usr/bin/gcl.exe
 	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
 
-	#move docs to proper place
-	cd ${S}
-	dodoc readme* RELEASE* doc/*
-	mv ${D}/usr/share/info../doc/gcl-doc/* ${D}/usr/share/doc/${PF}
-	rm -rf ${D}/usr/share/info../
+	dodoc readme* RELEASE* ChangeLog* doc/*
+}
+
+pkg_postinst() {
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+
+	use emacs && elisp-site-regen
 }
diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml
new file mode 100644
index 000000000000..f418045b09c8
--- /dev/null
+++ b/dev-lisp/gcl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>common-lisp</herd>
+</pkgmetadata>