gentoo resync : 15.02.2018

9 files changed, 46 insertions, 51 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 348cd6a24835..b7f5d8b20acd 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emhacks/Manifest b/app-emacs/emhacks/Manifest
index fef8533f4335..d69717d1bef0 100644
--- a/app-emacs/emhacks/Manifest
+++ b/app-emacs/emhacks/Manifest
@@ -1,4 +1,4 @@
-AUX 50emhacks-gentoo.el 899 BLAKE2B 856a2b253720b43ea16bb17dcbff3b8face07cb9096276a43ce28ef7a8be30b2ce3e65e87fb71ebf44ca26607f8bae1c4ae0b65dc1ef80af7a7d4be1b6b85399 SHA512 aa71cfe32373ed3f0d9b71ee83f1084debaafa22f73c4a0b810e1209ff4352c1aea48e7fec839278f27806d7a2d6cecb3b8232470c8fc257690f0a48e079fda1
+AUX 50emhacks-gentoo.el 785 BLAKE2B 90811c7d1acdc25a1a2a430af1ce8a8bfe9845042f22b6043208dda87a1ffad5946f2ccf04036bb9b1aa433de6f03d09de911b5ce5e1b29d2ec773bc76b96825 SHA512 80961af6c9ba24ab964214e68d464ac88b2c88894b069b90f7041dbbade02c96b3cb2c60876f90134882a4984386a73ff23ebc785c19cd18a11e6b424c2a62ff
 DIST emhacks-20070920.tar.bz2 71232 BLAKE2B 82c80bc41daa37868fe6376461df9cc96ee6d5db1b5e4a2e6414b9cd114fe57f3f5a226e82d2b9e5ac7e42a84faea585fa18621da5c7db4181334fb8db73cc9e SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1
-EBUILD emhacks-20070920.ebuild 935 BLAKE2B 5e2dcbd44b4ce919b5945e3d6e5f0540d0d42253ae24b8d16a8d1c184ab069500490e09c0425fb1c379cc32c9e1b1df70abb27bb8b298299cd3e387298e9ad9d SHA512 400811049928dec6d112e87dc179882599ed9d2115ec4120255c3553e610edee81a3c1872f84080e1637d8a6488060e22f39f34c9c7c9d19a13d6844f680acec
-MISC metadata.xml 824 BLAKE2B 4167f330c53e9433f3e5143ed586396704ad5fa32c2acef5c22537213d7cea3992d99fa97b899342f46997674814228e629fa54f47173ed24561e80bd911740b SHA512 40cedfd1423fe284874092f6075c4d234c4c96f2ef617f36a8e1004f1d382255e31e6ade9b59b3e0132f44e2fdbe510fe47f53789234fa5a098fcaddf9370e7f
+EBUILD emhacks-20070920-r1.ebuild 636 BLAKE2B fe44df7b58e6bd82f832cd4764cb0853b73c2cd81c9d17b659535e1d6c7c77f0e3d81e4decacbe0409b5ca23c52ab9a662efa9b5265a9cffbe1da0bb9c6acf70 SHA512 ac9d715f9671d97799d7baebd5553d4014cdeebb46039eae19263a13c8786ec763b6348a8d79f88b5db0dbbc79316dc539c4ce15e30b073ac656da6e4b7682da
+MISC metadata.xml 737 BLAKE2B 0692d8cde646849a08a2ecedcac9f462f60cdb2e7b04822015f9596df0ef619402691b4f5b5800cb1f32d4b3934287f44b94b41207562d60a031c4063ed7cb31 SHA512 881a59ee9c46825a86254c4be3eb9e75a3486c68869f705e123b49097d8faed3e472253a74e6f0da9c1976fbdba1623ba6f0d128838c0882fe5f970043a4c269
diff --git a/app-emacs/emhacks/emhacks-20070920-r1.ebuild b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
new file mode 100644
index 000000000000..3fdd0d1d1b1c
--- /dev/null
+++ b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
+HOMEPAGE="http://emhacks.sourceforge.net/"
+# CVS snapshot
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="Changelog"
+
+src_prepare() {
+	# remove files included in Emacs>=22 or not useful on GNU/Linux
+	# remove jsee #642588
+	rm -r findstr* jsee* overlay-fix* recentf* ruler-mode* tree-widget* || die
+	eapply_user
+}
diff --git a/app-emacs/emhacks/emhacks-20070920.ebuild b/app-emacs/emhacks/emhacks-20070920.ebuild
deleted file mode 100644
index b094ca266ce3..000000000000
--- a/app-emacs/emhacks/emhacks-20070920.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
-HOMEPAGE="http://emhacks.sourceforge.net/"
-# CVS snapshot
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jde"
-
-DEPEND="jde? ( app-emacs/jde )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# remove files included in Emacs>=22 or not useful on GNU/Linux
-	rm -r findstr* overlay-fix* recentf* ruler-mode* tree-widget* || die
-	# this requires jde and cedet, not everyone may want it
-	use jde || rm jsee.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}"
-	use jde || sed -i -e '/;; jsee/,$d' "${T}/${SITEFILE}"
-	elisp-site-file-install "${T}/${SITEFILE}"
-
-	dodoc Changelog
-}
diff --git a/app-emacs/emhacks/files/50emhacks-gentoo.el b/app-emacs/emhacks/files/50emhacks-gentoo.el
index 14fd515ff685..1488d88313cb 100644
--- a/app-emacs/emhacks/files/50emhacks-gentoo.el
+++ b/app-emacs/emhacks/files/50emhacks-gentoo.el
@@ -26,7 +26,3 @@ And update the status window if showing." t)
 ;; jmaker
 (autoload 'jmaker-generate-makefile "jmaker"
   "Generate and edit a Java Makefile in directory ROOT." t)
-
-;; jsee
-(autoload 'jsee-browse-api-doc "jsee"
-  "Browse the Java API Documentation of the current Java file." t)
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index 17d3c9cfeb76..27c2365ffe3e 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -16,9 +16,6 @@
   swbuff,   Quick switch between Emacs buffers;
   tabbar,   Display a tab bar in the header line.
 </longdescription>
-<use>
-  <flag name="jde">Enable support for Java Development Environment</flag>
-</use>
 <upstream>
   <remote-id type="sourceforge">emhacks</remote-id>
 </upstream>
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index f1d8485fe78e..02e1419387c7 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -1,5 +1,6 @@
 AUX 50mldonkey-gentoo.el 604 BLAKE2B 52632176ed6adc1cb0c871bfc94b2c01d5ec26b1950a220981f955e015156581feb932cc73888eb2920b93bdeacf2340b560f6fcce12cdf5f16eeaee4a093c9f SHA512 d89caa4fecb8d16df7595f770ad479adae0e094b36c04a6a6291abff0052d49d14afc835e38466f156a95579889c2f127fbafa1818bc14d4915851f9b4a9a2af
+AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20649087c95153f8ce92323dd977d7878475c8709057a3725ed78cbf3d777fb7b5ae00c6a911da75869232ae228edffc4 SHA512 f00edaf33d8d182e7c7e432cfcf4f0ac9b6a8f6f68d44266e9dbed53657c00bc5db5b1f6c5e190988c217711de5dcfdaef091de2581425be7bce2a44b8a0c9d6
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
-EBUILD mldonkey-0.0.4b-r1.ebuild 905 BLAKE2B 8d188adea68357c7da42fb61fcb558c5cd19ce63006d315864cf21c6a2a41c23e7413f72fa6b2cd131d9436db70347dcaf650af411b3095d64355c31d96c2201 SHA512 695bfae2f15c0e63b35fd1bb8ec81796accc1b4b85ed602fffe52479a79fd072c0a1b40025b984669dc03223d090d950e4176d86b9fc85f34c0f404d2287a9c5
+EBUILD mldonkey-0.0.4b-r1.ebuild 925 BLAKE2B be4cc55f7da8c04d6dc654f194261517e6962f5f3af553a1d249f70c18306be265f6f9966b5b891085bcbd8e3c37a6eaa8a0e99990ed564f4c653a7f44e0f2b3 SHA512 72d79f6ce9e36c0f4e6a9d6f6e9d9401276ff2a00cac3b14018e35a66289ce108370053f5a924d3ee6afbc8aca67714ff8644c6d2788d4eb57486f8a56ffd189
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
new file mode 100644
index 000000000000..0548fd96c97f
--- /dev/null
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
@@ -0,0 +1,14 @@
+Fix byte compilation with Emacs 26.
+https://bugs.gentoo.org/647638
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el
++++ mldonkey-el-0.0.4b/mldonkey-vd.el
+@@ -801,7 +801,7 @@
+     (insert "\n")))
+ 
+ 
+-(defun mldonkey-vd-insert (&optional ignore-1 &optional ignore-2)
++(defun mldonkey-vd-insert (&optional ignore-1 ignore-2)
+ 
+   "Insert the table with the downloads in the MlDonkey buffer."
+ 
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
index 7f128b35f900..5c38394b6e95 100644
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-vd.patch"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {