profiles: unmask ement

Signed-off-by: Alfred Wingate <parona@protonmail.com>

app-emacs/ement/Manifest

@@ -0,0 +1 @@
+DIST ement-0.13.tar 1730560 BLAKE2B a3d216931407affc90374f2685d3393e4c2cf67c2b8ddc525b340ed2f6b0bb9cff7ecf6a41843422e76ed580bf51e098ef912786747bbdf88a0487a0ce8f5e2f SHA512 79caa9d3655919854c9c31f45f60212c3c26a9cee121c55adbe99cad9c9a1a2ebdec690be9fba37b5511855b160b0749903dd0a4559a0b59f7d9610fc6b5e01d

app-emacs/ement/ement-0.13.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Matrix client for GNU Emacs"
+HOMEPAGE="https://github.com/alphapapa/ement.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="e2e"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.12.1
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/ement/ement-9999.ebuild

@@ -1,63 +1,39 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS="26.3"
 
-inherit elisp git-r3
+NEED_EMACS="27.1"
+
+inherit elisp
 
 DESCRIPTION="Matrix client for GNU Emacs"
 HOMEPAGE="https://github.com/alphapapa/ement.el"
 
-EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
-EGIT_BRANCH="master"
-EGIT_CLONE_TYPE="single"
-
-KEYWORDS="~amd64"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="e2e extras"
+IUSE="e2e"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.12.1
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
 
 DOCS="README.org"
 
-BDEPEND="
-	>=app-emacs/plz-0.1_pre
-	>=app-emacs/ts-0.2
-	e2e? ( net-im/pantalaimon )
-"
-# Pantalaimon's docs are needed at build time to annotate config
-
-RDEPEND="
-	>=app-emacs/plz-0.1_pre
-	>=app-emacs/ts-0.2
-	e2e? ( net-im/pantalaimon )
-	extras? ( app-emacs/ement-extras )
-"
 SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	if use e2e ; then
-		einfo "Annotating suggested pantalaimon config..."
-		cp "${FILESDIR}"/pantalaimon.conf "${S}"
-		"${EMACS}" -Q -batch -l "${FILESDIR}/${PN}"-annotate-conf.el
-	fi
-}
-
-src_install() {
-	if use e2e ; then
-		einfo "Installing suggested pantalaimon config to /etc/${PN}"
-		insinto /etc/"${PN}"
-		doins pantalaimon.conf
-		DOCS+=" ${FILESDIR}/${PN}-gentoo-pantalaimon.org"
-	fi
-	elisp_src_install
-}
-
-pkg_postinst() {
-	if [ ! [ use e2e && use extras ] ] ; then
-		einfo "To start using Matrix from Emacs with E2EE without any manual configuration,"
-		einfo "USE=\"e2e extras\" emerge app-emacs/ement"
-	fi
-}

app-emacs/ement/metadata.xml

@@ -12,6 +12,5 @@
   </upstream>
   <use>
     <flag name="e2e">Enable end to end encryption support via pantalaimon</flag>
-    <flag name="extras">Install extra features (auth-source and proxy support)</flag>
   </use>
 </pkgmetadata>

app-emacs/plz/Manifest

@@ -0,0 +1 @@
+DIST plz-0.7.tar.gz 105630 BLAKE2B 882e5141d6e069da3c7b32706e459e5bcc71abb1277be39162310cde413784202d21bae4bbf8b61f2b72c0edf71ef7b4615685246be17905bbabc9626a2035d6 SHA512 f3300843d30e4b219e4c3f9e898f99f1f3987c73195fdd40a9022c0ac7e09ac25f217adf619b61fb36e2a4d0ea494f5546226e2d1dd85514d1b111f769b7f5ef

app-emacs/plz/plz-0.7.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="An HTTP library for Emacs"
+HOMEPAGE="https://github.com/alphapapa/plz.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+
+	# Tests find files git and patching them to work without is too burdensome
+	RESTRICT="test"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="net-misc/curl"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo plz.info
+}
+
+src_test() {
+	emake test
+}

app-emacs/plz/plz-9999.ebuild

@@ -1,26 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS="26.3"
 
-inherit elisp git-r3
+inherit elisp
 
-DESCRIPTION="An HTTP library that uses curl as a backend"
+DESCRIPTION="An HTTP library for Emacs"
 HOMEPAGE="https://github.com/alphapapa/plz.el"
 
-EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
-EGIT_BRANCH="master"
-EGIT_CLONE_TYPE="single"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/plz.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 
-KEYWORDS="~amd64"
+	KEYWORDS="~amd64"
+
+	# Tests find files git and patching them to work without is too burdensome
+	RESTRICT="test"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
+RDEPEND="net-misc/curl"
+
 SITEFILE="50${PN}-gentoo.el"
 
-RDEPEND="net-misc/curl"
+src_install() {
+	elisp_src_install
+	doinfo plz.info
+}
 
 src_test() {
 	emake test

app-emacs/svg-lib/Manifest

@@ -0,0 +1 @@
+DIST svg-lib-0.2.7.tar 1095680 BLAKE2B c94a20a7494b12b4c3bb09527d11b68b74688d53578f505fc56b9c2c796c99ba791e564c239e1b3bb0ba4a5afa93fcecc30b2b1c6ac3d22a11408109a9eca87d SHA512 8c92469c4711c75a4553dee256f86869b17bdb5d6569309e0224998abbcaa4e7f7515ab31dcfafac4e8714beba1e794fa61d04b6cee40dabd7467df4a0982e9b

app-emacs/svg-lib/files/50svg-lib-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/svg-lib/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">rougier/svg-lib</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/svg-lib/svg-lib-0.2.7.ebuild

@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Emacs SVG libraries for creatings tags, icons and bars"
+HOMEPAGE="https://github.com/rougier/svg-lib"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rougier/svg-lib"
+else
+	SRC_URI="https://elpa.gnu.org/packages/svg-lib-${PV}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/svg-lib/svg-lib-9999.ebuild

@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Emacs SVG libraries for creatings tags, icons and bars"
+HOMEPAGE="https://github.com/rougier/svg-lib"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rougier/svg-lib"
+else
+	SRC_URI="https://elpa.gnu.org/packages/svg-lib-${PV}.tar -> ${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/taxy-magit-section/Manifest

@@ -0,0 +1 @@
+DIST taxy-magit-section-0.12.2.tar 81920 BLAKE2B f9e777d58b3132188427e4af160fb93f8c4b8eab94b74fccdfe560528c84dbc94b55bedcd7f5e58b8a2bd430ce29b6b27355ff1d8e40da7497d5ed36b1f6e261 SHA512 29142aedddcbce9dae62a32733feb420421ec73a5f81b45403e647bda75030df627a7a88d2e040e1e2edd8add66dc3fe15a37eb57501cb645bc6604452c01554

app-emacs/taxy-magit-section/files/50taxy-magit-section-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/taxy-magit-section/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">alphapapa/taxy.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/taxy-magit-section/taxy-magit-section-0.12.2.ebuild

@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+	EGIT_BRANCH="package/${PN}"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/magit-3.2.1
+	>=app-emacs/taxy-0.10
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy-magit-section/taxy-magit-section-9999.ebuild

@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+	EGIT_BRANCH="package/${PN}"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/magit-3.2.1
+	>=app-emacs/taxy-0.10
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy/Manifest

@@ -0,0 +1 @@
+DIST taxy-0.10.1.tar 245760 BLAKE2B 9fabcc2ac7cb727ef8f6bb98d936f8c3f85d0b74fa5535cce748389ac6908bf426b418f57f646ab6c3957412a2565ca49ff32c38ca2e3380ae709325d974e2d7 SHA512 ee2b66ca5d3ae871db19aa0ee65a798fdac6113b048a50d8ca843eb66d966d9432912a178b5322678b5ba504597ad31b41ec839f8dbcb674645b32cee12a4a26

app-emacs/taxy/files/50taxy-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/taxy/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">alphapapa/taxy.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/taxy/taxy-0.10.1.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy/taxy-9999.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/ts/Manifest

@@ -0,0 +1 @@
+DIST ts-0.2.2.tar.gz 41296 BLAKE2B 4238662cb4c726347ab3eb33064363ca1c846c9f99283a82a9724d358547a8651a37f5d72ebb2aeb93447aa07ec1f7c8c329a1be9da7767a5aa34d18493ae4cd SHA512 231d631011cf1d51e62c2f8ce53b3e7141eb0d1127dd8911f6a82feaa074afee2147454479d19901f867548520a988129e0c16be8326386e9de926662dcb535b

app-emacs/ts/ts-0.2.2.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="Timestamp and date/time library"
+HOMEPAGE="https://github.com/alphapapa/ts.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+	RESTRICT="test"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="
+	>=app-emacs/dash-2.14.1
+	>=app-emacs/s-1.12.0
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	emake test
+}

app-emacs/ts/ts-9999.ebuild

@@ -1,30 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS="26.1"
 
-inherit elisp git-r3
+inherit elisp
 
 DESCRIPTION="Timestamp and date/time library"
 HOMEPAGE="https://github.com/alphapapa/ts.el"
 
-EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
-EGIT_BRANCH="master"
-EGIT_CLONE_TYPE="single"
-KEYWORDS="~amd64"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+	RESTRICT="test"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
 SITEFILE="50${PN}-gentoo.el"
 
-BDEPEND="
+DEPEND="
 	>=app-emacs/dash-2.14.1
 	>=app-emacs/s-1.12.0
 "
-
-RDEPEND="${BDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	emake test

profiles/package.mask

@@ -7,7 +7,6 @@ net-analyzer/nutty
 # Alfred Wingate <parona@protonmail.com> (2023-08-31)
 # Indiscriminate mask of packages with NonsolvableDepsInStable
 # Fix or remove
-app-emacs/ement
 app-emacs/ement-extras
 app-portage/gen-pkgs
 dev-lang/fstar