[patch] First two updated ebuilds (dictd-jargon and dictd-elements)

0001-app-dicts-dictd-elements-jargon-New-ebuilds-to-satis.patch (text/plain), 11.01 KB, created by Samuel May on 2019-10-26 21:35:50 UTC

From 344e5581495263bf9d9c2e986e21de935a3fd2d9 Mon Sep 17 00:00:00 2001
From: Samuel May <[e-mail]>
Date: Sat, 26 Oct 2019 13:50:48 -0700
Subject: [PATCH] app-dicts/dictd-{elements,jargon}: New ebuilds to satisfy bug #696248

As the FTP servers for the premade dict files are inaccessable anyway,
we may as well start building the databases ourselves.  Several more
ebuilds still to come, of greater complexity.

Bug: https://bugs.gentoo.org/696248
Signed-off-by: Samuel May <[e-mail]>
---
 app-dicts/dictd-elements/Manifest             |  6 +--
 .../dictd-elements-2000.22.07-r1.ebuild       | 23 ----------
 .../dictd-elements-20030309.ebuild            | 38 ++++++++++++++++
 app-dicts/dictd-elements/metadata.xml         | 14 +++++-
 app-dicts/dictd-jargon/Manifest               |  6 +--
 .../dictd-jargon/dictd-jargon-4.2.3-r1.ebuild | 24 ----------
 .../dictd-jargon/dictd-jargon-4.2.3-r2.ebuild | 45 +++++++++++++++++++
 app-dicts/dictd-jargon/metadata.xml           | 19 +++++++-
 8 files changed, 120 insertions(+), 55 deletions(-)
 delete mode 100644 app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
 create mode 100644 app-dicts/dictd-elements/dictd-elements-20030309.ebuild
 delete mode 100644 app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
 create mode 100644 app-dicts/dictd-jargon/dictd-jargon-4.2.3-r2.ebuild

diff --git a/app-dicts/dictd-elements/Manifest b/app-dicts/dictd-elements/Manifest
index aedd28d..a722a7e 100644
--- a/app-dicts/dictd-elements/Manifest
+++ b/app-dicts/dictd-elements/Manifest
@@ -1,3 +1,3 @@
-DIST elements-20001107-pre.tar.gz 16934 BLAKE2B 5b351c30cdc8fc6161a1ff1c2ccfc0b3ae9456d8fec9b57215ff20b07b99b4b267fd1824981458eb9e27ba6d628f5aa23b282dfe4a529752f7301447fc10b3c1 SHA512 93c8426582e0715eb1f261ab60b15da48943464993a027693617f699a4a2ee89d33f19ba820ae046e1221d8d57139d54987a2abf35b6c59ba26c2b66199cf51b
-EBUILD dictd-elements-2000.22.07-r1.ebuild 479 BLAKE2B 5fd9bd8b5582894b68cbe6ca141db4b5202fe38be7c0e2b2751e6c8cddaa6cc359938b717d513771fd58d86d03f86c4d85b0869a5760fa618f6934c4a0d62cdd SHA512 74deec90bd5eae3622950320eaef87d78a9f58888bfcfca883b045fb28fe73e5da1dd253f9a94e6b40b9ead048d99803b0ea5e331f26d3ada376a4462b1d2c33
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST elements.db 46325 BLAKE2B 70b5003a1dc5825ef67c4b2ceb8a322d5827cc28c3be61ea2d2e125343b1d03816385ea298c9794e25edf1f1e4361bc8f141876b1fba3f9005926a33ad28bffe SHA512 a09d152f4b7ed6f0fb43d7eed08abd469565b0d63d92e965e872dc90174298f8c661c9c22ab9c605fc865d7e1f3366dcbd27d17f1be274d0610b0938f8bb9b40
+EBUILD dictd-elements-20030309.ebuild 841 BLAKE2B ece712850cdf9768099303dc7f5ed070bc761bbfd306635c92ba17a15da1565db6cf7180aba00c4e6d4bed5fd28060697dca9f493d4d87befc6c7b87410b19b0 SHA512 6fcffc0494b02d9f9fb35f94ec2c93702e898c72b10ce7f26955c6197d970ddacf69e1775e33feb2843f8634ea9e55a014ee1892038f0acb891e4669285332e9
+MISC metadata.xml 544 BLAKE2B 0b49e39cb85cb8639430a096a32a751c3b12d6ea0ea2ae33bef9800da183dbb8fb727747bf480498657f4a8a149d80aee446de628df0a8edb17417ac8feb4fb8 SHA512 ad68116d797e27193389fa24c578d6e2dcebf12f24c56f4c1c493be38b73db95af9d37faa5f6e468d8b7fd2da4d07e87898331e2a4f5d87434e3b48212b89c2f
diff --git a/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild b/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
deleted file mode 100644
index d7b002e..0000000
--- a/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=elements-20001107-pre
-DESCRIPTION="The elements database for dict"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-HOMEPAGE="http://www.dict.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/lib/dict
-	doins elements.dict.dz elements.index || die
-}
diff --git a/app-dicts/dictd-elements/dictd-elements-20030309.ebuild b/app-dicts/dictd-elements/dictd-elements-20030309.ebuild
new file mode 100644
index 0000000..709244d
--- /dev/null
+++ b/app-dicts/dictd-elements/dictd-elements-20030309.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Jay Kominek's database of the elements for dict"
+HOMEPAGE="http://www.dict.org"
+SRC_URI="https://web.archive.org/web/20121223051336/http://www.miranda.org:80/~jkominek/elements/elements.db"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=app-text/dictd-1.5.5"
+
+S="$WORKDIR"
+
+src_unpack() {
+	true;
+}
+
+src_compile() {
+	sed -e '/^%h/{h;n;n;s/Symbol: //;T;x;G;s/\n/:/}' \
+		"$DISTDIR/$A" > elements.db
+	dictfmt -u "$SRC_URI}" \
+		-s "Jay Kominek's Elements database (version $PV)" \
+		--headword-separator : \
+		--columns 80 \
+		-p elements \
+		< elements.db
+	dictzip elements.dict
+}
+
+src_install() {
+	insinto /usr/lib/dict
+	doins elements.dict.dz elements.index || die
+}
diff --git a/app-dicts/dictd-elements/metadata.xml b/app-dicts/dictd-elements/metadata.xml
index 6f49eba..c54b315 100644
--- a/app-dicts/dictd-elements/metadata.xml
+++ b/app-dicts/dictd-elements/metadata.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+	<name>Samuel May</name>
+	<email>[e-mail]</email>
+	<description>Primary ebuild maintainer</description>
+</maintainer>
+<upstream>
+	<maintainer status="inactive">
+		<name>Jay Kominek</name>
+	</maintainer>
+</upstream>
+<longdescription>
+	A database for 'dict'-compatible dictionary software, based on Jay Kominek's descriptions of the atomic elements.
+</longdescription>
 </pkgmetadata>
diff --git a/app-dicts/dictd-jargon/Manifest b/app-dicts/dictd-jargon/Manifest
index 13e52de..cccbe12 100644
--- a/app-dicts/dictd-jargon/Manifest
+++ b/app-dicts/dictd-jargon/Manifest
@@ -1,3 +1,3 @@
-DIST jargon_4.2.3.tar.gz 650370 BLAKE2B ba3198fbd371fc9cef53edc465ad165364981deb315d5abc0d7dcd9d0cfee4afd3bad9554845ac2c5f98d547081890b474eba3557b9f61e69a235708f8841745 SHA512 7eba12c741cc2be7ab77c061fde38f7f083bf54d37428c3b6eb567bdde7002b6e70fd73411e354c8b5124ec2d7dd9ef1030b7cf8dec3d0b89ac450cf20ed22c7
-EBUILD dictd-jargon-4.2.3-r1.ebuild 473 BLAKE2B 0a7e25c850a32c3e20447d3569f2d73fbd17b1f635516cbca4081445d0ca7b9be3028e3c70591adbc46590c2514e098f15e53d3a0fac050922adcc55b0be5410 SHA512 fc51bc49d35e9f6ea186925bcce9fba86deca88b69be2439ab0f6f4bcdc1c513512783696ad36909867ff75b97e9249bba1a99ec6ee8a59ae6e60e3a1b820434
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST jarg423.txt 1413674 BLAKE2B 943fae047e5773fcf4af5e6720533ef2886e6be93e9eb0a10beeb4aa263bde619f639ada35a431992d08bb470a2914201d02e6a83ccc755fcae55f9c96abd9b6 SHA512 98afd7f9f010c7f6c43ba2f368add48c8faf37c922e41de4d804a39bcc2fec6a18de51765a609aa2bd7396baaf3c772a22f1d07ae185ae0fe206dafa166a84ea
+EBUILD dictd-jargon-4.2.3-r2.ebuild 1018 BLAKE2B 4e191ff1a7ec28092301e6744c2bf03e4fa293cfffe1c80349d57965e63d1bf6f2a63ea86f87d4d84c5e4002d3ca841f6926ca4ffbe1b36a2707061fc7772634 SHA512 216ed37de88e538c91bf313a0786d054432788f48ca67bd320570d41e2089b229db8668238e199f34d61c81688d5421a3e5951451053300a1a653675a925d9f3
+MISC metadata.xml 741 BLAKE2B a65e47b1c232936db4fb56ac8cde52a5b86ae8ef880ab3c0c0169da1e05bee8e2f6baa7b348a46107ad5d0b4819718f5055f4559add9c5c0cac273e03f041076 SHA512 fff599050cff274f0c8b750179c4518036dee653fa010bf9db9fa86952e58457846c97c377411db8bfcfc4176cff6fc09735b633abc23a1bab528aa475824c6f
diff --git a/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild b/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
deleted file mode 100644
index 1b56419..0000000
--- a/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${PN/dictd-/}_${PV}
-DESCRIPTION="Jargon lexicon"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install () {
-	dodoc README
-	insinto /usr/lib/dict
-	doins jargon.dict.dz jargon.index || die
-}
diff --git a/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r2.ebuild b/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r2.ebuild
new file mode 100644
index 0000000..cdd023e
--- /dev/null
+++ b/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FILE="jarg${PV//.}.txt"
+
+DESCRIPTION="The Jargon File for dict"
+HOMEPAGE="http://www.catb.org/~esr/jargon/index.html"
+SRC_URI="http://www.catb.org/~esr/jargon/oldversions/$FILE"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=app-text/dictd-1.5.5"
+
+S="$WORKDIR"
+
+src_unpack() {
+	true;
+}
+
+src_compile() {
+	# This sed script works for all versions >=3.0.0 until <4.4.0 (when the
+	# entire format changes).
+	sed -e 's/^:/   :/' \
+		-e '/^The Jargon Lexicon/,/:(Lexicon Entries End Here):/ s/^\s*//' \
+		"$DISTDIR/$FILE" > jargon.txt
+	sed -e '/^The Jargon Lexicon/,/:(Lexicon Entries End Here):/ d' \
+		"$DISTDIR/$FILE" > "$FILE"
+	dictfmt -u "$SRC_URI" \
+		-s "The Jargon File (version $PV)" \
+		--columns 80 \
+		-j jargon \
+		< jargon.txt
+	dictzip jargon.dict
+}
+
+src_install() {
+	dodoc "$FILE"
+	insinto /usr/lib/dict
+	doins jargon.dict.dz jargon.index || die
+}
diff --git a/app-dicts/dictd-jargon/metadata.xml b/app-dicts/dictd-jargon/metadata.xml
index 6f49eba..abbe05d 100644
--- a/app-dicts/dictd-jargon/metadata.xml
+++ b/app-dicts/dictd-jargon/metadata.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+	<name>Samuel May</name>
+	<email>[e-mail]</email>
+	<description>Primary ebuild maintainer</description>
+</maintainer>
+<upstream>
+	<maintainer status="inactive">
+		<name>Eric Raymond</name>
+		<email>[e-mail]</email>
+	</maintainer>
+	<maintainer status="inactive">
+		<name>Guy Steele</name>
+		<email>[e-mail]</email>
+	</maintainer>
+</upstream>
+<longdescription>
+	A database for 'dict'-compatible dictionary software, based on the classic Jargon File describing the slang that developed around computer programming in the '70s and '80s.
+</longdescription>
 </pkgmetadata>
-- 
2.21.0