Version bump. Specify LICENSE more precisely. Remove old.

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

5 files changed, 38 insertions, 25 deletions

diff --git a/app-emacs/ess/ChangeLog b/app-emacs/ess/ChangeLog
index 08137047a45a..c37cf1036968 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.86 2012/09/29 03:36:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.87 2012/09/29 09:39:33 ulm Exp $
+
+*ess-12.09 (29 Sep 2012)
+
+  29 Sep 2012; Ulrich Müller <ulm@gentoo.org> -ess-5.12.ebuild,
+  ess-5.14.ebuild, ess-12.04.4.ebuild, +ess-12.09.ebuild:
+  Version bump. Specify LICENSE more precisely. Remove old.
 
   29 Sep 2012; Anthony G. Basile <blueness@gentoo.org> ess-12.04.4.ebuild:
   stable ppc, bug #428864
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 9e1793a2b078..ab6e3e8880d8 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -3,17 +3,27 @@ Hash: SHA256
 
 AUX 50ess-gentoo.el 58 SHA256 7f9d9fdb96fefa7c278d7a24e7c090754dcf818f2296867d3d25f921b5c7d46a SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808 WHIRLPOOL 7122ac4433fb2310d20fbb5269a473f535491e15c5be7109d2862c8a1be69837aac4fab0cf8e6a08e0db00b1f43ccaad6e9ae8a2b281b62a852d1b57adaebd29
 DIST ess-12.04-4.tgz 3280247 SHA256 c8ae9ba3db3ee98ca857a9ea6c82c88d92d4bc9115bc3f7e08c466920b5950ca SHA512 a3632fee17216059f83ec49ff2362b97488ffb2af6cff1e208f4ae309fd828a36f27d9476002790a3402838edea23b15934bf896c0384b61e54b83d208a91d99 WHIRLPOOL de584e164b28e331a4f0f1d2b7d4973fbb4c3dcb15d3fd0b4c76073bb6e52440876a786c0f33ca2480a670f9cb720f5b2ca2da334f976500e89b2d9c597fe484
-DIST ess-5.12.tgz 2983695 SHA256 8c0480e2e6de140b103b83f575997fa45a7b2ac3c61f6a80fd4d1e6bf74d0f6c SHA512 02788468553a9491bf828fb311101e82ed303c0f07e54e9e971a1836b6e69f1114c22ef2dc317f9a5dddcd84ed62226dcc4294197329b1b957f80501ed4e2590 WHIRLPOOL 27f6b936bcf9830526a1ad422906bd91044375f2fa12de88170e33d2ee39d46ce44e322ba744e8d68f903cb0e7b71ee2d089e51f558f8360df416cd96156db07
+DIST ess-12.09.tgz 3332863 SHA256 3167a84c9958605e9c1de7dc2dce564e22e89b79c9d1ba7ff7f66013af56f2b8 SHA512 652bac7965dfc594071a8cb332692522696930bce1617938a88835962a246faa6bcd1eb7ab0a340fbce71c2d93a8953ecf49dec684080635c0135c1db097d35c WHIRLPOOL 14c63d4397e635da5b7c5244ddc814c23ba494f4cdaa79081b35eef9c04c71c6c875c009518e9bd4e37f945c4a2b4f62ed27c93eebcfa65e090e03c77d995391
 DIST ess-5.14.tgz 7272065 SHA256 982b625f5c3f0e11d2cd8903e15026b5ecac6775415e8eb3cd120d0b9950dcc6 SHA512 b4a726f4565e70ac5d960a96fc1cb4780b966bc2845233e0369e1a3462c3728c27cece27c2f89b8b74936dcbe63770e50c58c07e30ac8ed890c59e6301e6eada WHIRLPOOL 101bf76fba513c0f370c396878426c97cb518a0a37da63686c2825a7c6cb6aa2270a78711fa1b56b3951b0da42e268ebd5f8741d2fde832ce0198c4f2d6017e5
-EBUILD ess-12.04.4.ebuild 1230 SHA256 c725b371a8a592dfa20272eb0c398a227680aa0ac0f4d561e874be6b0865259e SHA512 d98f2ba2ab891637b583a08cfacb28b8056eb94944bd0f153491fb4313088b823f6e6042c2a233c5320dcd7935b8abcad480635cee6614bc0eb5bdfdeb050013 WHIRLPOOL a5739ac90a965fe3af6f4cbe4c7022e452a45d4e46e0ad961c54ed6e2e3c582d0d7758292bb4084b5e27fc691645cf3621d76f2d2aa67290c2d983d2df0cc747
-EBUILD ess-5.12.ebuild 1277 SHA256 d5ce63d5b7416cecc4a9e60f6e2480d6ae5f360d622dbf25670906e6737da1a2 SHA512 7ab55733d54ebf0af3f25fbbae66676d96c63a77ff1b2ca3624c0d4ba63c295180bf1f6b0a9d3497afa39109ac003e5fc1f064f52b9757198b5e7087e05a0bb8 WHIRLPOOL 6cbb5135e8d4d4ff31532e45367f81690a8bdd932c4800fb76a11252b4268063be0bf11d26f8f26f8ec0858fd47fae50ce4943e52b3e3146e6bb786b8bd55b14
-EBUILD ess-5.14.ebuild 1170 SHA256 0d6eb613cca2a0c798e1c13cba8b9393eb9c80b8823c00b3019cd21d87faf5ed SHA512 a61c342e46cbd78273e718b2c883f1d082e728d09faec8461a47c2268b34fa0c108b7566a525eb45d30e4aeeefeff2b9eb9cd15f7d7a117bbcee1ecabeedac9c WHIRLPOOL 1fad0681441d39296820ec40d3ba876d68a13e3d6fbf2b7efc6cddb2cb8d3cfb1882d9c86d5a619e18fa37953c481f49c07707a6167187e83ccaccad961c59ba
-MISC ChangeLog 10862 SHA256 adfd68a67434fbeeb46fa5fea983c485e3811c73dfd591b8870a73c5e8e34e25 SHA512 0a784c16873113d11f3c09772ce3c3bba00b866286035ac4d8c32d104a1c58e618f1875185b728b9a022e0e182c1b65db254ffdd25198b741566de5bfd36ca09 WHIRLPOOL c2878a70f2f66689b99522e58d40b2c301449bae0ea6656566d4ee55d2b250cebf28ba7023c978031cfe6dd9f355298f4f485d7c5aff5b7373faea094e8a7f9d
+EBUILD ess-12.04.4.ebuild 1248 SHA256 3613b7ad2a1c2b3639b08420d5dcdfba7d5bd0e191686bc742ee69dcf8964d3d SHA512 19c0c824b7084cc76fff28fafc78b220fab91d73f779af8e4db4076ad9ce003dc23b57935809f17268aeef3bbde4e62eb4110087988e6fd8396b38f22caed870 WHIRLPOOL 8b77b24b081698653b19c1c2e16967eec04b0778dceb01dcb55368143077f9f2bdee1c0162031854bf9323fad80ba47aef10c76dc271e22a4b27799bfff4aa84
+EBUILD ess-12.09.ebuild 1174 SHA256 7f710edbcb6653b200946dc0d36c439b05a9a8492cb0ed885ec7528bd9d87d46 SHA512 31aab2d72cd1bcd28b90758aa2f7676a968d6cd4cca7fcd6508b76a14251d6dcb6516be4e8feda66554a596834ae8bb529551eb635c8851c16807cc04ed37a91 WHIRLPOOL 142ff40ff9670e877349638b61dce692607b5b5cd878a7cf7b690f69496d40dd1e7b907eb62abf9af36bbf4a0678daf908df2971cf520ca0f581c6fe4e115b68
+EBUILD ess-5.14.ebuild 1189 SHA256 081d03ac64e512a7d3dc3227276418788f3818725834666f019ee91fcf99f226 SHA512 d45aa207e9f9b5795e03cd481dde5318e2fc7cd3df0089d5de6f86244a3d85c2ad26557bf50402b5cf4c7bed2a03fa4b46a3de5fbdc35ae37a8eb11ae1939e57 WHIRLPOOL 4d9dccd37944bd011e83f5dc1b82abca5d27d97a0f9f0237719ca93b64c70cd81e7825c6b6435c8c6c17f2c2cdb5c7494ae7cb69b235413ada9417890ce1e178
+MISC ChangeLog 11067 SHA256 d1af92acf6c09859d2f471ff43ee17491a6ba7b558a9297cdaad8a807483bfaa SHA512 67b7fe5af662e123dbac997527ef75af1d1a5edcad928ba2bb055c57f338208ff8ca572ca4c7c84170068a1fe58744258dbbe9d6486650498772ed2f2ee6394a WHIRLPOOL 252ca85a8875441fda14f5ad52484acab7969de341f008ab4be23d0dbfd85739d8febe1185e08e431ddb04930c9fc3966f53eafb5efce078936ab0f35f8bd3c8
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEAREIAAYFAlBmbKEACgkQl5yvQNBFVTXiPgCcCPLWWxDY+lI95TH3hP91CBNh
-XU8AljLCegdvyd4jSdpLYcrK6pDBd7o=
-=Zo/J
+iQIcBAEBCAAGBQJQZsP4AAoJEDxpGckxwJCBDDUQAK//9Dt9VR7ynXN/hEa1yB8x
+YNXgVO4e9Z9n+rUB75PazlQQlqpXs/J87MDhQg/EUhbl9dpG4W0sX/ag+Qi8KuQH
+yDRCRH6J1NoV7rDz3tbyl9OTNwjdxpp6HmymUsmnOiTtudDNyLR23gsKlWRx2tFE
+k5iRP6/dyT3Xqh3inc6IXTFxowq3qQ8kI40V0Qk9ArlATgcTv4VjrtRJtZkO7oPo
+yRmZQlWljLVhWMbwfpAawHiFqlZTGunHjJAyno6vVdc0Fau1R5dFNFeAbIWOeyFF
+NtBWinbQN0L8BBYxkT2T2+KN0rPNyhVghMJRtChyLSzhJklNpcpPiHN8Q33b/fB3
+acdLoc6/hKoa31Dx4HEbeBDH4g9/u/anKOUwFB+G75+snSEtae6DG3wkxpjczk4T
+Ow3Fe9tjYj8XCWJb4kToYeEP2pPePnw1Ppu/S3OcKPoKqlF4w+r0hqn9118hBzkM
+dhQOInmcFDfoh4IiSh63d+i0wPtKZT8UpwMCBPIk+rSp1AkoFzS80XS3gRliStYa
+KNFiAkwfVbHilIS+t1gsFNhe9nQzysvMwwNxQJ9Gy8gNxE6cq5YFT5P+aOkeKogi
+RIRgvjy8lk/9VcKh6MxQF4iPw2XSA/Ek0pi6KZYG4xgXUB+N8XiZZVGpeFKX/4g3
+Ui1uH35L3XWU/MK3qDeU
+=m7wa
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/ess/ess-12.04.4.ebuild b/app-emacs/ess/ess-12.04.4.ebuild
index 81d65cf519f3..3b7446ea4c21 100644
--- a/app-emacs/ess/ess-12.04.4.ebuild
+++ b/app-emacs/ess/ess-12.04.4.ebuild
@@ -1,6 +1,6 @@
 # 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-12.04.4.ebuild,v 1.5 2012/09/29 03:36:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.04.4.ebuild,v 1.6 2012/09/29 09:39:33 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
 SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
diff --git a/app-emacs/ess/ess-5.12.ebuild b/app-emacs/ess/ess-12.09.ebuild
index 1b9a11dcaac4..04fbeb6e98d9 100644
--- a/app-emacs/ess/ess-5.12.ebuild
+++ b/app-emacs/ess/ess-12.09.ebuild
@@ -1,8 +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/ess/ess-5.12.ebuild,v 1.7 2012/07/29 18:07:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.09.ebuild,v 1.1 2012/09/29 09:39:33 ulm Exp $
 
-EAPI=3
+EAPI=4
 
 inherit elisp
 
@@ -10,19 +10,17 @@ DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
 SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="app-text/texi2html
 	virtual/latex-base"
-RDEPEND=""
 
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	emake || die "emake failed"
+	default
 }
 
 src_install() {
@@ -30,15 +28,14 @@ src_install() {
 		INFODIR="${ED}/usr/share/info" \
 		LISPDIR="${ED}${SITELISP}/ess" \
 		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install || die "emake install failed"
+		install
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 
-	# Most documentation is installed by the package's build system
+	# Most documentation is installed by the package's build system.
 	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf} || die "dodoc failed"
-	newdoc lisp/ChangeLog ChangeLog-lisp || die "newdoc failed"
-	prepalldocs
+	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+	newdoc lisp/ChangeLog ChangeLog-lisp
 }
 
 pkg_postinst() {
diff --git a/app-emacs/ess/ess-5.14.ebuild b/app-emacs/ess/ess-5.14.ebuild
index f28e43487d1a..6a181441c0a7 100644
--- a/app-emacs/ess/ess-5.14.ebuild
+++ b/app-emacs/ess/ess-5.14.ebuild
@@ -1,6 +1,6 @@
 # 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.14.ebuild,v 1.5 2012/07/29 18:07:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-5.14.ebuild,v 1.6 2012/09/29 09:39:33 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
 SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""