gentoo resync : 02.04.2018

11 files changed, 95 insertions, 4 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b04b45972542..d6b2560c7955 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 9372090b8b9b..58c33257db6e 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 2881 BLAKE2B a0ea2ea78f87e85ab93c384e3b907ff1e83e88475963e234285d7f2e4ff3151f2216a987c5e826bb9ada3e7283f1777f99fe8349e2905e5c3c28aa33980af0ec SHA512 66e6abf850ffce638f54e93442840e787932614f7b2424adeb70034a134d2fd548284a0093bd5c90a20aaaa010f84d9d34bb8ba5706901932fbfdb022d71bbab
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2882 BLAKE2B ab454de8e5f8b8c555b60a2129865214337279c9082c3927c455c1bfbac8f4a1de3e2f56a9be3fd7f9a181cd7c9295ebe90a00a64d158991f3f6808a0e14c17c SHA512 f7e4f173fa3c84a7c91e38b6d94b8555483a5c91875a2d87277e4e11423fc162590d45376643ddea08806b4c76a849c09404da421fb693c72e0b6ffa13ee2d9d
 MISC metadata.xml 337 BLAKE2B 4eb067768aa32943a1e7c0cf4fe8444a64c41b05ce7397d088a2f38d60fc2a484d7df5d8b78761a836d647ad005babc7ee8404ea112f7884b8918863eea2b8c4 SHA512 4fca91d99b7d069ef8a7b1ca182f8eef738817b3ee9a2540549642f21574fefc70eee2f3e0e000c3ee860983a651470b5aecf1e126b2cc7465defd708e608ebd
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index cd5609e84a74..ce220414a0cf 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp-common eutils xdg-utils gnome2-utils readme.gentoo-r1 user
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index d836e4f0d9b3..889551609ccc 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,4 +1,4 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
-EBUILD ghub-2.0.0.ebuild 490 BLAKE2B a96add2961b13f3dfe3da9ae81223a92cc81e822b314379d5217e6591f4dcf323d38208d8b278f6094273ab901c72ed96f5b920ff445a43599b030e303450ac0 SHA512 8f4c91c9485dcb48253231006114a7f8112e250e296b89d752caee2d85fe9587941f27a35178d658aec29b56eb71d891154d35f147c91b154288b5c7fcfd21fb
+EBUILD ghub-2.0.0.ebuild 491 BLAKE2B c80d78142751618b9ca62759099663feae8c8ee73f7aa2ced2cae9e9e9840a04a17b6406ae392df2a2fe53b458aa1d04fda0f23f395c0c816d2e455de28fc131 SHA512 4506d4292a0ac7d0fb3a5ac8bf133e0e5b598305b5edff4a8f30746481e5581beb59fbfe475a97453c3dca9f4be95e1c181e0cc75634c76cf2813f9a8d11cca8
 MISC metadata.xml 1273 BLAKE2B d1248c9061827cfb587b5d4a54ba5aeaba5be8302bc1a2f11252b9fe0946d96ce292f01983a2e82b23008649ee44af169d570a3226887fc22852edb022d1608a SHA512 e8161b23fd2310b303508c80c6af7b428c77ce2eb594bc3bd52b71eab874350d8f8920fa7e348fe48b5f6302fe6242665724dfbe83e308ee5e9d0e8813f2dbf1
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
index 4b577810fe60..86b8b246a84b 100644
--- a/app-emacs/ghub/ghub-2.0.0.ebuild
+++ b/app-emacs/ghub/ghub-2.0.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="minuscule client library for the Github API"
 HOMEPAGE="https://magit.vc/manual/ghub"
 SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
new file mode 100644
index 000000000000..44d6ae7ef248
--- /dev/null
+++ b/app-emacs/magit-popup/Manifest
@@ -0,0 +1,4 @@
+AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
+EBUILD magit-popup-2.12.3.ebuild 565 BLAKE2B dab3675e63c5c51a565a33a05e06cc045ba3a0f31414bd801da5ffab1766713e62724117cd80fcfd64f813499c7e7ada9d1ff6f3572a72ef1dfc1ac27f249eb5 SHA512 fffc8dcc34242f066b58a6a833c0e720eab0f016b6a060c230e3bd3cacd851abadd96180de4872c171b067f4d7816a8320c766ae993f55e610b761a5a3f695ef
+MISC metadata.xml 1147 BLAKE2B 68fe5e7240434621fe4d1148e8f05d162771f8c90123790d757fec03d3c54dd686630860eec299371bf2f5356e0b8880a8ec46e1c7bff3d697d477fc095f58e1 SHA512 1e1aac2080140c50012bb3e35cb62c53fb782f9ac3041df3b7d1f8c86822bd7eba2f773c65205a58c65c791a095fc82bd39265dd05cdff52ace51e38a58666e0
diff --git a/app-emacs/magit-popup/files/50magit-popup-gentoo.el b/app-emacs/magit-popup/files/50magit-popup-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/magit-popup/files/50magit-popup-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
new file mode 100644
index 000000000000..2a8b77e6c533
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Define prefix-infix-suffix command combos"
+HOMEPAGE="https://magit.vc/manual/magit-popup"
+SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+CDEPEND=">=app-emacs/dash-2.13.0"
+DEPEND="${CDEPEND} sys-apps/texinfo"
+RDEPEND=$CDEPEND
diff --git a/app-emacs/magit-popup/metadata.xml b/app-emacs/magit-popup/metadata.xml
new file mode 100644
index 000000000000..ab63c931bf35
--- /dev/null
+++ b/app-emacs/magit-popup/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+This package implements a generic interface for toggling switches
+and setting options and then invoking an Emacs command which does
+something with these arguments.  The prototypical use is for the
+command to call an external process, passing on the arguments as
+command line arguments.  But this is only one of many possible
+uses (though the one this library is optimized for).
+
+With the Emacs concept of "prefix arguments" in mind this could be
+described as "infix arguments with feedback in a buffer".
+
+Commands that set the prefix argument for the subsequent command do
+not limit what that next command could be.  But entering a command
+console popup does limit the selection to the commands defined for
+that popup, and so we use the term "infix" instead of "prefix".
+</longdescription>
+<upstream>
+  <remote-id type="github">magit/magit-popup</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 5d23934658a5..e8369633b2cb 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,8 +1,10 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
 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.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
 DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
 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.12.1.ebuild 840 BLAKE2B dc663e17d4a680a69ba19999eb730ef270381baf8b9da2db9733c9817d85e63aaca916ba5d67666fec738e79921f04400a8772096bb490690ab051efaec20b8b SHA512 4c0b3fdff23aa8e09eec41f722ee83ff0aa0d99a24f5bbdf97747e5c4829276bd525fbeb2f71f7229c4a1676b436df241f0bc80a971325e546e6012504448e4d
 EBUILD magit-2.9.0.ebuild 778 BLAKE2B 7063541fafed02cade386a4bd478ce701cde7a81ef05a8b754d5505a17f499e64e2eb5d22ead97cfa4ef034aff548b066492688a8cf692bda39cef66409cb415 SHA512 fe3858a40518be189a482b9ee146cb3154c98ab053379c38aa00528a4908a25a4e48a182af22b8c604497fcbd6fa1e508e05826c55e596686a1a1f2bbe6f262c
 MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-2.12.1.ebuild b/app-emacs/magit/magit-2.12.1.ebuild
new file mode 100644
index 000000000000..8290bab91243
--- /dev/null
+++ b/app-emacs/magit/magit-2.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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/ghub-2.0.0
+	>=app-emacs/magit-popup-2.12.3
+	>=app-emacs/with-editor-2.7.2
+"
+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
+}