Install Info file also for USE=-doc; don't install ChangeLog twice.

Package-Manager: portage-2.1.3.15

4 files changed, 36 insertions, 25 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index 7c229bc9f635..64001d89547c 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/slime
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.48 2007/09/20 19:51:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.49 2007/10/21 22:13:21 ulm Exp $
+
+*slime-2.0_p20070816-r1 (21 Oct 2007)
+
+  21 Oct 2007; Ulrich Mueller <ulm@gentoo.org> -slime-2.0_p20070816.ebuild,
+  +slime-2.0_p20070816-r1.ebuild:
+  Install Info file also for USE=-doc; don't install ChangeLog twice.
+  sys-apps/texinfo removed from DEPEND. Explicitly inherit eutils.
 
   20 Sep 2007; Ulrich Mueller <ulm@gentoo.org> +files/71slime-gentoo.el,
   slime-2.0_p20070816.ebuild:
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 4098503a258a..7d2c0179bbbb 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -35,14 +35,14 @@ EBUILD slime-2.0_p20061118.ebuild 1001 RMD160 45d365f7c125ec33c6c72d8501b3173e67
 MD5 38044777e36c545564b529578eca8ba2 slime-2.0_p20061118.ebuild 1001
 RMD160 45d365f7c125ec33c6c72d8501b3173e670a9a6f slime-2.0_p20061118.ebuild 1001
 SHA256 5d8a785f1bc556bb49553871c120a6f2c9ef52f7204a65508e3ad3abca54fbac slime-2.0_p20061118.ebuild 1001
-EBUILD slime-2.0_p20070816.ebuild 1563 RMD160 53f1020c9009c7b7dad4cfdd462502914c295ceb SHA1 42fba70e6737c4dad1a96ef357f95ad051391912 SHA256 ae17340bd59de2fe34179cff4e5345964c38facbb588a38a64bb83ffc85fbe8b
-MD5 ae1372c61ac01042539a7bca840398d7 slime-2.0_p20070816.ebuild 1563
-RMD160 53f1020c9009c7b7dad4cfdd462502914c295ceb slime-2.0_p20070816.ebuild 1563
-SHA256 ae17340bd59de2fe34179cff4e5345964c38facbb588a38a64bb83ffc85fbe8b slime-2.0_p20070816.ebuild 1563
-MISC ChangeLog 11645 RMD160 e351bcde6e2d906544d8d8600a418ad29b24715a SHA1 0c1fa07a4dbbc7dc822a83f5b3386643d8a96404 SHA256 9bce5245cfbffe915e4efdb45c1d8bbc797136500c1fa95161730dd7aef0c0e7
-MD5 8d12e6d746fa2e6161a5fc35f12fef6c ChangeLog 11645
-RMD160 e351bcde6e2d906544d8d8600a418ad29b24715a ChangeLog 11645
-SHA256 9bce5245cfbffe915e4efdb45c1d8bbc797136500c1fa95161730dd7aef0c0e7 ChangeLog 11645
+EBUILD slime-2.0_p20070816-r1.ebuild 1672 RMD160 23792fb38d937b8d20ee7d5201d2af653aeb2a87 SHA1 68641051e4514a2ee619f840686fdd093f842e03 SHA256 1c65fa2b7c5285f7fecb07ecc7bf3901b186851a09711b4a9cd7cf63d51b6acf
+MD5 1948a8c97e9f1370b2d4637ea4fbc87d slime-2.0_p20070816-r1.ebuild 1672
+RMD160 23792fb38d937b8d20ee7d5201d2af653aeb2a87 slime-2.0_p20070816-r1.ebuild 1672
+SHA256 1c65fa2b7c5285f7fecb07ecc7bf3901b186851a09711b4a9cd7cf63d51b6acf slime-2.0_p20070816-r1.ebuild 1672
+MISC ChangeLog 11932 RMD160 a4e67bf8d8c7c15bba3071af184a49d26d63dbaf SHA1 1d40a42b90f5e64334dbe5e9191418b3d3ea56a8 SHA256 97612fe8dc3b750e78e1314682f8a3558f6a5d207e6ac1350a92f99577ae06fe
+MD5 3feb715caa49ceb9464002f60ab81ddd ChangeLog 11932
+RMD160 a4e67bf8d8c7c15bba3071af184a49d26d63dbaf ChangeLog 11932
+SHA256 97612fe8dc3b750e78e1314682f8a3558f6a5d207e6ac1350a92f99577ae06fe ChangeLog 11932
 MISC metadata.xml 1267 RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 SHA1 f91c564e0b518ab158b57faf23d419c144a5898d SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172
 MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
 RMD160 c7f206f44fcd561788623b4ec596f6e82de74948 metadata.xml 1267
@@ -50,13 +50,13 @@ SHA256 d516dcbafdb0818785833d3a07fe626e74f67cde6f9999e9120b61ec0ae8f172 metadata
 MD5 d4c88a5aa01bbe8cb38be02b8877ca72 files/digest-slime-2.0_p20061118 262
 RMD160 5ce1f606906c0c0e742e6a9ae9e7e1c3d11aed8a files/digest-slime-2.0_p20061118 262
 SHA256 a8c64d64b54ed6f0f145b25765b715df44135cff44f3092b93ab6a40d4759f1c files/digest-slime-2.0_p20061118 262
-MD5 0bf86d2b298b3aad6e08780a1689d150 files/digest-slime-2.0_p20070816 262
-RMD160 c875ddf10852a65deb5ac790db65cb648f3e846b files/digest-slime-2.0_p20070816 262
-SHA256 e2507864e142e3acda4b1fe1f3b48c9310b2b0a411673f55011a428a8a8f3c50 files/digest-slime-2.0_p20070816 262
+MD5 0bf86d2b298b3aad6e08780a1689d150 files/digest-slime-2.0_p20070816-r1 262
+RMD160 c875ddf10852a65deb5ac790db65cb648f3e846b files/digest-slime-2.0_p20070816-r1 262
+SHA256 e2507864e142e3acda4b1fe1f3b48c9310b2b0a411673f55011a428a8a8f3c50 files/digest-slime-2.0_p20070816-r1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD4DBQFG8s84Oeoy/oIi7uwRAljuAJdwGl4m3jOPOzWW6rg7tkujXvbLAKDJlPuM
-uSbTH2bc5ujY0MbGgcIIvQ==
-=ZA7L
+iD8DBQFHG88TOeoy/oIi7uwRAtOAAJ91vsDFBeikT8XffVitD5sbavnNswCgpgHl
+1EdziihSfIybOHyb0xAGh1k=
+=8di7
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/slime/files/digest-slime-2.0_p20070816 b/app-emacs/slime/files/digest-slime-2.0_p20070816-r1
index 2e40c1cd6350..2e40c1cd6350 100644
--- a/app-emacs/slime/files/digest-slime-2.0_p20070816
+++ b/app-emacs/slime/files/digest-slime-2.0_p20070816-r1
diff --git a/app-emacs/slime/slime-2.0_p20070816.ebuild b/app-emacs/slime/slime-2.0_p20070816-r1.ebuild
index fb00b63589c1..9a57d90f4af5 100644
--- a/app-emacs/slime/slime-2.0_p20070816.ebuild
+++ b/app-emacs/slime/slime-2.0_p20070816-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816.ebuild,v 1.2 2007/09/20 19:51:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816-r1.ebuild,v 1.1 2007/10/21 22:13:21 ulm Exp $
 
-inherit common-lisp elisp
+inherit common-lisp elisp eutils
 
 DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
 HOMEPAGE="http://common-lisp.net/project/slime/"
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
-DEPEND="virtual/commonlisp
-	doc? ( virtual/tetex sys-apps/texinfo )"
+RDEPEND="virtual/commonlisp"
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex )"
 
 CLPACKAGE=swank
 SWANK_VERSION="2007-08-16"
@@ -29,24 +30,27 @@ src_unpack() {
 }
 
 src_compile() {
-	elisp-comp *.el || die "Cannot compile Elisp files"
-	use doc && make -C doc all slime.pdf
+	elisp-comp *.el || die "elisp-comp failed"
+	emake -C doc slime.info || die "emake slime.info failed"
+	if use doc; then
+		emake -C doc all || die "emake doc failed"
+	fi
 }
 
 src_install() {
-	elisp-install ${PN} *.el{,c} ChangeLog "${FILESDIR}"/swank-loader.lisp \
+	elisp-install ${PN} *.el{,c} "${FILESDIR}"/swank-loader.lisp \
 		|| die "Cannot install SLIME core"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
 	insinto "${CLSOURCEROOT}"/swank
 	doins *.lisp "${FILESDIR}"/swank.asd
 	dodir "${CLSYSTEMROOT}"
 	dosym "${CLSOURCEROOT}"/swank/swank.asd "${CLSYSTEMROOT}"
 	dosym "${SITELISP}"/${PN}/swank-version.el "${CLSOURCEROOT}"/swank
 
-	# install docs
 	dodoc README* ChangeLog HACKING NEWS PROBLEMS || die "dodoc failed"
+	doinfo doc/slime.info
 	if use doc; then
 		dodoc doc/slime.{ps,pdf} || die "dodoc failed"
-		doinfo doc/slime.info
 	fi
 }