From 4cd5374938b26a4fd312cd86bf090d6210535a3d Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Thu, 12 Dec 2013 17:45:37 +0000 Subject: 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) --- app-accessibility/emacspeak/ChangeLog | 12 +++- .../emacspeak/emacspeak-39.0-r1.ebuild | 78 ++++++++++++++++++++++ app-accessibility/emacspeak/emacspeak-39.0.ebuild | 76 --------------------- app-accessibility/emacspeak/emacspeak-9999.ebuild | 14 ++-- 4 files changed, 97 insertions(+), 83 deletions(-) create mode 100644 app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild delete mode 100644 app-accessibility/emacspeak/emacspeak-39.0.ebuild (limited to 'app-accessibility') 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 + -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-r1.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild new file mode 100644 index 000000000000..32fda39415e3 --- /dev/null +++ b/app-accessibility/emacspeak/emacspeak-39.0-r1.ebuild @@ -0,0 +1,78 @@ +# 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-r1.ebuild,v 1.1 2013/12/12 17:45:37 teiresias Exp $ + +EAPI=5 + +inherit eutils + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk" + inherit subversion +else + SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="the emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" +LICENSE="BSD GPL-2" +SLOT="0" +IUSE="+espeak" + +DEPEND=">=virtual/emacs-22 + espeak? ( app-accessibility/espeak )" + +RDEPEND="${DEPEND} + >=dev-tcltk/tclx-8.4" + +src_prepare() { + # Allow user patches to be applied without modifying the ebuild + epatch_user +} + +src_configure() { + emake config +} + +src_compile() { + emake emacspeak + if use espeak; then + local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" + if [[ -z $tcl_version ]]; then + die 'Unable to detect the installed version of dev-lang/tcl.' + fi + cd servers/linux-espeak + emake TCL_VERSION="${tcl_version}" + fi +} + +src_install() { + emake DESTDIR="${D}" install + rm "${D}/usr/bin/emacspeak" + 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 + dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT + dohtml -r install-guide user-guide + cd "${D}/usr/share/emacs/site-lisp/${PN}" + rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ + user-guide || die +} + +pkg_postinst() { + elog "As of version 39.0 and later, the /usr/bin/emacspeak" + elog "shell script has been removed downstream in Gentoo." + elog "You should launch emacspeak by another method, for instance" + elog " by adding the following to your ~/.emacs file:" + elog '(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")' +} diff --git a/app-accessibility/emacspeak/emacspeak-39.0.ebuild b/app-accessibility/emacspeak/emacspeak-39.0.ebuild deleted file mode 100644 index 8d285f10c484..000000000000 --- a/app-accessibility/emacspeak/emacspeak-39.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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 $ - -EAPI=5 - -inherit eutils - -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk" - inherit subversion -else - SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" - KEYWORDS="~amd64 ~ppc ~x86" -fi - -DESCRIPTION="the emacspeak audio desktop" -HOMEPAGE="http://emacspeak.sourceforge.net/" -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="+espeak" - -DEPEND=">=virtual/emacs-22 - espeak? ( app-accessibility/espeak )" - -RDEPEND="${DEPEND} - >=dev-tcltk/tclx-8.4" - -src_prepare() { - # Allow user patches to be applied without modifying the ebuild - epatch_user -} - -src_configure() { - emake config -} - -src_compile() { - emake emacspeak - if use espeak; then - local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" - if [[ -z $tcl_version ]]; then - die 'Unable to detect the installed version of dev-lang/tcl.' - fi - cd servers/linux-espeak - emake TCL_VERSION="${tcl_version}" - fi -} - -src_install() { - emake DESTDIR="${D}" install - rm "${D}/usr/bin/emacspeak" - if use espeak; then - pushd servers/linux-espeak > /dev/null || die - emake DESTDIR="${D}" install - 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}" - rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ - user-guide || die -} - -pkg_postinst() { - elog "As of version 39.0 and later, the /usr/bin/emacspeak" - elog "shell script has been removed downstream in Gentoo." - elog "You should launch emacspeak by another method, for instance" - elog " by adding the following to your ~/.emacs file:" - elog '(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")' -} 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}" -- cgit v1.2.3-65-gdbad