fix bug 184619

Package-Manager: portage-2.1.3_rc7

8 files changed, 32 insertions, 153 deletions

diff --git a/dev-lisp/cl-mcclim/ChangeLog b/dev-lisp/cl-mcclim/ChangeLog
index 6e101b188527..66afc1d64702 100644
--- a/dev-lisp/cl-mcclim/ChangeLog
+++ b/dev-lisp/cl-mcclim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/cl-mcclim
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/ChangeLog,v 1.14 2007/02/03 17:36:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/ChangeLog,v 1.15 2007/07/11 14:38:17 hkbst Exp $
+
+*cl-mcclim-0.9.2-r1 (11 Jul 2007)
+
+  11 Jul 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/50cl-mcclim-gentoo.el, -files/50mcclim-gentoo.el,
+  -files/0.9.1-mcclim.asd-cmucl.patch, -cl-mcclim-0.9.1.ebuild,
+  -cl-mcclim-0.9.2.ebuild, +cl-mcclim-0.9.2-r1.ebuild:
+  fix bug 184619
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> cl-mcclim-0.9.1.ebuild:
   Use mirror://debian/ where applicable, or use mirror://gentoo/ if the file
diff --git a/dev-lisp/cl-mcclim/Manifest b/dev-lisp/cl-mcclim/Manifest
index 033d7d04d759..36d9f2f2f487 100644
--- a/dev-lisp/cl-mcclim/Manifest
+++ b/dev-lisp/cl-mcclim/Manifest
@@ -1,51 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0.9.1-mcclim.asd-cmucl.patch 1018 RMD160 82c363352d05d3599e7e243a8d1c5112bb4aa396 SHA1 71275e794f5ab659f53e36dcf2a71ae48baea783 SHA256 5a74ede38d0bb44be175201afbc04c5b17738df50dca3a6e03450f68a64f0316
-MD5 bc6e14687a93af759c7a8084ae0c892e files/0.9.1-mcclim.asd-cmucl.patch 1018
-RMD160 82c363352d05d3599e7e243a8d1c5112bb4aa396 files/0.9.1-mcclim.asd-cmucl.patch 1018
-SHA256 5a74ede38d0bb44be175201afbc04c5b17738df50dca3a6e03450f68a64f0316 files/0.9.1-mcclim.asd-cmucl.patch 1018
 AUX 0.9.2-mcclim.asd-cmucl.patch 948 RMD160 324cd2369499bbe3bdc8b29b1c5c837f48091944 SHA1 739a04c9c52d61cda2234c1b07481fe6122fba77 SHA256 fb9030d57f41b4eb391d22e6ac11c288138d238a249b90a9077c30ccdee936d9
 MD5 a9aecd2467a8023f602325f7b7d0a506 files/0.9.2-mcclim.asd-cmucl.patch 948
 RMD160 324cd2369499bbe3bdc8b29b1c5c837f48091944 files/0.9.2-mcclim.asd-cmucl.patch 948
 SHA256 fb9030d57f41b4eb391d22e6ac11c288138d238a249b90a9077c30ccdee936d9 files/0.9.2-mcclim.asd-cmucl.patch 948
-AUX 50mcclim-gentoo.el 103 RMD160 de6da6a0c600aa2772881732afa1e2785445201f SHA1 cea30395f186c325fba970c37bfcccb11be5f919 SHA256 c10a53782c4f6b65aeb41f688281e7d0bf27c21496570a00d10a02397d724808
-MD5 6c70574406d341f011851b22c49acb4a files/50mcclim-gentoo.el 103
-RMD160 de6da6a0c600aa2772881732afa1e2785445201f files/50mcclim-gentoo.el 103
-SHA256 c10a53782c4f6b65aeb41f688281e7d0bf27c21496570a00d10a02397d724808 files/50mcclim-gentoo.el 103
+AUX 50cl-mcclim-gentoo.el 103 RMD160 de6da6a0c600aa2772881732afa1e2785445201f SHA1 cea30395f186c325fba970c37bfcccb11be5f919 SHA256 c10a53782c4f6b65aeb41f688281e7d0bf27c21496570a00d10a02397d724808
+MD5 6c70574406d341f011851b22c49acb4a files/50cl-mcclim-gentoo.el 103
+RMD160 de6da6a0c600aa2772881732afa1e2785445201f files/50cl-mcclim-gentoo.el 103
+SHA256 c10a53782c4f6b65aeb41f688281e7d0bf27c21496570a00d10a02397d724808 files/50cl-mcclim-gentoo.el 103
 AUX TODO.Gentoo 247 RMD160 75f696d95badfdcce706aacac8f26fbec0a61e61 SHA1 348eff8792e542af1c39bd0c44671f09690bd6eb SHA256 139b63c0749ed0dfbab033bbd6b0bb4ceeeeef231fcea1c6775d7ff87190d803
 MD5 dab89c877892b4ae1e03e37857442184 files/TODO.Gentoo 247
 RMD160 75f696d95badfdcce706aacac8f26fbec0a61e61 files/TODO.Gentoo 247
 SHA256 139b63c0749ed0dfbab033bbd6b0bb4ceeeeef231fcea1c6775d7ff87190d803 files/TODO.Gentoo 247
-DIST cl-mcclim_0.9.1-1.diff.gz 4548 RMD160 4c1ede0109d4aab4a1cb260e537fcfc992c3775d SHA1 71e94fd3b368de64026cf3c12417c3a5210f48ab SHA256 2b8b2588fc04bb4f6eb49fc39cd4500705dbc6c548755e298c65756560429d31
-DIST cl-mcclim_0.9.1.orig.tar.gz 3000070 RMD160 0b15599610b84f1eaa39c4f69f8285c0b9f40362 SHA1 ed382849e7c4b4bad504fa984a6784a8d8dcf7e7 SHA256 b886578163e8b062022c1f3bc9f5601164380bb29a7e72704f2e37233f6f0667
 DIST mcclim-0.9.2.tar.gz 2215950 RMD160 9cc9189f8daecab29569e913ad0db343bcfbace9 SHA1 8c94b28048914e0abb6dcf61fdd4ff38b484ecbf SHA256 d8ce1eb559803a72acc918c0c6f100096404ceeb4f18bcdbd995f26354747373
-EBUILD cl-mcclim-0.9.1.ebuild 2158 RMD160 fffd8e52a94600a67e481c234ef9e68c48333dca SHA1 f57a4907916757e98c979209b9d17dd4ad59bd47 SHA256 60461014d18e413e63ce8dde291a3d6cee0cf8ce1a8e58693474673eb7574fbd
-MD5 40b2ecb672297d4cd1de57026201e4a6 cl-mcclim-0.9.1.ebuild 2158
-RMD160 fffd8e52a94600a67e481c234ef9e68c48333dca cl-mcclim-0.9.1.ebuild 2158
-SHA256 60461014d18e413e63ce8dde291a3d6cee0cf8ce1a8e58693474673eb7574fbd cl-mcclim-0.9.1.ebuild 2158
-EBUILD cl-mcclim-0.9.2.ebuild 2044 RMD160 957e5ab1461d401497e6b9dca797cb8b777ca8d8 SHA1 7fd0e9d328ac6896ed6e341394fefa822f2d7f15 SHA256 72a9be61bf66f7715535126a27c89bc87e2442f7d4ed6cb8a928249c964e2609
-MD5 66acd6689a65435bc50c9fd31acbcecb cl-mcclim-0.9.2.ebuild 2044
-RMD160 957e5ab1461d401497e6b9dca797cb8b777ca8d8 cl-mcclim-0.9.2.ebuild 2044
-SHA256 72a9be61bf66f7715535126a27c89bc87e2442f7d4ed6cb8a928249c964e2609 cl-mcclim-0.9.2.ebuild 2044
-MISC ChangeLog 3015 RMD160 8fa61474b716a1c83157cd0b61068fbb3c36a214 SHA1 7f5be93c92c8b1798e2148bfec603181c883b350 SHA256 c736b13aea12dccb27b8db65c5e7e13bc40bcfbd656a31caba85a2a307e03a32
-MD5 bd5af7d3f1cae7694f450177190bb604 ChangeLog 3015
-RMD160 8fa61474b716a1c83157cd0b61068fbb3c36a214 ChangeLog 3015
-SHA256 c736b13aea12dccb27b8db65c5e7e13bc40bcfbd656a31caba85a2a307e03a32 ChangeLog 3015
+EBUILD cl-mcclim-0.9.2-r1.ebuild 2118 RMD160 db5271330a5a9e16f0f190aafca274624eb99397 SHA1 ee257a6c0aac2ea49ef0c198e22e5dd2e6f48c36 SHA256 29b332288257276d9f398c25501266d019456f5610a8710828585e394cbee733
+MD5 bee0826e7a777732ef47a985753e8963 cl-mcclim-0.9.2-r1.ebuild 2118
+RMD160 db5271330a5a9e16f0f190aafca274624eb99397 cl-mcclim-0.9.2-r1.ebuild 2118
+SHA256 29b332288257276d9f398c25501266d019456f5610a8710828585e394cbee733 cl-mcclim-0.9.2-r1.ebuild 2118
+MISC ChangeLog 3292 RMD160 72b7b18070c6c46761817ec5514640ab3e7d1e12 SHA1 9ad948cc41733597e7bb0dc5edb15ea9922b7a87 SHA256 750015cf7de2a474026be3197cd5958e245d34f2689d8ae03ebac554611e6971
+MD5 eb07f97a50f0307a37bdebf2b2171e7e ChangeLog 3292
+RMD160 72b7b18070c6c46761817ec5514640ab3e7d1e12 ChangeLog 3292
+SHA256 750015cf7de2a474026be3197cd5958e245d34f2689d8ae03ebac554611e6971 ChangeLog 3292
 MISC metadata.xml 1191 RMD160 ec04b27d9f90305f90defe0b334962a6edbce274 SHA1 f5c16835620da15b3fd74807245d582f332268a5 SHA256 a80198bd113aa700ccbadb64cbcd45dc80603cd10d7a6df0753ac645a63630fc
 MD5 c8d8979589a5ef6d1310a74961af2636 metadata.xml 1191
 RMD160 ec04b27d9f90305f90defe0b334962a6edbce274 metadata.xml 1191
 SHA256 a80198bd113aa700ccbadb64cbcd45dc80603cd10d7a6df0753ac645a63630fc metadata.xml 1191
-MD5 9f93a13125f5857d139a139626d7c8d9 files/digest-cl-mcclim-0.9.1 515
-RMD160 2efdd69cd38831c20e3da3f12a19c25cd96482e9 files/digest-cl-mcclim-0.9.1 515
-SHA256 4f8660240ae1ed0ad5c59cec55f37682726deb8973651fe774e8602975940875 files/digest-cl-mcclim-0.9.1 515
-MD5 c3d509c4e0eafb6422f8568b6e6b4957 files/digest-cl-mcclim-0.9.2 241
-RMD160 58d83de5a47af9e579a544119ebb39796911f034 files/digest-cl-mcclim-0.9.2 241
-SHA256 fdf842235bdb9fbdacfd86839c00dbdd80dba72c6d587e8bd27fd391db87a4d7 files/digest-cl-mcclim-0.9.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxMggAiZjviIA2XgRAiMqAKCIM6rh/Vm0vYZT4vGDbg0cxU/17QCfeCoD
-nzhl6J04qBhwKMaPpyiGHJk=
-=b0Go
------END PGP SIGNATURE-----
+MD5 c3d509c4e0eafb6422f8568b6e6b4957 files/digest-cl-mcclim-0.9.2-r1 241
+RMD160 58d83de5a47af9e579a544119ebb39796911f034 files/digest-cl-mcclim-0.9.2-r1 241
+SHA256 fdf842235bdb9fbdacfd86839c00dbdd80dba72c6d587e8bd27fd391db87a4d7 files/digest-cl-mcclim-0.9.2-r1 241
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild
deleted file mode 100644
index d0717b278a07..000000000000
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild,v 1.6 2007/02/03 17:36:24 flameeyes Exp $
-
-inherit common-lisp elisp eutils
-
-DEB_PV=1
-
-DESCRIPTION="McCLIM is a free software implementation of CLIM."
-HOMEPAGE="http://clim.mikemac.com/
-	http://clim.mikemac.com/spec/clim.html
-	http://packages.debian.org/unstable/devel/cl-mcclim
-	http://clim.mikemac.com/spec/clim.html"
-SRC_URI="mirror://debian/pool/main/c/cl-mcclim/cl-mcclim_${PV}.orig.tar.gz
-	mirror://debian/pool/main/c/cl-mcclim/cl-mcclim_${PV}-${DEB_PV}.diff.gz"
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="emacs doc"
-
-DEPEND="dev-lisp/common-lisp-controller
-	dev-lisp/cl-clx
-	doc? ( media-gfx/transfig
-		media-libs/netpbm
-		virtual/tetex )
-	emacs? ( virtual/emacs )"
-
-CLPACKAGE="mcclim"
-# CLPACKAGE="mcclim clim-examples"
-SITEFILE=${FILESDIR}/50mcclim-gentoo.el
-ELISP_SOURCES="Tools/Emacs/indent-clim.el"
-
-S=${WORKDIR}/${P}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cl-mcclim_${PV}-${DEB_PV}.diff || die
-	epatch ${FILESDIR}/${PV}-mcclim.asd-cmucl.patch || die
-}
-
-src_compile() {
-	use doc && make -C Doc manual.ps
-	use emacs && cp ${ELISP_SOURCES} . && elisp-compile *.el
-}
-
-src_install() {
-	dodir ${CLSYSTEMROOT}
-	insinto ${CLSOURCEROOT}/mcclim/
-	doins -r *.{lisp,asd} \
-		Backends Experimental Goatee Lisp-Dep Looks Examples \
-		debian/clim-examples.asd
-	dosym ${CLSOURCEROOT}/mcclim/mcclim.asd \
-		${CLSYSTEMROOT}/mcclim.asd
-	dosym ${CLSOURCEROOT}/mcclim/mcclim-examples.asd \
-		${CLSYSTEMROOT}/mcclim-examples.asd
-	for system in clim clim-clx clim-clx-user clim-looks; do
-		dosym ${CLSYSTEMROOT}/mcclim.asd ${CLSYSTEMROOT}/${system}.asd
-	done
-	dodoc debian/README* INSTALL* README TODO Copyright ReleaseNotes/* Webpage/clim-paper.pdf
-	use doc && dodoc Doc/manual.ps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/${PN}
-		doins *.el *.elc
-		elisp-site-file-install ${SITEFILE}
-	fi
-	do-debian-credits
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
-	common-lisp_pkg_postinst
-}
-
-pkg_postrm() {
-	elisp_pkg_postinst
-	common-lisp_pkg_postrm
-}
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.2.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.2-r1.ebuild
index a524cf8a5ea5..59a778f590ae 100644
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.2.ebuild
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.2.ebuild,v 1.3 2006/11/29 03:06:46 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.2-r1.ebuild,v 1.1 2007/07/11 14:38:17 hkbst Exp $
 
-inherit common-lisp elisp eutils
+inherit common-lisp elisp-common eutils
 
 DESCRIPTION="McCLIM is a free software implementation of CLIM."
 HOMEPAGE="http://clim.mikemac.com/
@@ -21,7 +21,7 @@ DEPEND="dev-lisp/cl-spatial-trees
 	emacs? ( virtual/emacs )"
 
 CLPACKAGE="mcclim"
-SITEFILE=${FILESDIR}/50mcclim-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 ELISP_SOURCES="Tools/Emacs/indent-clim.el"
 
 S=${WORKDIR}/${P#cl-}
@@ -56,17 +56,17 @@ src_install() {
 	use doc && dodoc Doc/manual.ps
 	if use emacs; then
 		insinto /usr/share/emacs/site-lisp/${PN}
-		doins *.el *.elc
-		elisp-site-file-install ${SITEFILE}
+		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }
 
 pkg_postinst() {
-	elisp_pkg_postinst
+	use emacs && elisp-site-regen
 	common-lisp_pkg_postinst
 }
 
 pkg_postrm() {
-	elisp_pkg_postinst
+	use emacs && elisp-site-regen
 	common-lisp_pkg_postrm
 }
diff --git a/dev-lisp/cl-mcclim/files/0.9.1-mcclim.asd-cmucl.patch b/dev-lisp/cl-mcclim/files/0.9.1-mcclim.asd-cmucl.patch
deleted file mode 100644
index 4a625c7ba6fa..000000000000
--- a/dev-lisp/cl-mcclim/files/0.9.1-mcclim.asd-cmucl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur cl-mcclim-0.9.1.orig.orig/mcclim.asd cl-mcclim-0.9.1.orig/mcclim.asd
---- cl-mcclim-0.9.1.orig.orig/mcclim.asd	2005-04-11 01:45:44.000000000 -0500
-+++ cl-mcclim-0.9.1.orig/mcclim.asd	2005-04-11 01:46:54.000000000 -0500
-@@ -35,16 +35,8 @@
- ;;; Legacy CMUCL support stuff
- #+cmu
- (progn
--  (unless (fboundp 'ext:stream-read-char)
--    (unless (ignore-errors (ext:search-list "gray-streams:"))
--      (setf (ext:search-list "gray-streams:")
--	'("target:pcl/" "library:subsystems/")))
--    (if (fboundp 'extensions:without-package-locks)
--	(extensions:without-package-locks
--	 (load "gray-streams:gray-streams-library"))
--      (load "gray-streams:gray-streams-library")))
--  #-clx
--  (require :clx)
-+  (asdf:oos 'asdf:load-op :cmucl-graystream)
-+  (asdf:oos 'asdf:load-op :cmucl-clx)
-   #+mp (when (eq mp::*initial-process* mp::*current-process*)
- 	 (format t "~%~%You need to run (mp::startup-idle-and-top-level-loops) to start up the multiprocessing support.~%~%")))
- 
-Only in cl-mcclim-0.9.1.orig: mcclim.asd~
diff --git a/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el b/dev-lisp/cl-mcclim/files/50cl-mcclim-gentoo.el
index 9dd1491042ac..9dd1491042ac 100644
--- a/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el
+++ b/dev-lisp/cl-mcclim/files/50cl-mcclim-gentoo.el
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1
deleted file mode 100644
index 1fabeb2c99bf..000000000000
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5637edc98b38d38b1279ec473c3edfdf cl-mcclim_0.9.1-1.diff.gz 4548
-RMD160 4c1ede0109d4aab4a1cb260e537fcfc992c3775d cl-mcclim_0.9.1-1.diff.gz 4548
-SHA256 2b8b2588fc04bb4f6eb49fc39cd4500705dbc6c548755e298c65756560429d31 cl-mcclim_0.9.1-1.diff.gz 4548
-MD5 400de75e688f540d6a5a0b9dcbe515bc cl-mcclim_0.9.1.orig.tar.gz 3000070
-RMD160 0b15599610b84f1eaa39c4f69f8285c0b9f40362 cl-mcclim_0.9.1.orig.tar.gz 3000070
-SHA256 b886578163e8b062022c1f3bc9f5601164380bb29a7e72704f2e37233f6f0667 cl-mcclim_0.9.1.orig.tar.gz 3000070
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.2 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.2-r1
index 2159386a964c..2159386a964c 100644
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.2
+++ b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.2-r1