gentoo resync : 02.04.2018

5 files changed, 27 insertions, 3 deletions

diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 77a8fa58c212..b346352e54de 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
index d88ce5bc37b5..c31755bcfccc 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
@@ -10,4 +10,4 @@ PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3268371a4f857a3536f0fea8e172043
+_md5_=679a5f9c0096e79f2cfd2977f3fee2c2
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.0 b/metadata/md5-cache/app-emacs/ghub-2.0.0
index d2af719f44f4..dc43eb882885 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.0
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=minuscule client library for the Github API
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/ghub
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v2.0.0.tar.gz -> ghub-2.0.0.tar.gz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=1d6d2eced04fee401c048704839d02dc
+_md5_=404e05b3097a1be5c0fe1338a08d1100
diff --git a/metadata/md5-cache/app-emacs/magit-2.12.1 b/metadata/md5-cache/app-emacs/magit-2.12.1
new file mode 100644
index 000000000000..df1d95201991
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-2.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+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 sys-apps/texinfo >=virtual/emacs-24
+DESCRIPTION=A Git porcelain inside Emacs
+EAPI=6
+HOMEPAGE=https://magit.vc/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=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 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/magit/archive/2.12.1.tar.gz -> magit-2.12.1.tar.gz
+_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=2d5fd850953fb7305aa00dc02a39b350
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.12.3 b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
new file mode 100644
index 000000000000..d693d963e536
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo >=virtual/emacs-24
+DESCRIPTION=Define prefix-infix-suffix command combos
+EAPI=6
+HOMEPAGE=https://magit.vc/manual/magit-popup
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/dash-2.13.0 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/magit-popup/archive/v2.12.3.tar.gz -> magit-popup-2.12.3.tar.gz
+_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=ccc30008513493e9a6bcf12e34f9776a