Fix uncorrect file removal, bug #345759

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 17 insertions, 78 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index b69ef173e8e8..4dbaf1241148 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/scheme48
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.13 2010/11/14 16:05:32 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.14 2012/10/28 16:17:22 pacho Exp $
+
+  28 Oct 2012; Pacho Ramos <pacho@gentoo.org> -scheme48-1.8-r1.ebuild,
+  scheme48-1.8-r2.ebuild:
+  Fix uncorrect file removal, bug #345759
 
 *scheme48-1.8-r2 (14 Nov 2010)
 
@@ -69,4 +73,3 @@
   06 Sep 2005; Luis F. Araujo <araujo@gentoo.org>
   +files/50scheme48-gentoo.el, +metadata.xml, +scheme48-1.3.ebuild:
   New Scheme48 package added.
-
diff --git a/dev-scheme/scheme48/scheme48-1.8-r1.ebuild b/dev-scheme/scheme48/scheme48-1.8-r1.ebuild
deleted file mode 100644
index e2f0fa0b4fad..000000000000
--- a/dev-scheme/scheme48/scheme48-1.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.8-r1.ebuild,v 1.2 2010/08/10 15:43:58 xarthisius Exp $
-
-inherit elisp-common multilib eutils flag-o-matic
-
-DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
-HOMEPAGE="http://www.s48.org/"
-SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc emacs"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-SITEFILE=50scheme48-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed+fix_destdir.patch"
-	sed -i -e "s/\$(LD) /&\$(LFLAGS) /" Makefile.in || die #332007
-}
-
-src_compile() {
-	econf
-	emake LFLAGS="$(raw-ldflags)" || die
-	if use emacs; then
-		elisp-compile "${S}"/emacs/cmuscheme48.el
-	fi
-}
-
-src_install() {
-	# weird parallel failures!
-	emake -j1 DESTDIR="${D}" install || die
-
-	if use emacs; then
-		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	dodoc README || die
-	if use doc; then
-		dodoc doc/manual.ps doc/manual.pdf doc/*.txt || die
-		dohtml -r doc/html/* || die
-		docinto src
-		dodoc doc/src/* || die
-	fi
-
-	#this symlink clashes with gambit
-	rm "${D}"/usr/bin/scheme-r5rs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/scheme48/scheme48-1.8-r2.ebuild b/dev-scheme/scheme48/scheme48-1.8-r2.ebuild
index 3a8bbb6c76b5..ed7712ecffc7 100644
--- a/dev-scheme/scheme48/scheme48-1.8-r2.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.8-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.8-r2.ebuild,v 1.1 2010/11/14 16:05:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.8-r2.ebuild,v 1.2 2012/10/28 16:17:22 pacho Exp $
 
+EAPI=4
 inherit elisp-common multilib eutils flag-o-matic
 
 DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
@@ -17,16 +18,13 @@ DEPEND="emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 SITEFILE=50scheme48-gentoo.el
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-as-needed+fix_destdir.patch"
 	sed -i -e "s/\$(LD) /&\$(LFLAGS) /" Makefile.in || die #332007
 }
 
 src_compile() {
-	econf
-	emake LFLAGS="$(raw-ldflags)" || die
+	emake LFLAGS="$(raw-ldflags)"
 	if use emacs; then
 		elisp-compile "${S}"/emacs/cmuscheme48.el
 	fi
@@ -34,23 +32,23 @@ src_compile() {
 
 src_install() {
 	# weird parallel failures!
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
 	if use emacs; then
 		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	dodoc README || die
+	dodoc README
 	if use doc; then
-		dodoc doc/manual.ps doc/manual.pdf doc/*.txt || die
-		dohtml -r doc/html/* || die
+		dodoc doc/manual.ps doc/manual.pdf doc/*.txt
+		dohtml -r doc/html/*
 		docinto src
-		dodoc doc/src/* || die
+		dodoc doc/src/*
 	fi
 
 	#this symlink clashes with gambit
-	rm "${ED}"/usr/bin/scheme-r5rs
+	rm "${ED}"/usr/bin/scheme-r5rs || die
 }
 
 pkg_postinst() {