Cleanup.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 11 insertions, 76 deletions

diff --git a/app-emacs/magit/ChangeLog b/app-emacs/magit/ChangeLog
index 789ea9222e5a..2e1e27ee2403 100644
--- a/app-emacs/magit/ChangeLog
+++ b/app-emacs/magit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/magit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.9 2013/01/31 18:22:21 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.10 2014/05/05 07:13:17 graaff Exp $
+
+  05 May 2014; Hans de Graaff <graaff@gentoo.org> -magit-1.0.0.ebuild,
+  -magit-1.1.1.ebuild:
+  Cleanup.
 
   31 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> magit-1.2.0.ebuild:
   Keyworded amd64-linux and x86-linux
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 34acf5be8e71..a127815f2a2f 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -2,18 +2,14 @@
 Hash: SHA256
 
 AUX 50magit-gentoo.el 77 SHA256 f3c97d1e80e018ed8338bdb9d1f7a0b8be54ad3e84a590680c2bc0422dc3caef SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 WHIRLPOOL b84bb8d7ca0343774c19c7d604778cd7d01fff37a0d5cc15696002ef335f2acaad21a96084e86d539b13c2a4f589a20b83099170d2a0bf8a67627b07ba98cebc
-DIST magit-1.0.0.tar.gz 60561 SHA256 f87393137f2ddf814dd79e31986289a00357fa479774b4c3b0f19bd440a2cdc1 SHA512 527cf4799c183a4b928f4cbf0e81e8933d23291b2dd4a8a94d1e408126bf0e4c6cd36cdbfea928d0b976b9311f7d9497428bd2035b5fb8a4429e9804e0906f51 WHIRLPOOL 35ff3f1c23c30894ac337cb3327da08096a92010a91d673fdb36c7cf347841bcf1ed065e01b03f3c33884487fc210b06bef8e01b5307a0d356d189f4e8c1c40f
-DIST magit-1.1.1.tar.gz 97241 SHA256 9ffdfddad0023262df6e7ff90a15a3f170e1a8127c9cec848d54d57b63c7e57e SHA512 2a3cca13ddd30fac5bd72fd24723b4cb91ee4ab77d6bd79675d699592dd58eaa55cc388cd3c9c6f89aa23c690781193d093a20247539dd0953e876cf93aadce0 WHIRLPOOL 2fa2670f4eeb56b0a648de99777a228e957d9942c561fd7333add5a8c8a59c814c61f01aef00bc237610e483f738a3846b8f268e401d5e8e21feddd3f7f3bbc3
 DIST magit-1.2.0.tar.gz 163318 SHA256 ef535819b8ee32c53ad38efabc82028f62422f2629407d69ddc5970669dc1ba9 SHA512 3f673d38d9f73cdf653108184ed97c1d499492224be3925949ffadb3bb6900a9be664c773dae49da696c6e1daa8bbb70d7446a9f9d7f9a7f8714ca254ed02c3d WHIRLPOOL 0462ea59ae75c01992d6d7dd17783ab4c60c335c17e03a8791be0771caf54d6a546a84c0622f2c1d45d1231a8d2638fb936bff31c94aa08a10d2c98e5986e4a4
-EBUILD magit-1.0.0.ebuild 683 SHA256 643663434a17661cbfea9f127e3932c28108fe7db7d5b5cd0d6d36deadaec3e7 SHA512 7dee5420aa3fe43cf7011bfeabec5a406eed3ef205c9536881ccb6c9ad67d10b6c0956d469d9db58ebd4f117a5844cd150232d9d0cd175d2d7551b6762d88f22 WHIRLPOOL 323c18b36a00f18ea8171cc0de21d22a2062e5fc0cc95423da1b204d3774a9bfdb9404aeab26ff52595c2325cf4bb1b8f1c29c796c0c4e2e3e10db20950130f1
-EBUILD magit-1.1.1.ebuild 854 SHA256 40a6a01aa4424c3d1f50a46ecd18f4551cf662500a1626c90e23fc07be82c688 SHA512 42936180f6a86a4d197c02a7faba7e00e21747c73af176d1e023ad9144f2ee9cbd9c607c7a54cdbdaece6a1822612560256ff320d4f4ae0fafef482f4742b3f7 WHIRLPOOL 74ffc89f908b6f22a1be1917f40e85d834d8c775b332d69a9250c02bc013bbf888b28ef46d1117248422741d7e5a3130307764b4161288040d393eb413dfcef8
 EBUILD magit-1.2.0.ebuild 860 SHA256 9fa9e8ceddcdb6a8e5496385c7ae05641b30f14f67f57162c14b9308d596dce5 SHA512 5ea51eb105135beced0ea91d069190cbf0ae1ed56a3c7af6db159f1b7d8824778757683cf33d7000dfddf7208045d67bd7de871e68acfe2c5cf1d0cab2299e46 WHIRLPOOL cd6f234af85b438306309641fcf9fa39ed3384b5e3aff818df79dc29e88cd697a0a5b3bae30eecc314db498bdbd07e25c0954cb797eb018d3b66288f46a91c6b
-MISC ChangeLog 1582 SHA256 5605d9100f2880eb3908773eb01fff9d68274ea8e0514005883637f39f3d93c8 SHA512 4b56a7ab6495a89b889f1caa4e89b6b0f6ff22cd776c271d86d032231b6edded1f6500ec60fb6d31a8f48d9fbd070aa2cd7c5e278e2f2ccce1909085947aa0e7 WHIRLPOOL 6b8eb0c614ccddbc55c43735a933aa25fc759e13413292c30014c80e27b7fdb937160ff3206aa5ecf4e9812695b525e1cce838903bcfa3ea6af47a32762e93a3
+MISC ChangeLog 1687 SHA256 7932a80b0a62631e04185e8d4e5a4ce8177cd5291b1f4414106fb6dc4d1434c4 SHA512 e55a22b7642bacd2b3ac60a3ab9e51f854cff8b7cb2999e3938f0a1129136c1c6048db63744ed9b35d47eb851d0031c36802f5e0f273b0bad4deb9342bf2c3ec WHIRLPOOL 64afacce4dfa0c7917d7a8aee99a1db756ee26c9f807d7b0f74b221bdb84cf6d862ea8b36bffe2671760df8a81d4b3f7e841e8d9aca933a10f8bdc7ef85e40d0
 MISC metadata.xml 687 SHA256 fb8fe91baf6aa372bc0b888f7f1714cc8b315a8c51f19406981df02840a33399 SHA512 3b455d672fff7a9d8142cb22284863e545246ed940223b4b714f40833c358cc188ac1764dc355a7f23a37a890d4d89a2d6734794baf748e0a35470deddc2befc WHIRLPOOL b86a97a4694c65936518b9caf8da015f6b123e1d6df9384d3b4f1403305cc409f224804c34a6e04469d322da81ecf3bfa1ce741fb2fdd5789ee09d58f79d255f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEKtl8ACgkQ1ycZbhPLE2Ao8wCgptJ1NSoCD2UXhxmYiMvUBDPB
-c7YAnjPKemXd990wDKnMv8ZDaInWcloW
-=x1A4
+iF4EAREIAAYFAlNnOhIACgkQiIP6VqMIqNeSlgD+Mar3+jzt/9TqKejkfitNe4Yk
+cdIrDveZPOLjaWYm0LQA/3/EvkJAMiJqeow40EVP5fhmnCWxvN+2lh/uzlEzyDwp
+=F6LR
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/magit/magit-1.0.0.ebuild b/app-emacs/magit/magit-1.0.0.ebuild
deleted file mode 100644
index c612fe26c6d3..000000000000
--- a/app-emacs/magit/magit-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.3 2012/11/26 11:31:15 ulm Exp $
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://magit.github.com/magit/"
-SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50magit-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	elisp-install ${PN} magit{,-svn,-topgit,-key-mode}.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo magit.info
-	dodoc README.md
-}
diff --git a/app-emacs/magit/magit-1.1.1.ebuild b/app-emacs/magit/magit-1.1.1.ebuild
deleted file mode 100644
index d1820646d88b..000000000000
--- a/app-emacs/magit/magit-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.2 2012/11/26 11:31:15 ulm Exp $
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://magit.github.com/magit/"
-SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib"
-
-SITEFILE="50magit-gentoo.el"
-
-src_compile() {
-	emake core docs
-	use contrib && emake contrib
-}
-
-src_install() {
-	elisp-install ${PN} magit.{el,elc} \
-		magit-{svn,topgit,stgit,key-mode,bisect}.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo magit.info
-	dodoc README.md
-
-	if use contrib; then
-		elisp-install ${PN} contrib/*.{el,elc} || die
-		dobin contrib/magit
-	fi
-}