Specify LICENSE more precisely. Bump ebuild to EAPI 4.

(Portage version: 2.1.11.20/cvs/Linux x86_64)

4 files changed, 22 insertions, 22 deletions

diff --git a/app-emacs/yatex/ChangeLog b/app-emacs/yatex/ChangeLog
index a46076933f84..3a737a912525 100644
--- a/app-emacs/yatex/ChangeLog
+++ b/app-emacs/yatex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/yatex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.28 2012/07/08 21:13:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.29 2012/09/26 05:18:08 ulm Exp $
+
+  26 Sep 2012; Ulrich Müller <ulm@gentoo.org> yatex-1.74.ebuild,
+  yatex-1.76.ebuild:
+  Specify LICENSE more precisely. Bump ebuild to EAPI 4.
 
 *yatex-1.76 (08 Jul 2012)
 
diff --git a/app-emacs/yatex/files/50yatex-gentoo.el b/app-emacs/yatex/files/50yatex-gentoo.el
index 2b3b45764112..c57be338abeb 100644
--- a/app-emacs/yatex/files/50yatex-gentoo.el
+++ b/app-emacs/yatex/files/50yatex-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; yatex site-lisp configuration
-
 ;; YaTeX-mode
 (setq auto-mode-alist
       (cons (cons "\\.tex$" 'yatex-mode) auto-mode-alist))
diff --git a/app-emacs/yatex/yatex-1.74.ebuild b/app-emacs/yatex/yatex-1.74.ebuild
index ff15067b200c..318fb1cc5f9d 100644
--- a/app-emacs/yatex/yatex-1.74.ebuild
+++ b/app-emacs/yatex/yatex-1.74.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.74.ebuild,v 1.4 2009/12/13 17:04:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.74.ebuild,v 1.5 2012/09/26 05:18:08 ulm Exp $
 
 inherit elisp eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
 
 KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
 SLOT="0"
-LICENSE="as-is"
+LICENSE="YaTeX"
 IUSE="linguas_ja"
 
 S=${WORKDIR}/${P/-/}
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
index db2a6075c0fd..3e2ed6da3915 100644
--- a/app-emacs/yatex/yatex-1.76.ebuild
+++ b/app-emacs/yatex/yatex-1.76.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.76.ebuild,v 1.1 2012/07/08 21:13:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.76.ebuild,v 1.2 2012/09/26 05:18:08 ulm Exp $
+
+EAPI=4
 
 inherit elisp eutils
 
@@ -10,15 +12,13 @@ SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-LICENSE="as-is"
+LICENSE="YaTeX"
 IUSE="linguas_ja"
 
 S=${WORKDIR}/${P/-/}
 SITEFILE="50${PN}-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.76-gentoo.patch"
 }
 
@@ -27,11 +27,11 @@ src_compile() {
 	# that are only available under X
 
 	cd docs
-	mv yatexe yatex.info
-	mv yahtmle yahtml.info
+	cp yatexe yatex.info || die
+	cp yahtmle yahtml.info || die
 	if use linguas_ja; then
-		iconv -f ISO-2022-JP -t EUC-JP yatexj > yatex-ja.info
-		iconv -f ISO-2022-JP -t EUC-JP yahtmlj > yahtml-ja.info
+		iconv -f ISO-2022-JP -t EUC-JP yatexj > yatex-ja.info || die
+		iconv -f ISO-2022-JP -t EUC-JP yahtmlj > yahtml-ja.info || die
 	fi
 }
 
@@ -40,14 +40,13 @@ src_install() {
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 
 	insinto ${SITEETC}/${PN}
-	doins help/YATEXHLP.eng || die "doins failed"
+	doins help/YATEXHLP.eng
 
-	doinfo docs/*.info || die "doinfo failed"
-	dodoc docs/*.eng || die "dodoc failed"
+	doinfo docs/*.info
+	dodoc docs/*.eng
 
 	if use linguas_ja; then
-		doins help/YATEXHLP.jp || die "doins failed"
-		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc \
-			|| die "dodoc failed"
+		doins help/YATEXHLP.jp
+		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
 	fi
 }