From 742dee1ea588cc89f8d61546aea7a3839b2f699f Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 20 Sep 2021 15:28:42 +0500 Subject: [PATCH 1/5] net-misc/gmid: add 1.7.3, update live Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/gmid/Manifest | 1 + net-misc/gmid/gmid-1.7.3.ebuild | 106 ++++++++++++++++++++++++++++++++ net-misc/gmid/gmid-9999.ebuild | 13 ++-- net-misc/gmid/metadata.xml | 4 +- 4 files changed, 116 insertions(+), 8 deletions(-) create mode 100644 net-misc/gmid/gmid-1.7.3.ebuild diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest index 35d4d75c6d..887ccad79d 100644 --- a/net-misc/gmid/Manifest +++ b/net-misc/gmid/Manifest @@ -1 +1,2 @@ DIST gmid-1.7.2.tar.gz 78352 BLAKE2B 8efba7dcdb301f4cc2cf470408e55b7a939bd3cad850e32fa14ba1e752404da7a85a4758ad722ba81f8dd2e45a8a9aad14ec162bdc5947591e9411896bf3c522 SHA512 27cae5699f39afb55b087cbbe7fd134221e786c07664140ace656c483c79213c74abdf82f05de9f1cf09d20a560571f094cf5ad1b1ae2879e3429f3571cec9a5 +DIST gmid-1.7.3.tar.gz 81873 BLAKE2B 66c2b850c4e1a22c50503d9445f257ac045eb69fcc7ca59d72be2c79bab95ea6b3af638b6f8f5518cd92421e10e60d9a7c6a2b3d2c3954c0a3cd911b0d31b1d2 SHA512 9a3acc501c1c0cc6419a18b152345b0ca84418625d8328942f8bba82974655633cbf79d7cdd48ba235915842dd8f8433e84245085bb0b00a4b57e4bda4aa1bd3 diff --git a/net-misc/gmid/gmid-1.7.3.ebuild b/net-misc/gmid/gmid-1.7.3.ebuild new file mode 100644 index 0000000000..10cb49b3a1 --- /dev/null +++ b/net-misc/gmid/gmid-1.7.3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +SSL_DAYS=36500 +SSL_CERT_MANDATORY=1 +inherit ssl-cert systemd toolchain-funcs + +DESCRIPTION="Simple and secure Gemini server" +HOMEPAGE="https://gmid.omarpolo.com" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" + inherit git-r3 +else + SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="BSD ISC MIT" +SLOT="0" +IUSE="seccomp test" +RESTRICT="!test? ( test )" + +DEPEND=" + !elibc_Darwin? ( dev-libs/libbsd ) + acct-user/gemini + dev-libs/imsg-compat + dev-libs/libevent:= + dev-libs/libretls + dev-libs/openssl:= +" +BDEPEND=" + virtual/pkgconfig + virtual/yacc +" +RDEPEND="${DEPEND}" + +DOCS=( README.md ChangeLog contrib/README ) + +src_prepare() { + default + + sed \ + -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \ + -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \ + -i contrib/gmid.service || die +} + +src_configure() { + local conf_args + tc-export CC + + # note: not an autoconf configure script + conf_args=( + PREFIX="${EPREFIX}"/usr/share + BINDIR="${EPREFIX}"/usr/bin + $(use_enable seccomp sandbox) + ) + + ./configure "${conf_args[@]}" || die + + if use seccomp && has usersandbox ${FEATURES} ; then + export SKIP_RUNTIME_TESTS=1 + fi +} + +src_compile() { + emake gmid + if use test ; then + emake -C regress gg data puny-test fcgi-test + fi +} + +src_test() { + emake regress +} + +src_install() { + default + + insinto /etc/gmid + doins "${FILESDIR}"/gmid.conf + + insinto /usr/share/vim/vimfiles + doins -r contrib/vim/* + + systemd_dounit contrib/gmid.service + newinitd "${FILESDIR}"/gmid.initd gmid + newconfd "${FILESDIR}"/gmid.confd gmid + + keepdir /var/gemini/localhost +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + + einfo "This gemini server can be run as a user with zero configuration.\n" + einfo "In order to use it with the init service you will need to generate a" + einfo "self-signed TLS certificate and a key and set up the configuration" + einfo "file (see man 1 gmid for details)." +} diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild index 089b1669a0..10cb49b3a1 100644 --- a/net-misc/gmid/gmid-9999.ebuild +++ b/net-misc/gmid/gmid-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 SSL_DAYS=36500 SSL_CERT_MANDATORY=1 @@ -11,24 +11,25 @@ DESCRIPTION="Simple and secure Gemini server" HOMEPAGE="https://gmid.omarpolo.com" if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}" + EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" inherit git-r3 else SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="BSD ISC MIT" SLOT="0" -IUSE="+seccomp test" +IUSE="seccomp test" RESTRICT="!test? ( test )" DEPEND=" + !elibc_Darwin? ( dev-libs/libbsd ) acct-user/gemini dev-libs/imsg-compat - dev-libs/libbsd - dev-libs/libevent + dev-libs/libevent:= dev-libs/libretls + dev-libs/openssl:= " BDEPEND=" virtual/pkgconfig diff --git a/net-misc/gmid/metadata.xml b/net-misc/gmid/metadata.xml index db6c28fd0c..393ca8ca52 100644 --- a/net-misc/gmid/metadata.xml +++ b/net-misc/gmid/metadata.xml @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ - cyber@sysrq.in + cyber+gentoo@sysrq.in Anna From 5d0cfb043a864e0eedfe4dac578e4149255d0b45 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 20 Sep 2021 15:33:39 +0500 Subject: [PATCH 2/5] net-misc/telescope: add 0.5.2, drop 0.5 Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/telescope/Manifest | 2 +- net-misc/telescope/metadata.xml | 2 +- .../telescope/{telescope-0.5.ebuild => telescope-0.5.2.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename net-misc/telescope/{telescope-0.5.ebuild => telescope-0.5.2.ebuild} (100%) diff --git a/net-misc/telescope/Manifest b/net-misc/telescope/Manifest index cfa3d8d89d..502f4d89bf 100644 --- a/net-misc/telescope/Manifest +++ b/net-misc/telescope/Manifest @@ -1,2 +1,2 @@ DIST telescope-0.5.1.tar.gz 270465 BLAKE2B d12a4cb5beccf15ff73bacacfa5f3679a6bbd6f97c12b476c20363032d50cc1750e315323d1a4b0e5577ee4430ef17419961b42d17f2c203c8e7f17a7ae390f4 SHA512 5d1f719d1be1146b1e81d2208688c4dced53893ed7c4c167480df733e5ad479551917cf2f80bf5f199806365796b83c7cccb27e13a7df05ca408373826e1adfa -DIST telescope-0.5.tar.gz 270335 BLAKE2B ab4f964c092e84669033d9000d7943464a108a51a0e3e7e86b34e8d25388ee90b86ff3c554c5a937b60d5131d0e6ecdafea742da1097bd74e89f565fb8a96dd7 SHA512 014a9d96ce688a61edac3c917d8d0da1e7dc9f1291251e8143dfcfd4ad00b9729b7384aebdf0ee6ed2e3186959ac7c0dab4aa78038d45c10fd16443021a6ca21 +DIST telescope-0.5.2.tar.gz 270398 BLAKE2B e745eca6f259707036bed780956c57efad2320d66b40b13d644cff78a84d225d5dea58f19d2586d22b2ce43e193f37f47337ee229be09558bf16cd029515b8f4 SHA512 34e22fd2139c4e0ca04562d3f9542891a6cb743814cf8c1eae3c15e7ae65dd5bc9b609701788aa8b641ce30ce27ca602662ddad597093fa10966f0d588e85806 diff --git a/net-misc/telescope/metadata.xml b/net-misc/telescope/metadata.xml index 210be87ba8..4c88fb9c23 100644 --- a/net-misc/telescope/metadata.xml +++ b/net-misc/telescope/metadata.xml @@ -1,5 +1,5 @@ - + cyber+gentoo@sysrq.in diff --git a/net-misc/telescope/telescope-0.5.ebuild b/net-misc/telescope/telescope-0.5.2.ebuild similarity index 100% rename from net-misc/telescope/telescope-0.5.ebuild rename to net-misc/telescope/telescope-0.5.2.ebuild From 351f21cccedc0e0f9a2b50387f7d01501276d202 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Mon, 20 Sep 2021 16:33:06 +0300 Subject: [PATCH 3/5] app-arch/libarchive-qt: remove unused eclass: multilib Signed-off-by: Arthur Zamarin --- app-arch/libarchive-qt/libarchive-qt-2.0.3.ebuild | 2 +- app-arch/libarchive-qt/libarchive-qt-2.0.4.ebuild | 2 +- app-arch/libarchive-qt/libarchive-qt-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.3.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.3.ebuild index 74abd09fda..ad8ad3261c 100644 --- a/app-arch/libarchive-qt/libarchive-qt-2.0.3.ebuild +++ b/app-arch/libarchive-qt/libarchive-qt-2.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib xdg cmake +inherit xdg cmake DESCRIPTION="A Qt based archiving solution with libarchive backend" HOMEPAGE="https://gitlab.com/marcusbritanicus/libarchive-qt" diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.4.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.4.ebuild index 74abd09fda..ad8ad3261c 100644 --- a/app-arch/libarchive-qt/libarchive-qt-2.0.4.ebuild +++ b/app-arch/libarchive-qt/libarchive-qt-2.0.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib xdg cmake +inherit xdg cmake DESCRIPTION="A Qt based archiving solution with libarchive backend" HOMEPAGE="https://gitlab.com/marcusbritanicus/libarchive-qt" diff --git a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild index 74abd09fda..ad8ad3261c 100644 --- a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild +++ b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib xdg cmake +inherit xdg cmake DESCRIPTION="A Qt based archiving solution with libarchive backend" HOMEPAGE="https://gitlab.com/marcusbritanicus/libarchive-qt" From ba5fad8f3d4f7b6bde6b40cebeb35f552e38467c Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Mon, 20 Sep 2021 16:34:18 +0300 Subject: [PATCH 4/5] app-dicts/dictd-gcide: remove unused eclass: eutils Signed-off-by: Arthur Zamarin --- app-dicts/dictd-gcide/dictd-gcide-0.48.5.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app-dicts/dictd-gcide/dictd-gcide-0.48.5.ebuild b/app-dicts/dictd-gcide/dictd-gcide-0.48.5.ebuild index 24d6152179..93c7920e9e 100644 --- a/app-dicts/dictd-gcide/dictd-gcide-0.48.5.ebuild +++ b/app-dicts/dictd-gcide/dictd-gcide-0.48.5.ebuild @@ -3,14 +3,13 @@ EAPI=7 -inherit eutils - MY_PN=dict-gcide DESCRIPTION="Collaborative International Dictionary of English (incl. Webster 1913) for dict" HOMEPAGE="https://tracker.debian.org/pkg/dict-gcide" SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.xz -> ${P}.tar.xz" S="${WORKDIR}/${MY_PN}-${PV}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" From e7076c8660a08ebfaab5657a73404e3742c9213d Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Mon, 20 Sep 2021 16:34:51 +0300 Subject: [PATCH 5/5] app-dicts/dictd-mueller: remove unused eclass: eutils Signed-off-by: Arthur Zamarin --- app-dicts/dictd-mueller/dictd-mueller-3.1-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-dicts/dictd-mueller/dictd-mueller-3.1-r1.ebuild b/app-dicts/dictd-mueller/dictd-mueller-3.1-r1.ebuild index aedc0a9f4f..f7a903b7d4 100644 --- a/app-dicts/dictd-mueller/dictd-mueller-3.1-r1.ebuild +++ b/app-dicts/dictd-mueller/dictd-mueller-3.1-r1.ebuild @@ -6,12 +6,13 @@ EAPI=7 MY_PN="mueller-dict" MY_P="${MY_PN}-${PV}" -inherit eutils autotools +inherit autotools DESCRIPTION="V. K. Mueller English-Russian Dictionary" HOMEPAGE="http://mueller-dict.sourceforge.net" SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" IUSE="ipa" SLOT="0"