gentoo resync : 09.12.2017

4 files changed, 1 insertions, 77 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index b26930a55550..7fdd5619126e 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,12 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-1.2.2.tar.gz 111245 BLAKE2B 357da63085cfc934eafbbef3439880e12e9baac1e47be08e30803b9c51fba7cc6ec616fc2996da6795e95d331e71da8934a107ccc661b907550f33eabb99d17d SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a
-DIST magit-2.10.2.tar.gz 429389 BLAKE2B d197a1d4ad2e6dccbe693ca9daf44cde91d276cddc8b9d07f13b12c907afe0a2a7591419f909ddeb1b8c107ce8a529d562a0a4cdd1d2f888367a1fb552d2b4fe SHA512 3309824a4a9fe36316912911f53a1c9aa8f93230b6461cf4bbcb9cdb38d474ba59c8450fe1722155959c8cf5610358ea9ec28723cdbbce226219f4cf1c5c4bd2
 DIST magit-2.10.3.tar.gz 430343 BLAKE2B 61afda0c50ca315d1d601ddaa2b6df2425a83d6dd3f501f5499df446c8498db0846d2ec58c7f1760933c0d05aec89d4b39d2ea19297f1302a156a97e29f3bd0c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b
 DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
 DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
-EBUILD magit-1.2.2.ebuild 963 BLAKE2B 359c48bad7d830b2dd216c060037ad24561e1a8b86d1cecd9008ea7216c5eec535b54d7822c088589bc7a60c007ee579970731afc47c315293b2abae3adfc393 SHA512 79b0043d61a13f864161e32f17d5ba70b4b6fbfdc7048e1cae961263db9a1cb6a3526948892be764e424f5f9204528e48a8f1e8e8c9ee451682eba63962d1776
-EBUILD magit-2.10.2.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
 EBUILD magit-2.10.3.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
 EBUILD magit-2.11.0.ebuild 780 BLAKE2B a58e4c563246229c6e4af405cdaf2ab942a0db2668448e901587ddde4147a6534b2cc5858bf2808ec7241ea6564984680b05f928ce3b94483277d5d7d0eb9b24 SHA512 57ed8420a3975533c6129552ef47b659a198d70c5e243ad61494b3063c1d44473e537359703e07eebf2ca156864f62968d701523edafe71c0c81c2d6a58f9fa5
 EBUILD magit-2.9.0.ebuild 777 BLAKE2B 3066d0e3371b223b9c35f9b2c7a0f8308c3161bb73366c17efdd8acb7e34758d39fcb85c06b1891b381568967786dc14daf24be1ef7e6fcc265afceda3f47755 SHA512 aea7c664589a504e34c74c04e670e246eebab93c737427161e1c58efb3a7567a64c02677e81d8ae71a773157c81a874b0668dc01126cf75063dc3c5e55e74fda
-MISC metadata.xml 862 BLAKE2B 14901325b1ee6be308f12ce4f2c9554f615ca4faedb2d4d72fcff64809c08586dee0964e7b449218e8b82852f1095de298d704965d22927d0ae997ffd0841c8d SHA512 5dacca3e525b1f0f202aaae561cceea3a6cf9e9bcf0267bfb6123dd599b7bacde28af324a31d4399b700213e980f02395a7ec025408443702e762afde52eaec0
+MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-1.2.2.ebuild b/app-emacs/magit/magit-1.2.2.ebuild
deleted file mode 100644
index 01a953c9b50e..000000000000
--- a/app-emacs/magit/magit-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://magit.github.io/"
-SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="contrib"
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	# The upstream build system ignores errors during byte-compilation
-	# and happily installs broken files, causing errors at runtime.
-	# Call elisp-compile, in order to catch them here already.
-	elisp-compile *.el
-	emake core docs
-	use contrib && emake contrib
-	rm 50magit.el magit-pkg.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo magit.info
-	dodoc README.md
-
-	if use contrib; then
-		elisp-install ${PN} contrib/*.{el,elc}
-		dobin contrib/magit
-	fi
-}
diff --git a/app-emacs/magit/magit-2.10.2.ebuild b/app-emacs/magit/magit-2.10.2.ebuild
deleted file mode 100644
index 490d7199ec45..000000000000
--- a/app-emacs/magit/magit-2.10.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index e70190457704..122cc974266a 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -15,9 +15,6 @@
   support for cherry picking, reverting, merging, rebasing, and other common
   Git operations.
 </longdescription>
-<use>
-  <flag name="contrib">Install user-contributed files</flag>
-</use>
 <upstream>
   <remote-id type="github">magit/magit</remote-id>
 </upstream>