gentoo resync : 05.04.2018

7 files changed, 2 insertions, 62 deletions

diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index b346352e54de..0edaa33b4b32 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-wiki-2.72-r2 b/metadata/md5-cache/app-emacs/emacs-wiki-2.72-r2
deleted file mode 100644
index 6eb25ab403d0..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-wiki-2.72-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/htmlize app-emacs/httpd >=virtual/emacs-23
-DESCRIPTION=Maintain a local Wiki using Emacs-friendly markup
-EAPI=5
-HOMEPAGE=http://www.mwolson.org/projects/EmacsWiki.html http://www.emacswiki.org/emacs/EmacsWikiMode
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/htmlize app-emacs/httpd >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.mwolson.org/static/dist/emacs-wiki/emacs-wiki-2.72.tar.gz
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=bd1ceea5b4fd271fbfc69a9e249ef4b3
diff --git a/metadata/md5-cache/app-emacs/emacs-wiki-blog-0.5 b/metadata/md5-cache/app-emacs/emacs-wiki-blog-0.5
deleted file mode 100644
index fc9632e0390c..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-wiki-blog-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-emacs/emacs-wiki >=virtual/emacs-23
-DESCRIPTION=Emacs-Wiki add-on for maintaining a weblog
-EAPI=0
-HOMEPAGE=https://www.emacswiki.org/emacs/EmacsWikiBlog
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-emacs/emacs-wiki >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/emacs-wiki-blog-0.5.tar.bz2
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=bf13e985f8829e60b91c3a6bfba69903
diff --git a/metadata/md5-cache/app-emacs/javascript-2.0_beta8 b/metadata/md5-cache/app-emacs/javascript-2.0_beta8
deleted file mode 100644
index 9b56f07e32db..000000000000
--- a/metadata/md5-cache/app-emacs/javascript-2.0_beta8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing JavaScript source text
-EAPI=0
-HOMEPAGE=http://www.karllandstrom.se/emacs_modes.php http://www.emacswiki.org/emacs/JavaScriptMode
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/javascript-2.0_beta8.el.bz2
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9ba2292217e166625d51df46050702b9
diff --git a/metadata/md5-cache/app-emacs/javascript-2.2.1 b/metadata/md5-cache/app-emacs/javascript-2.2.1
deleted file mode 100644
index e63cc753d9fc..000000000000
--- a/metadata/md5-cache/app-emacs/javascript-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing JavaScript source text
-EAPI=0
-HOMEPAGE=http://www.karllandstrom.se/emacs_modes.php http://www.emacswiki.org/emacs/JavaScriptMode
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/javascript-2.2.1.el.bz2
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=7ec34aaeac42e29fe852dfeadc836d30
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.12.3 b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
index d693d963e536..cad2d5333e3b 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.12.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
@@ -5,8 +5,8 @@ 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
+RDEPEND=!!<app-emacs/magit-2.12.1 >=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
+_md5_=d947adf27f6360b2ec6830a474d730e0
diff --git a/metadata/md5-cache/app-emacs/mcomplete-1.10 b/metadata/md5-cache/app-emacs/mcomplete-1.10
deleted file mode 100644
index 9bbb9dc82626..000000000000
--- a/metadata/md5-cache/app-emacs/mcomplete-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An improved interface to minibuffer completion
-EAPI=5
-HOMEPAGE=http://bmonkey.la.coocan.jp/emacs/index-en.html http://www.emacswiki.org/emacs/McompleteMode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mcomplete-1.10.el.xz
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ecf7add6f49a63b1d0557ac0cbcfab37