gentoo resync : 08.09.2019

5 files changed, 62 insertions, 2 deletions

diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index edaa24b1e5d3..ed26c60a2cde 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1,4 +1,8 @@
+AUX 50mediawiki-gentoo-2.2.9.el 410 BLAKE2B 805a4fb5639dd443d2a2da196ec95d1c22644ffcba68687d82dd0822c79070f19ce83c2a2979cfa64559d868d847967f8bb6c19e5909c182cc53f9ab47c26ded SHA512 8915b44c0f01f6cdc0c9c2badb84b59ef4ad10e8ec30f3fdf7331ce37386ae3152f7e851cdc6dd4540eecdfdd672232eeae295a208994e177a3485e535dc00db
 AUX 50mediawiki-gentoo.el 395 BLAKE2B be76f989906bd8c6eae72257ebddeeaf1dc9eb6ae45488e7afcaa73a1a173800a83510bbd683a172afd2597b7173f8e4ceb7cfab910c0ece77c76833bd85a055 SHA512 579680b31ffb86b68e1ccc8c7f4969860437a34bd2cc308cb9400ea861d313c2b2d538412eadbdff9d56ddfdab8f7312dc8cb97137a6c8c2707ebce4437c7b79
+AUX mediawiki-2.2.9-user-agent.patch 1138 BLAKE2B 283c88605aecb7fcfaf9883f4c3926036281a528fee133db1e4a43769ed7e98d0f996b6ec9313a6d62df720bca10586af18b7a9c2bc7a3bfeae301d90050d441 SHA512 0f30bd86e4fac425b98822f1e18bd98b71fa69bafa34d235a8aa380f2588f26958bcace8c09490a9fdf8dd28d289263cb98b3d7f2e67fdafa5e8822d2c76cead
 DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
+DIST mediawiki-2.2.9.tar.gz 36595 BLAKE2B a044008115e545d043045e943762072981b5bcc7776e5f38480a2170168929989b990d90b225f3416a8ce9052d3a310bb77ac6ac1d273f112180ff2bddeb850c SHA512 7586558b953c3e2a41b792db55ba9b3520b07377a555c2dd38829c0be24f3388313dfaa049520c632d6fd3a471cb777ba662f723c56cd59c307b68faf9d8adb0
 EBUILD mediawiki-2.2.4.1.ebuild 357 BLAKE2B 5bbf3c1758797c4258d1eb842a9a37e4b3c9444db03de4f0c3476d9928de28b221716ad21564b775aba21a735488616e059a45c6a6639374fd1e550308f4a834 SHA512 726db4d0cad4bd04b56028bd37dc3ce5db8ffe89048292aa81691ea89cd8d24b4a4e4baf997f25489e490a902b7a2b66a1abbcfba47127f89886eee569da02c0
-MISC metadata.xml 360 BLAKE2B a8bea1d7a9c2b71040527e427b6924d7df89d8e68a5d11cd6cfb63b545355049ea059d5245d0289d3a90ce096cf8908bba0d854e04e7adf4d13deb6fbbcc85e1 SHA512 3e148d922f9e2828274c0f721663520a5526dbf36e5f3e61b3423a833c3bd5cdbb9d4b0410a35fe8d8c3427d9a0c1af2f3f4a304e5504b1a6ce411735b08413a
+EBUILD mediawiki-2.2.9-r1.ebuild 497 BLAKE2B edb3202fc0e08c1b0b100adc92bfe5d73bff0944aad242621608c0c97a241a5844227bb2562e9b97d4d1e6ce8b499884420d93e4091e5af203829a70d53c0a57 SHA512 e4c0626db03acc3af971e64865fa6d78bfc6a53e253c3816b947dff1e03ad231985cd631f41b14c12f99b68fd23d53d56559d461f51c3b78cf409e1c19b19838
+MISC metadata.xml 365 BLAKE2B 3c775b4bae44a5de7e5604d331bb1a01d926b2adea8ee9e83f37a5d5eebaa415dcdd5182aece1c41f0f69a15f931673bb48bdb90d83b431213f2cec8fa29306e SHA512 7d449d74ac37095df97f257e323c5362e0e2fa15fb573de53988d73b4941ffe0a876c59548b2f1cb244554904097d71a7bc293914fa8e7c66f4f844d7ab7ad87
diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
new file mode 100644
index 000000000000..cc9c5b714fb3
--- /dev/null
+++ b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mediawiki-open "mediawiki"
+  "Open a wiki page specified by NAME from the mediawiki engine" t)
+(autoload 'mediawiki-site "mediawiki"
+  "Set up mediawiki.el for a site." t)
+(eval-after-load "mediawiki"
+  '(add-to-list
+    'mediawiki-site-alist
+    '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page")
+    nil
+    (lambda (a b) (equal (car a) (car b)))))
diff --git a/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch
new file mode 100644
index 000000000000..2d64e410b9e0
--- /dev/null
+++ b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch
@@ -0,0 +1,25 @@
+Fix "(wrong-type-argument stringp default)" in url-compat-retrieve.
+https://github.com/hexmode/mediawiki-el/issues/27
+
+--- mediawiki-el-2.2.9-orig/mediawiki.el
++++ mediawiki-el-2.2.9/mediawiki.el
+@@ -414,10 +414,15 @@
+ POST-PROCESS is the function to call for post-processing.
+ BUFFER is the buffer to store the result in.  CALLBACK will be
+ called in BUFFER with CBARGS, if given."
+-  (let ((url-user-agent (concat (string-trim (if (functionp url-user-agent)
+-                                                 (funcall url-user-agent)
+-                                               url-user-agent))
+-                                " mediawiki.el " mediawiki-version "\r\n")))
++  (let ((url-user-agent
++	 (if (eq url-user-agent 'default)
++	     'default
++	   (concat (string-trim (if (functionp url-user-agent)
++				    (funcall url-user-agent)
++				  url-user-agent))
++		   " mediawiki.el " mediawiki-version "\r\n")))
++	(url-package-name "mediawiki.el")
++	(url-package-version mediawiki-version))
+     (cond ((boundp 'url-be-asynchronous) ; Sniff w3 lib capability
+            (if callback
+                (setq url-be-asynchronous t)
diff --git a/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..62d903056419
--- /dev/null
+++ b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="${PN}-el"
+DESCRIPTION="MediaWiki client for Emacs"
+HOMEPAGE="https://github.com/hexmode/mediawiki-el"
+SRC_URI="https://github.com/hexmode/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+ELISP_PATCHES="${P}-user-agent.patch"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README.mediawiki"
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index ea38af629394..29a48e65d922 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -7,6 +7,6 @@
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <remote-id type="launchpad">mediawiki-el</remote-id>
+  <remote-id type="github">hexmode/mediawiki-el</remote-id>
 </upstream>
 </pkgmetadata>