Fix uncorrect file removal, bug #345759

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 28 insertions, 90 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/Manifest b/dev-scheme/scheme48/Manifest
index b778dd16367e..ce9a11300709 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50scheme48-gentoo.el 198 RMD160 27ce388121bb1927b4c647d8ceffa71faf0e00e6 SHA1 7b613cdf2a8f40edf4269945ed054586221e75eb SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024
-AUX scheme48-1.8-as-needed+fix_destdir.patch 1081 RMD160 d13402ce00971e2233bf5357756505da48a68644 SHA1 4faf8495604b006ad6eca0d86c53b38810b32ed2 SHA256 7f42cdbf15fcccd145a6eae7a290a5a7973dc40886f60049d4b406bdcbd75a9e
-DIST scheme48-1.8.tgz 3173151 RMD160 2685ea2c2ce9e5ff1408a1f588182e07f6d3822b SHA1 75299fe9de4bf239fc1d5a7dfa2ec377e0e98df1 SHA256 04a61ea28ef9d1f2f0e281fd6eb503f10afc94b0d3f34dbf376aedbe93eb1bb3
-EBUILD scheme48-1.8-r1.ebuild 1433 RMD160 9286aeebd71e466f1715b9ecfc650b0cb3821b56 SHA1 7847d95ae6ac0226aa78d131ad77a45abe123122 SHA256 a3cc67814d9bccc8adc11a0a72bbe242ec8d0e3c30b29887add149e7fd576cab
-EBUILD scheme48-1.8-r2.ebuild 1463 RMD160 a4ca0207d617022e6fa104b59a3abe1e15926ad0 SHA1 010f89737475f933c54481c3a6f4646e2769ffab SHA256 060164882649b4f49c4bed6b678b391701d9098ad3b4cc5f4f6337c7f6ba9f79
-MISC ChangeLog 2622 RMD160 2e63b80332728706301de221f814cd5aeb068941 SHA1 1139dcc43b6e9ba70eae4eae7107b63c275ee6d5 SHA256 588b5e4a37c00e63f843867e9e550cded847ed53db2c23218292165818d1746f
-MISC metadata.xml 532 RMD160 130ae0288c47f06e72ae2225c8fc08e32b0ce428 SHA1 857a3bb429c6d759b0aae2e644f2cc220905e81c SHA256 58724fd8ef37b1b7edfca3d69536c1302ecafb00240112a3f442ea1a017819ab
+AUX 50scheme48-gentoo.el 198 SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024 SHA512 874355b78d5ddcc55add22d7171ae92e4115c8e84883a89e76848ad362c070c00d8ec12e1841eabd1bc0d2a786d789e36f3f109b0d3e5dd879a9faca1fb8e4b7 WHIRLPOOL 0e66bdfd7cd314f809f3d43d4fe17b2bab252109179c2efdf178db996246cec1f7a8780b7ac9bc11f00d6bfb3a8698a6fd2622bd66a1efc655bfa98019793964
+AUX scheme48-1.8-as-needed+fix_destdir.patch 1081 SHA256 7f42cdbf15fcccd145a6eae7a290a5a7973dc40886f60049d4b406bdcbd75a9e SHA512 ee66e4bc2d4cfed4fb2e6851924e1da450859e06fb0439a0b842a0165af4dbea8d5907784a7ddf92b39f64730176cf528e3dbf7ccde00752403483b818637c0e WHIRLPOOL dfdf1e5dc57f8d9d16e50d153dd38fea4328c033ea2657f56e07a4065745310a99ca4a16a61e41c95e9dbf35ca492211803685c48ab89186a0750db0825bf2c1
+DIST scheme48-1.8.tgz 3173151 SHA256 04a61ea28ef9d1f2f0e281fd6eb503f10afc94b0d3f34dbf376aedbe93eb1bb3 SHA512 1cae01ef1e282971ad0bad308a4d75fe24dcc629b09f711b54811d843f85f02cf3a728d19d44cdcc2699d071b27b2a0fb40c0ebb3a08db0f06a115e53e8b9e47 WHIRLPOOL c6748848df241d978c569768e39d0dced7c8a356342017e9777c018a63d38fe51f0eb28de3d2b34165a7c3658fb5f7dd4a72de1d1f585b9ea03b5ea5a33b5128
+EBUILD scheme48-1.8-r2.ebuild 1406 SHA256 fe29d7c0413f37c0c31f1ac97478c8ec3f96422f383693c6b4d6313aa5fa8e69 SHA512 600f368d79cbb59d7bd9da4317b1a109aeb25051a1338625bf3b621e6b2d4e53a036c42876f3467fff135f2ef01a97dec8f4848309461e4fe81a1464ea3cc521 WHIRLPOOL 540cffcda39115215a43c37f2bd3d9a09d2822085e8a91fc0f208a5aba2bfbfdffdece963e3453dea5b4b8c773fa03c6ffabe571514b214d45c4ba93f309e154
+MISC ChangeLog 2762 SHA256 34cf801a83d00e34a13fd12b9b8345c4aa34f0049d93ecf8ca822aba6936930b SHA512 a5f81a263fed734d43f6f578acbad25dead38215929cfb2a83a44d888a6f1f24f041d58983eb9d15f173c3dae4749c479e98fa27bf09b480880d1f8e0b3fc065 WHIRLPOOL 143a390eeb2240e44f08202680a9f872b3601fd4df3b4cea7d8f9f15eb52d315a0bcfda297e6ec0ee73514eb130547974c21609f033d7105f3646c6b8e37fac9
+MISC metadata.xml 532 SHA256 58724fd8ef37b1b7edfca3d69536c1302ecafb00240112a3f442ea1a017819ab SHA512 dedb81bb1e6f9a796ca65a44f854c09eb9034b9717dd031e00017212f35b519e71d478e08a3cdf993034cce4987751c7c1110cd657d852a2e06830b189c7d091 WHIRLPOOL f24619b396d3621b57b80abb368c7652655bbc0a5a1cbc4bccac060ac044d52c072dbd41f770eb4daf9404ff483dc5301d19f2fa66393a04e700f01149fd8451
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkzgCNEACgkQgAnW8HDreRa8jwCgin1wgpQas2E5dAhPTHci0uIf
-RH4AnAlnQeh0Es7WEEXojtAdqHa9zxBO
-=xPHH
+iEYEAREIAAYFAlCNWpMACgkQCaWpQKGI+9SZ1wCeI0aqo0pSAwTyG7eVVtWzF1Yr
+Sg4An3janYsTy0zS1p70z+07aZB/pLbG
+=LkG+
 -----END PGP SIGNATURE-----
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() {