Fix replacing of directory with symlink.

Upgrading to 39.0 was broken unless you forced it.
Revbumping to insure that emacspeak will be installed properly
for everyone.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

3 files changed, 27 insertions, 13 deletions

diff --git a/app-accessibility/emacspeak/ChangeLog b/app-accessibility/emacspeak/ChangeLog
index 3025d637035b..40b9a28f15b9 100644
--- a/app-accessibility/emacspeak/ChangeLog
+++ b/app-accessibility/emacspeak/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-accessibility/emacspeak
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.49 2013/12/11 01:20:32 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/ChangeLog,v 1.50 2013/12/12 17:45:37 teiresias Exp $
+
+*emacspeak-39.0-r1 (12 Dec 2013)
+
+  12 Dec 2013; Christopher Brannon <teiresias@gentoo.org>
+  -emacspeak-39.0.ebuild, +emacspeak-39.0-r1.ebuild, emacspeak-9999.ebuild:
+  Fix replacing of directory with symlink.
+
+  Upgrading to 39.0 was broken unless you forced it.
+  Revbumping to insure that emacspeak will be installed properly
+  for everyone.
 
 *emacspeak-39.0 (11 Dec 2013)
 
diff --git a/app-accessibility/emacspeak/emacspeak-39.0.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild
index 8d285f10c484..32fda39415e3 100644
--- a/app-accessibility/emacspeak/emacspeak-39.0.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-39.0.ebuild,v 1.1 2013/12/11 01:20:32 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild,v 1.1 2013/12/12 17:45:37 teiresias Exp $
 
 EAPI=5
 
@@ -53,13 +53,15 @@ src_install() {
 	if use espeak; then
 		pushd servers/linux-espeak > /dev/null || die
 		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
+		local serverfile="${D}${orig_serverdir}/tclespeak.so"
+		install -Dm755  "$serverfile" \
+			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "$serverfile" || die
+		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"$orig_serverdir/tclespeak.so"
 		popd > /dev/null || die
 	fi
-	install -dm755 "${D}/usr/$(get_libdir)/emacspeak" || die
-	mv "${D}/usr/share/emacs/site-lisp/emacspeak/servers" \
-		"${D}/usr/$(get_libdir)/emacspeak/servers" || die
-	dosym "/usr/$(get_libdir)/emacspeak/servers" \
-		/usr/share/emacs/site-lisp/emacspeak/servers
 	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
 	dohtml -r install-guide user-guide
 	cd "${D}/usr/share/emacs/site-lisp/${PN}"
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 7b8b3bda3df0..a3df722fb07d 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.7 2013/12/11 01:20:33 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak/emacspeak-9999.ebuild,v 1.8 2013/12/12 17:45:37 teiresias Exp $
 
 EAPI=5
 
@@ -53,13 +53,15 @@ src_install() {
 	if use espeak; then
 		pushd servers/linux-espeak > /dev/null || die
 		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
+		local serverfile="${D}${orig_serverdir}/tclespeak.so"
+		install -Dm755  "$serverfile" \
+			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "$serverfile" || die
+		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"$orig_serverdir/tclespeak.so"
 		popd > /dev/null || die
 	fi
-	install -dm755 "${D}/usr/$(get_libdir)/emacspeak" || die
-	mv "${D}/usr/share/emacs/site-lisp/emacspeak/servers" \
-		"${D}/usr/$(get_libdir)/emacspeak/servers" || die
-	dosym "/usr/$(get_libdir)/emacspeak/servers" \
-		/usr/share/emacs/site-lisp/emacspeak/servers
 	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
 	dohtml -r install-guide user-guide
 	cd "${D}/usr/share/emacs/site-lisp/${PN}"