gentoo resync : 03.11.2019

6 files changed, 33 insertions, 36 deletions

diff --git a/app-emacs/basic-toolkit/Manifest b/app-emacs/basic-toolkit/Manifest
index 66adb7de9e27..9c4267f9c536 100644
--- a/app-emacs/basic-toolkit/Manifest
+++ b/app-emacs/basic-toolkit/Manifest
@@ -1,4 +1,4 @@
-AUX 50basic-toolkit-gentoo.el 77 BLAKE2B 62b1e6c3a3b5a134a482c24d6bd7e620109e95117d12e9e348b5628e62139edc8a237b1569e2751bb7f7284d84f1877a18baa9c933e57c174f695f218876d323 SHA512 e6e622dbb2df0d55e5f5b18e29afa95a52065783a84f3e982799c614c95f305081ec6f9214f8bb31a50eef77c7c18987259d326c5ad56d01f4130266fc29a6ef
-DIST basic-toolkit-0.3.el.xz 6524 BLAKE2B e0cebca137c786faebe5b76b1fd0e9b7181a4970aee69c1486deabd8e7712e6b54a3491768212516f9b7c8cc5a073d41dd1a22b49a3a9140ae21e1756997ea6d SHA512 3ba22833e8e899c5276e9c36779b1cffdcf3a76adaa0379a346331190f4529c8706b7e3b850768ce270016d8bc184abb4a48dc5ed11bb4766062bae966e9806d
-EBUILD basic-toolkit-0.3.ebuild 573 BLAKE2B 2a3792cdce57d01e40353f9a594222c7ee7e1462eae372971ee3cbbbe54a829e8b9edd7d4b81c2208de071f9d07888d954b53b45d53089ffcb07fff9d9933491 SHA512 614df71ae1578fbdc0c428e275dd2fa3ba63ed4fc7c3250c7b2c27922f6fa6f34c481e030c8aa81aa3ae9fde4d698b817d5564a59623415bdd6acd9ddfff3f17
-MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
+AUX 50basic-toolkit-gentoo-0.7.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST basic-toolkit-0.7.el.xz 6740 BLAKE2B da369f851de8af0ac06ff49f07dc8d07b4ced5cd445a0726c4fe456112663cb22895f4732cc72f173325dac67cd6ccf943b7e322406761388d6730edfb9b2a44 SHA512 0ced99491e1263e8016bffc7d8f7464750fce6387d8eac08436b5cb589570f03e157f26ec50436dd4b5b24c2fe87a6a9803d244c97fd4dd178e76064fb50f806
+EBUILD basic-toolkit-0.7.ebuild 542 BLAKE2B 2c636b74779abc11842b560b5406e6f486ea3fddceb4881553afd38be8b1fe33f26456701e7614955f96aa379501d65ad43d9abaafc35dd3881c1c6a4aa0abbe SHA512 181deb458906db8924cca4ed0d629eb7ec7c58ee12a5cc61c794075b91806b6090910f2ca88d108b758ba541bc1dcb5e7b9582d3b5d2a3f051f384b331bb8523
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
deleted file mode 100644
index bf652da1d2f0..000000000000
--- a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Basic edit toolkit"
-HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
-# taken from https://www.emacswiki.org/emacs/download/basic-toolkit.el
-SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-emacs/windows app-emacs/cycle-buffer"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
new file mode 100644
index 000000000000..018c65b498ec
--- /dev/null
+++ b/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Basic edit toolkit"
+HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
+# taken from https://www.emacswiki.org/emacs/download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/windows
+	app-emacs/cycle-buffer
+	app-emacs/css-sort-buffer"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo-0.7.el"
diff --git a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo-0.7.el b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo-0.7.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo-0.7.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
deleted file mode 100644
index ebb24ef6ca16..000000000000
--- a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(load "basic-toolkit-autoloads" nil t)
diff --git a/app-emacs/basic-toolkit/metadata.xml b/app-emacs/basic-toolkit/metadata.xml
index c6a53b949e75..c918cdef9591 100644
--- a/app-emacs/basic-toolkit/metadata.xml
+++ b/app-emacs/basic-toolkit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
 </pkgmetadata>