gentoo resync : 29.03.2018

3 files changed, 20 insertions, 26 deletions

diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 2c1d11eeced1..9fcb190f682e 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1,4 +1,4 @@
 DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173
-EBUILD emacspeak-39.0-r2.ebuild 2147 BLAKE2B 0fd7c66987774ab0f7b98095167cabd824e7aae462912c59bb3cbe8519ce893077e7e40d6807c2239a7c0b3f98bc393adfec4f383c95411d15333f4cdfca75f8 SHA512 47027eb71c575ec4c6bcb3ecdeb07f7092dae66f10b849da533f2c332519b0ecd1700f0dfecddfe6653dfc2069151b81ab556fb2e3cbfc8668565944b7527bcf
-EBUILD emacspeak-9999.ebuild 2148 BLAKE2B fb36a54b488daf084a87ea6d005b95be37c32a68e48014a52719b34ad3b1d0335d1cc739b36c961e4c95f9f652c1b0ee046fe584ad9444b62ffde573d7852f25 SHA512 0f8d749066e9a5be5afcad4b020418ee4ca0b062b6e900c65355500b904c16d001a9b201b9330b86692dfb30c619d8d5007810a670cbe74ff0e4b52bae1077a6
+EBUILD emacspeak-39.0-r2.ebuild 2075 BLAKE2B 1adb4a4cade944dd77d4635f9db22face5b234e2c0d0b577902cd21e503c323c0fcbf93e254942cc7ccec3cad49adaf7b55b6f030d8b691b2887337ea9613381 SHA512 b1507eb711316486f4d026a40116d465e909c9709bae2fe4549369fc525d2dc55bd16621661296049174cb327e0e35fdc3d77511ba1edbb54b5f25a7d16da182
+EBUILD emacspeak-9999.ebuild 2078 BLAKE2B c5a3b3230f5e2ff9f321ba405aadf463f03d0a57657e4b96b00f1f0168f8a504f5689ae685ff81199a9b65ff178270b85d37470a26e1726fa68821542cbd57e9 SHA512 755477e57ed910b0142203839a2ab228eb6fd099b877024731b87fb62294d737dd79f4799a06104192209dd749342d189876ec58d18afb81281c38a7b3e619c9
 MISC metadata.xml 935 BLAKE2B b6d4290a33c03d8f5867bbd03fda6dc10db6372049fd783d44f6cfc18caa3f667cfd59441cf1e032fb9da990f3b210592db9d909c25d0ff8bdd6c384c76018e7 SHA512 27ae503ae1f338a52ecb4ce06cc4d227f6fd922f4b391abf1dfe75a7433d2d350f63979e71d16adf27de6f2f6bca34fa4213578868e2883e8c50f409e453706e
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
index b720e3de7874..daa09b1d5317 100644
--- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 NEED_EMACS=24
 FORCE_PRINT_ELOG=1
 DISABLE_AUTOFORMATTING=1
-inherit eutils readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+	inherit git-r3
 else
 	SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
 	KEYWORDS="amd64 ppc x86"
@@ -22,7 +22,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 IUSE="+espeak"
 
-	DEPEND="espeak? ( app-accessibility/espeak )"
+DEPEND="espeak? ( app-accessibility/espeak )"
 
 RDEPEND="${DEPEND}
 	>=dev-tcltk/tclx-8.4"
@@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file:
 (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
 '
 
-src_prepare() {
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
+HTML_DOCS=( install-guide user-guide )
 
 src_configure() {
 	emake config
@@ -51,7 +48,7 @@ src_compile() {
 		if [[ -z $tcl_version ]]; then
 			die 'Unable to detect the installed version of dev-lang/tcl.'
 		fi
-		cd servers/linux-espeak
+		cd servers/linux-espeak || die
 		emake TCL_VERSION="${tcl_version}"
 	fi
 }
@@ -72,8 +69,8 @@ src_install() {
 		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}"
+	einstalldocs
+	cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
 	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
 		user-guide || die
 	readme.gentoo_create_doc
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 203cdea84324..67a6062698b4 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 NEED_EMACS=24
 FORCE_PRINT_ELOG=1
 DISABLE_AUTOFORMATTING=1
-inherit eutils readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
@@ -22,7 +22,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 IUSE="+espeak"
 
-	DEPEND="espeak? ( app-accessibility/espeak )"
+DEPEND="espeak? ( app-accessibility/espeak )"
 
 RDEPEND="${DEPEND}
 	>=dev-tcltk/tclx-8.4"
@@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file:
 (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
 '
 
-src_prepare() {
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
+HTML_DOCS=( install-guide user-guide )
 
 src_configure() {
 	emake config
@@ -51,7 +48,7 @@ src_compile() {
 		if [[ -z $tcl_version ]]; then
 			die 'Unable to detect the installed version of dev-lang/tcl.'
 		fi
-		cd servers/linux-espeak
+		cd servers/linux-espeak || die
 		emake TCL_VERSION="${tcl_version}"
 	fi
 }
@@ -72,8 +69,8 @@ src_install() {
 		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}"
+	einstalldocs
+	cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
 	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
 		user-guide || die
 	readme.gentoo_create_doc