Version bump, bug 419481. Remove intermediate version.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 30 insertions, 23 deletions

diff --git a/app-emacs/ess/ChangeLog b/app-emacs/ess/ChangeLog
index 04579c929173..96c981923727 100644
--- a/app-emacs/ess/ChangeLog
+++ b/app-emacs/ess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/ess
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.78 2012/03/03 00:14:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.79 2012/06/15 18:13:13 ulm Exp $
+
+*ess-12.04.4 (15 Jun 2012)
+
+  15 Jun 2012; Ulrich Müller <ulm@gentoo.org> -ess-5.13.ebuild,
+  +ess-12.04.4.ebuild:
+  Version bump, bug 419481. Remove intermediate version.
 
 *ess-5.14 (03 Mar 2012)
 
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 8a03ada00449..8d4f489db42a 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -2,28 +2,28 @@
 Hash: SHA1
 
 AUX 50ess-gentoo.el 58 RMD160 6888368d2cd5fb028ea4f78b0599160a94c4ef14 SHA1 a82ffcd54ec522c8f47772fbf5dc2fbd9106c5f9 SHA256 7f9d9fdb96fefa7c278d7a24e7c090754dcf818f2296867d3d25f921b5c7d46a
+DIST ess-12.04-4.tgz 3280247 RMD160 29791b3695cafda1b8f788fd2d83d41c94e8f05b SHA1 b0396d0566403c616702124eb0253fe96166e099 SHA256 c8ae9ba3db3ee98ca857a9ea6c82c88d92d4bc9115bc3f7e08c466920b5950ca
 DIST ess-5.12.tgz 2983695 RMD160 1d7ed808c9fe04a74f074d580b64d8f4b2d76a6c SHA1 ef9efc16af24ae82d54aa7a4b4ad909d9c3cfaea SHA256 8c0480e2e6de140b103b83f575997fa45a7b2ac3c61f6a80fd4d1e6bf74d0f6c
-DIST ess-5.13.tgz 7245294 RMD160 0cf83969e77fc41315a73fd3f8e99ce1c4fc94fb SHA1 c2eb3c88774b9e07ed03c0c7e33f1d8a7dd0ce08 SHA256 26e78fb207f034e9f08f07073589faaa1e4d66a886de3e46769b79fd5e1072c4
 DIST ess-5.14.tgz 7272065 RMD160 f7a50282bf54c8206ed36d3be16f10eaa2767e8f SHA1 c42d7f11d776924b28ed17958c5f34d77de65080 SHA256 982b625f5c3f0e11d2cd8903e15026b5ecac6775415e8eb3cd120d0b9950dcc6
+EBUILD ess-12.04.4.ebuild 1242 RMD160 2c6d5e1163d9b5e1134f0293a4a5574a3b7e3ed4 SHA1 87723da2ff3becc5aa4fd1ce82874ae6a75efee0 SHA256 a0a780667c6dc66d5d5eca2de6f712fb7fee1311ec0e8cb85c88433da75daf2a
 EBUILD ess-5.12.ebuild 1285 RMD160 951dd0274ad0ca1a7537b1801c69013918afeb58 SHA1 f313f4f68365cc7a91d61e056661847a74073323 SHA256 38606579d8dee8ef55e344dc227f015e9466c060358ce7391764776d73c9752f
-EBUILD ess-5.13.ebuild 1242 RMD160 aeedafff43584bf5f3798402835f854dbc07dc8c SHA1 5678da19b766faf30f76e768f1941a02e6d3e604 SHA256 750a98a3f4e79d0c4f55485324d410c2336118f78f95ea78d0670533230a36d4
 EBUILD ess-5.14.ebuild 1183 RMD160 4d7f24f8677fc565675e15568cb95c9a706af219 SHA1 2ccee8b61036e6dd33a4084b1ff44d474a26cb72 SHA256 ce08baf760896d3a7b96c2abf81100c82abe122406fac0af43ed4608764cce17
-MISC ChangeLog 9936 RMD160 ae41560759b6e240add7b5316298c5570a2ef593 SHA1 64c515fcb8ae3ee19260bf423e771d2f914cc6a8 SHA256 d9da799c6ac70ca8e00416c8c1527ba9e9a5a4b239d48d96f986ac16062a513a
+MISC ChangeLog 10110 RMD160 3123026fe0f04e1c01a1c470544809dbb7365d47 SHA1 4c6ee685144f7fb0d577247d541fd7b57473de8b SHA256 d8c1632462b41faf843fd412b75a2077add51a1e048bbc82882c05a25c393cd2
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPUWLSAAoJEDxpGckxwJCBSeYP/13XMeivZq11LRLRqAA5s3n9
-6AgUkDYNpK9iJvMNR/KWFwAXxhPf8jBjbpTOeEGUbbwspM9NNjlOsb8j9vfAkT/q
-YpISAr6i5IsfdkcXI4RNjTYYzP8HT5sTZD5Z+71LXajrHLxWmtESMjpSkvcjpyMA
-Rvu+36Bahf3rf9UoaYH8kYlSyuZYOCqSkIcwUD/ZUcgwdbBFDRSTGG2jUqolTHqT
-nrYm0pNp5Qi02upwA49N2Op9J9MF1UM1X7ea79+qgufuvnv+Hejg+riDV62FxnTq
-DD4K6OSEJh9bXQR1Fw4gmHSPemHMOgdrvMS6XTve2JKOHRjJ6/aEt6BOGk+CVloL
-iHy/sGuatLEgtfcY5GutbaKG4y9Sn5o/PnN3rpZiEWxH9VTGS6Io592t1HMVKyjx
-WdNEHyErniyZYurDpksYa4mOy/PiJA+77w/BaPdYc8eg/s4bn9kn9HNjpU56TnJm
-pbsdLaiTHQ11zegOSqgaU+9yPvHoFn0r9tO8uv1uWg66//cCYhnPzEqyAOAh4jHm
-SqNZvFIJfe9hHqm9BYCvjetgFTrGE71rBSl58bxFWpN0BM3rpzfsoyr+e899Z7H7
-l55NGw9DT7rsQy/R374PGwBrCimHe5+RLI/24cr7wYJ9VUN1IvEIZfEK8BJv2xxx
-BHDBfOLy+JvqqXz1vMuS
-=FkTI
+iQIcBAEBAgAGBQJP23x9AAoJEDxpGckxwJCBUKQP/izMSDuQB0CgKMiuwruenJEp
+0RT20v/qmQpkf0U/paE7I92sbgwBIHdaF1Uchsdw4gBP7Fo1Vpg3K0t3JWwvIBYY
+HDDgbTi8jznSPH7jeU/5uMEpzriBcGhGIcwknSW8zUqNJ5AiQ/HDGmT+JzQfuT0z
+E9hyj7bBCeELMOl4hgSt9i4UclO/gdK3EdqeOCCGX5ku5YfJxdAYncPlxSFpG4nZ
+ByduBhw38fNeRxKLf8/PddntB6LVKgqsHvXwIKeu3LqIYsm96+uqnlzelfSnPpkk
+DonXFdAZ6KXNgQqCpc9UhIhZkfYO6AZ7v3qYgb8jnXQO7RpyqIYTf6lcLuzQpbls
+a4YY8Kf44Ie7sASHkKXMYt6UQZ48oyFZyIxWbuQN3ED6+qOjHgfg3+zuz+5o5CkK
+7eQ1WVphB2Z7SSVumSPVzk5eUCarhQTifFwB5R6bWgZPJFGI8tkScX/b4ntb6BG4
+OFvRhM5sy1mycJDDHcDOinVV+Kytc392YYYUoE+Y96DlN2HSwyYrVGn3jUQe3Xef
+lEUFmg38opx8NOdk9xWGNzUbvL4F3tWuLKkc8Lez42VKRtJ1/4eFk4LSQOcSsmaW
+G2Gk1jvsjgJuxb2+Q7GZBXRbZl9/IwCgYOnM/M/Je219NE3qOA3I34xb8fCTSQk9
+qoeySElFpJZVDMfMMNKr
+=+uWm
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/ess/ess-5.13.ebuild b/app-emacs/ess/ess-12.04.4.ebuild
index 5382574213e2..161ca480c767 100644
--- a/app-emacs/ess/ess-5.13.ebuild
+++ b/app-emacs/ess/ess-12.04.4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2011 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/ess/ess-5.13.ebuild,v 1.1 2011/02/03 20:27:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.04.4.ebuild,v 1.1 2012/06/15 18:13:13 ulm Exp $
 
 EAPI=4
 
 inherit elisp
 
+MY_P=${PN}-${PV%.*}-${PV##*.}
 DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,11 +20,11 @@ DEPEND="app-text/texi2html
 	virtual/latex-base"
 RDEPEND=""
 
+S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 
-# This is NOT redundant, elisp.eclass redefines src_compile.
 src_compile() {
-	emake
+	default
 }
 
 src_install() {