gentoo resync : 02.03.2018

3 files changed, 11 insertions, 30 deletions

diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index cc01e5cca76a..7218f286dc8a 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -1,9 +1,7 @@
 AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91
 AUX markdown-mode-2.1-text-auto-mode.patch 833 BLAKE2B fb0eade55f75123e1166fdc4b59199daf5fd58771a8aadaf890220d84d844657d9f2b3b87c2f5f1db31dfd45042f404d7b4dd248e4d6ce9fc5937579cc21a126 SHA512 72d1206398d3f72a35c20e14f267bbe1419102f479feff55d80054309ff7e7bce291dc50b6e010a34f435f9fbdfe249261f8ab073c986994160f91ed5bf8a8ee
-DIST markdown-mode-1.8.1.el.xz 18152 BLAKE2B 38d41ffc9fa22db0b31a0f6fa9eeeeb8beab5ac519a737f2e0de926f736a40c6570d3a98097a90b347b16569e2d191cb1cd9e630bf1a9071fa7939a0f88f2c5c SHA512 1e679a409fa5a7f6f622e4a554d74ea1820ba1e82eb77d3ce6b33d5494350232a2b165c9f002a076d4ce97138584381938d5c2ccac4161131ffba82da5091946
-DIST markdown-mode-2.0.el.xz 39508 BLAKE2B 723d3762584a9723851f7dda63f172a5d495bd8c967538bbf9f2b3b2dacebc31ee3369dde1d8bfc288419a585e9f3a66382fc3e35de143618cdfd5e5cd77010f SHA512 eaad1561c5a84f47cd07318f0c80454d28a59becc0372453ec1412511879335a5717d1531895fe969c5d2fe7a4aac5a9e55ee727dcee621ba203737ca9182f3d
 DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
-EBUILD markdown-mode-1.8.1-r1.ebuild 603 BLAKE2B 53bf4a034f1597970bcaa2924f1c485c6d5ea590158094e4258752fb7152496ea1fc7b0c7dbcfcd4f19c56143a7af27710ef7d716e89adea43b53cf667a702af SHA512 8a7b5183622c69b9bc74c0ac4365b1d44bcdcd14abf5f0b0f98934d1e92e38ddfda2326d233b649664363204f47bac02f1d4034fb1d645af0700482079806a92
-EBUILD markdown-mode-2.0.ebuild 614 BLAKE2B 165da6cd3842ab9b2aff35ff478f4b5d5a613d89a30c40178610e12d1fcd0cf2beb8f4a5309f46ff6a42e22a5bed986689673a1ca50459e51d14437d0b76fdd1 SHA512 da6d14eb173ca8e285f74f41ca37e51d4df99d96e4bd4b09fc9d2a0b5229acfa42a97a4fb35c167d36fc7a56070e284a14ac78c47aa8f7ddbae0839f9d27eb7d
+DIST markdown-mode-2.3.el 387130 BLAKE2B acb583126a6f952835537f9e386df5f9a8fda5e49a14520e153c0cc99fc58cca596607b282f9f7070b001fe8165d50adb9abb81de1b03ae102cf2061de587810 SHA512 0820c5ae585e0f5ee8fef9eca40f2de2ad632a2559ea7f447cd19ded592de38bf2f3df8491796c15eb06723fe2af904335535af145356c7a7f9f855612263aaf
 EBUILD markdown-mode-2.1.ebuild 656 BLAKE2B b9f8506be2cf90606894ac35871114b1da8b4efd9d21a187f6812d33a0f7a6161440d6781a30cdfba8b15c8d3532296c2276f702c82b342f0c2a348fe2b76647 SHA512 5da9fda79af6213b5afa30ac58dfc0664f438ac027b840d0481a5637e5b72750b461e57f8f3ecddbe68391f279b1745982b6981003238090a8422c3a088e88ae
+EBUILD markdown-mode-2.3.ebuild 543 BLAKE2B 5a0db7733ed5732eb1d55d20ddd4c442f48100c20491b4ae0549e649c2149547874abb84f3a533909240f82807069f62860644051047e8a4098c2ffcc8141394 SHA512 01ee142416e8dca685096b8800afe8be8fda417723f83c8cc4fc324a946812e0262ec862b9069ca647d40b6210dcb652c40b311a8ee9c87fe5f5856744bea17d
 MISC metadata.xml 334 BLAKE2B 4abd21d2b0abe4bbda4124cc1b01958f9f2f6827c4c314ff65af0d5e8a30225ee3833ba4280e1aa751c34877761d2766ef19da87d66aad55477feb408b757f31 SHA512 ecfc070c0dff8968e5f2e5249df488fabdc76efc0493bfa8c6dfa9f4a296ddf0785ba23ef2a36a0093cdd39d225fb38da18d574b6a929c29752328c6b66a62ed
diff --git a/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild b/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild
deleted file mode 100644
index d41dcd70957e..000000000000
--- a/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
-# Cannot use this url because its hash differ about every five minutes
-# SRC_URI="http://jblevins.org/git/markdown-mode.git/snapshot/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.0.ebuild b/app-emacs/markdown-mode/markdown-mode-2.3.ebuild
index 3880042fb2d6..150ec1a5aa7a 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.0.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,10 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
-# Cannot use this url because its hash differ about every five minutes
-# SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+HOMEPAGE="http://jblevins.org/projects/markdown-mode/"
+SRC_URI="https://stable.melpa.org/packages/${P}.el"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,4 +15,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
 
+S="${WORKDIR}"
+
 SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	cp "${DISTDIR}"/${P}.el ${PN}.el || die
+}