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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

4 files changed, 37 insertions, 23 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/Manifest b/app-accessibility/emacspeak/Manifest
index cd0bda72a577..615244c6d909 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -13,18 +13,18 @@ EBUILD emacspeak-30.0.ebuild 891 SHA256 e4297e6761409627d309b07572abed745c6e1bb7
 EBUILD emacspeak-31.0.ebuild 961 SHA256 d987dbc18eb8e532a6ac1408b06d4b1e0ba86f623badf5a8a7aaad9703984f17 SHA512 a8239c2739b6ede83bef4e3388ad8020e26cfc960542992d211766b0f7f99d3c5925190f37a6cd95b725a54e81eb2677635837edbf3fde0515a777c0e62361be WHIRLPOOL 1f4a7a19464d1cf198560a1635ac9f82e0dc5a0e4d2496cb0b6b6b707b8b56be33221e9a3ef92f350b6b54f59aed8305cc938b1e753e9353840d40107bf0d9b2
 EBUILD emacspeak-33.0.ebuild 1127 SHA256 d5f95ec17692d9e345256865802c095d1dc66dcf7eee1b6c3bb171b18f0ce940 SHA512 6be49050720d78292379b3433a764d0784ebbb30e4546a1ede39b46f195ebb1d241ac38e0da0ed1da781f2d0d71fea78606a928faf0b9ea59a4c42d3794e5d8d WHIRLPOOL 6a8fb5a7ddba52b1a91746cd4a297c0a0de68bf56091427b3190ae6162ece9af53d11fc8ed799b6b392352f2500a6dc37895b3fdcdfbcc88d6d55cd6c807104b
 EBUILD emacspeak-38.0.ebuild 1512 SHA256 2921daf4061a7ada6f437bdaf56809fe2063e0b5e23ea64d0adea67e0d560638 SHA512 cf29ff389228f30ac552989b11b699bef6cfb0f5f349ed21f194912667b313b49b1b02f7d3f00be12b029fcead86fb899b9634348e19c7e0e365d34a65c88af5 WHIRLPOOL 96b2b6730af20e16b5f2d348c716111918ea9743ec1b6ddbbfd74a43e9dce69bd01bd497b5177d9ad033f2bdbe1bfe62a31aa16098b233473600d39bb9f27639
-EBUILD emacspeak-39.0.ebuild 2147 SHA256 fd43e69738032724780fe84b24ec4a6372ab52c9fa7e19903bb494eecec35754 SHA512 388406a17c9a51bb9648c624538fa38aaa7e43954b0dd64cbd994404dc209517524f9aa2821681fbd487576a9f9b02f1e641661ff380be0c7eb2863acabc78b0 WHIRLPOOL dd343ad8f114dfc1e7b5619cb48d0b3f3fab866a44ef5dfc6689e5c75f76e3e81c8206039078bc867d1cbe4ff6490222711f9fcf1d86f30ee6354f9aff80b823
-EBUILD emacspeak-9999.ebuild 2147 SHA256 0c2b0f1d0e03bb2618ce61e9f51278b55e89540136a70c62bc99a765ab188c74 SHA512 3f80b24e155fe28d4783cf8b2367e6b8ab7d1b1d1d2963b43e95cc7ad63f2de7169c715c70babd68cb80dc29419565b4822540dcf9c20a0d9e86690af662d0bb WHIRLPOOL a1ff7340c30adb524a5dd29fb8070fe7befaaa999c934e86410facb8c0196ef950ab86eff4ad0451ad57e0d43b3528e636607cc4b0eabb74e9df4ea8b7202e65
-MISC ChangeLog 6886 SHA256 74983dc8614bcddc7683d5fa4dbf898e532457a42eab456bb3705ee96928ddf0 SHA512 15f6e895fd7344e0633b56d94076fcb0ff8a8857473234f5b8dbe7d3d1ab9bd93a8f1f822e5c5a95d3b272d617dabfbc21da0c9b21e114007811c0355c66bbdd WHIRLPOOL 77a2747f77c9fe41e4ea9888f74995d555cf8d12bf128c6e99f2d293349834f929155b65f8f59f70044adc3726f703347f9c45cf10a410df8ec8e69c20e79584
+EBUILD emacspeak-39.0-r1.ebuild 2236 SHA256 25d52781c8adadf57423bf4a7797aed1350a609dc0d8f248c803bdfdb2f1a73e SHA512 f3ee39fb60b85995b7e63d64a1c529eb8c4fb7b84e09c0a5d96b4721863f6924db24aaa8f85ed7dea8870ae09a67479746a63dc6a061f97e8d33a36fb88a965e WHIRLPOOL 85f0bf9586f930d141dbc665e1b24c820f97c2a114605e12f137c77bab254b7a5fd37d53c603f99b697f601dce5d591dcc908234387a01a3a0f8f833ef61c365
+EBUILD emacspeak-9999.ebuild 2233 SHA256 7e217f56b69bf783f67494b7c1acd3e60e32c9f8bc5d8ba93506d3b38eac4814 SHA512 e9ecb5bc8d45325cd9571211f3ac8eda8320d46bad98f0ccddc2c5609d69c3733961a53d53c1f38ebb198f347d626e7537d3df876c7830268a77b609e35b60ee WHIRLPOOL 84e547c97806f82ae648101fa9c21b81350bbf4be545de44d83dce5dad1c50c49dfa2417f9622a7c5d5d7cca694d9fff63a05d21eff4a96dbac0f60baad96f8d
+MISC ChangeLog 7233 SHA256 ae1f8270ad10f2472aa14b13804678285bb50d00c65a08a7ca91bcbe3e952936 SHA512 7a985dcf2c6af21481c17e2b6c1cb1635bef3bac174cc54cce504b666f37824786edd79c29a7f70bc335c80ff0045679704845d7b1640f243c377640ae9ba989 WHIRLPOOL 082351028258a9439c416d1637d56c64fd650ed203156485fd02f2da317892865b536952a53eca5eefbc6483842c7081e95e3cd03358abb007d4f8bf516285f5
 MISC metadata.xml 743 SHA256 f6b544111ee5baab6eabf74356db8fa47b695258414ff872cc4d7f05e00b72c6 SHA512 3baec80bf094ef340a0075263a0f47414f698cb1366c01dc820ee75e39f41df77544c0d292297b80755139c479e50d78c61a428f550d2db9d2e9400860348c26 WHIRLPOOL 974649f0b45fb66b9920ce2f2dd3b3fe12b9c200a8da007b51385f706ab07ee9ea9114915d5f41649c285ee8fd103a762ac78bdca5612457e96f32bd96010655
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSp73mAAoJEH8qFnJlIeBtFOUIAIOjLtY99Io2fU/7yUmalYkz
-YKLfb7c40Qg28XtEEySZWYhVXkaf3Sg32gg/pfifANNcc9mCLe6XyZWmrmn4AkGt
-0fP6oOhyCBI7JfPvUF+nu8b7zvJxOZelrkr9dUVaxv4bBgnphaNrDo4pXOAZp0xn
-tCOvYNpl+dxVFRUaM/vC+WioPJOAe2dG6aCKoyZQUYjiv48NJqTAIensaw5akxGe
-8Zo5hjsrcKWphv2kFUA0QlU8G25mvhhyIGbrYh8G6Es9ByuiBPe7gipHt/CDa3wN
-aIYseUKWsxqi7ua4310J++8mdcDiH+KRrS35H07bFsb8aukiowX3FOxwzt4d1P4=
-=av1v
+iQEcBAEBCAAGBQJSqfZHAAoJEH8qFnJlIeBtmxUH/RyXIamXaU01Y7JRY6IAB80H
+vg6v8DujUai+j0l0rMGAFyAiMqudgtLcHbvRL5M9homMP0hmO/hUVyiE6NHxs8Ar
+/69PWuTuIOwVTxPcZyMJWsghORfV32uJXqi3IAtDYXGYoqJdLo3y2UPdgR1xcJEG
+z0JppNIqXl7M/u45pvxzxc0QNA4xCYjc2dlNA0N3N57OQ+CSF2IHZOkgvenTsBFv
+XJRYoNzTrPwblIMHwNf2gcFr/wCXFBOdZfmeEESuoZ9wvL4Oq0DX/fMS8g/R7pYp
+lRkatif1cP8VksV8NIVTPOImBwsQpXClujrxIcMZaTPE0ben6XH59x9ibF/MiO8=
+=D/aJ
 -----END PGP SIGNATURE-----
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}"