From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13A64139345 for ; Thu, 1 Jul 2021 11:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34C49E0824; Thu, 1 Jul 2021 11:24:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09548E0824 for ; Thu, 1 Jul 2021 11:24:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E9B933FA71 for ; Thu, 1 Jul 2021 11:24:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1FBE7B3 for ; Thu, 1 Jul 2021 11:24:37 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1625138675.11459ba052d199e0f5d5136aaedca5c45a05567e.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-dicts/dictd-devils/files/, app-dicts/dictd-devils/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-dicts/dictd-devils/Manifest app-dicts/dictd-devils/dictd-devils-20150822.ebuild app-dicts/dictd-devils/dictd-devils-20210627.ebuild app-dicts/dictd-devils/files/format.patch X-VCS-Directories: app-dicts/dictd-devils/files/ app-dicts/dictd-devils/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: 11459ba052d199e0f5d5136aaedca5c45a05567e X-VCS-Branch: dev Date: Thu, 1 Jul 2021 11:24:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78619a50-1572-44e8-a8ec-d5821a6f39c3 X-Archives-Hash: 585f9358462f87c5dedc2ccdc900e2b1 commit: 11459ba052d199e0f5d5136aaedca5c45a05567e Author: Alessandro Barbieri gmail com> AuthorDate: Thu Jul 1 11:15:52 2021 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Thu Jul 1 11:24:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11459ba0 app-dicts/dictd-devils: new version (?) Closes: https://bugs.gentoo.org/799464 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri gmail.com> app-dicts/dictd-devils/Manifest | 2 +- ...0150822.ebuild => dictd-devils-20210627.ebuild} | 12 +- app-dicts/dictd-devils/files/format.patch | 196 ++++++++++----------- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/app-dicts/dictd-devils/Manifest b/app-dicts/dictd-devils/Manifest index 299d382c8..efb3c669b 100644 --- a/app-dicts/dictd-devils/Manifest +++ b/app-dicts/dictd-devils/Manifest @@ -1 +1 @@ -DIST dictd-devils-20150822.zip 164703 BLAKE2B cb8ac80e02617c4ced72b81de6e82d9b590953599444cc304647a50c78f080172fc0d15158de8f9a1d42abff37f68732f9076636c8102a2ebd85592c0bb0be10 SHA512 d2264626a8a34df7d9cabb671838b717a40385511d13b58bb60bf78481ad4e7ae6c9ab02a58847dddda7d3957efb3d0f67465fb9eabcbc515e2383fb202684a2 +DIST dictd-devils-20210627.zip 164627 BLAKE2B 519efb77dac5d5ba3bc8280e6c544345eb44f92c681c20664f2e414897735b0deb261ec19e06813ebf681aa058596d52d53bc159c3f21bbf135ae97f6f6465c8 SHA512 b0e04c13864df1e90d8393b0b2eab87ef8848f9243c061777b83289e3c52d773dffb182c7e570b71ecf2a17fae4d359f65eb250f2c50aec442b31e92c94d3680 diff --git a/app-dicts/dictd-devils/dictd-devils-20150822.ebuild b/app-dicts/dictd-devils/dictd-devils-20210627.ebuild similarity index 74% rename from app-dicts/dictd-devils/dictd-devils-20150822.ebuild rename to app-dicts/dictd-devils/dictd-devils-20210627.ebuild index 9d7771f21..cfc120265 100644 --- a/app-dicts/dictd-devils/dictd-devils-20150822.ebuild +++ b/app-dicts/dictd-devils/dictd-devils-20210627.ebuild @@ -4,8 +4,8 @@ EAPI=8 DESCRIPTION="The Devil's Dictionary for dict" -HOMEPAGE="https://www.dict.org/" -SRC_URI="https://www.gutenberg.org/files/972/972.zip -> ${P}.zip" +HOMEPAGE="https://www.gutenberg.org/ebooks/972" +SRC_URI="https://www.gutenberg.org/files/972/972-0.zip -> ${P}.zip" S="$WORKDIR" LICENSE="public-domain" SLOT="0" @@ -15,11 +15,13 @@ RDEPEND=">=app-text/dictd-1.13.0-r3" BDEPEND=" ${RDEPEND} app-arch/unzip + app-text/dos2unix " PATCHES=( "${FILESDIR}/format.patch" ) src_prepare() { + dos2unix 972-0.txt || die default sed \ @@ -28,12 +30,12 @@ src_prepare() { -e '/^\S/{: l;N;s/\n *\(.\)/ \1/g;t l}' \ -e "s/^\\([A-Zor .'?-]*[^,A-Zor .'?-]\\)/ \1/" \ -e '/^ /y/,/\a/' \ - -i 972.txt || die + -i 972-0.txt || die } src_compile() { - head -n -6 972.txt | dictfmt -u "${SRC_URI% ->*}" \ - -s "The Devil's Dictionary (2015-08-22 Project Gutenberg version)" \ + head -n -6 972-0.txt | dictfmt -u "${SRC_URI% ->*}" \ + -s "The Devil's Dictionary (2021-06-27 Project Gutenberg version)" \ --headword-separator " or " \ --columns 80 \ -h devils || die diff --git a/app-dicts/dictd-devils/files/format.patch b/app-dicts/dictd-devils/files/format.patch index fc21301ce..3f85733e1 100644 --- a/app-dicts/dictd-devils/files/format.patch +++ b/app-dicts/dictd-devils/files/format.patch @@ -1,110 +1,110 @@ ---- a/972.txt -+++ b/972.txt +--- a/972-0.txt ++++ b/972-0.txt @@ -124,7 +124,7 @@ - ABORIGINIES, n. Persons of little worth found cumbering the soil of a - newly discovered country. They soon cease to cumber; they fertilize. - --ABRACADABRA. -+ABRACADABRA, - - By _Abracadabra_ we signify - An infinite number of things. + ABORIGINIES, n. Persons of little worth found cumbering the soil of a + newly discovered country. They soon cease to cumber; they fertilize. + +-ABRACADABRA. ++ABRACADABRA, + + By _Abracadabra_ we signify + An infinite number of things. @@ -1405,7 +1405,7 @@ - Ignores the Law as 't were a straw, - And wants to sin--don't let him. - --CUI BONO? [Latin] What good would that do _me_? -+CUI BONO?, [Latin] What good would that do _me_? - - CUNNING, n. The faculty that distinguishes a weak animal or person - from a strong one. It brings its possessor much mental satisfaction + Ignores the Law as 't were a straw, + And wants to sin--don't let him. + +-CUI BONO? [Latin] What good would that do _me_? ++CUI BONO?, [Latin] What good would that do _me_? + + CUNNING, n. The faculty that distinguishes a weak animal or person + from a strong one. It brings its possessor much mental satisfaction @@ -2571,7 +2571,7 @@ - these persons from swift and awful death is one of the most striking - proofs of God's mercy to those that hate Him. - --FORMA PAUPERIS. [Latin] In the character of a poor person--a -+FORMA PAUPERIS, [Latin] In the character of a poor person--a - method by which a litigant without money for lawyers is considerately - permitted to lose his case. - + these persons from swift and awful death is one of the most striking + proofs of God's mercy to those that hate Him. + +-FORMA PAUPERIS. [Latin] In the character of a poor person--a ++FORMA PAUPERIS, [Latin] In the character of a poor person--a + method by which a litigant without money for lawyers is considerately + permitted to lose his case. + @@ -3074,7 +3074,7 @@ - - - --HABEAS CORPUS. A writ by which a man may be taken out of jail when -+HABEAS CORPUS, A writ by which a man may be taken out of jail when - confined for the wrong crime. - - HABIT, n. A shackle for the free. + + + +-HABEAS CORPUS. A writ by which a man may be taken out of jail when ++HABEAS CORPUS, A writ by which a man may be taken out of jail when + confined for the wrong crime. + + HABIT, n. A shackle for the free. @@ -3539,7 +3539,7 @@ - - - --I is the first letter of the alphabet, the first word of the language, -+I, is the first letter of the alphabet, the first word of the language, - the first thought of the mind, the first object of affection. In - grammar it is a pronoun of the first person and singular number. Its - plural is said to be _We_, but how there can be more than one myself + + + +-I is the first letter of the alphabet, the first word of the language, ++I, is the first letter of the alphabet, the first word of the language, + the first thought of the mind, the first object of affection. In + grammar it is a pronoun of the first person and singular number. Its + plural is said to be _We_, but how there can be more than one myself @@ -3718,7 +3718,7 @@ - Pollo Doncas - - --IMPOSTOR n. A rival aspirant to public honors. -+IMPOSTOR, n. A rival aspirant to public honors. - - IMPROBABILITY, n. - + Pollo Doncas + + +-IMPOSTOR n. A rival aspirant to public honors. ++IMPOSTOR, n. A rival aspirant to public honors. + + IMPROBABILITY, n. + @@ -4252,7 +4252,7 @@ - - - --J is a consonant in English, but some nations use it as a vowel-- -+J, is a consonant in English, but some nations use it as a vowel-- - than which nothing could be more absurd. Its original form, which has - been but slightly modified, was that of the tail of a subdued dog, and - it was not a letter but a character, standing for a Latin verb, + + + +-J is a consonant in English, but some nations use it as a vowel-- ++J, is a consonant in English, but some nations use it as a vowel-- + than which nothing could be more absurd. Its original form, which has + been but slightly modified, was that of the tail of a subdued dog, and + it was not a letter but a character, standing for a Latin verb, @@ -4323,7 +4323,7 @@ - - - --K is a consonant that we get from the Greeks, but it can be traced -+K, is a consonant that we get from the Greeks, but it can be traced - away back beyond them to the Cerathians, a small commercial nation - inhabiting the peninsula of Smero. In their tongue it was called - _Klatch_, which means "destroyed." The form of the letter was + + + +-K is a consonant that we get from the Greeks, but it can be traced ++K, is a consonant that we get from the Greeks, but it can be traced + away back beyond them to the Cerathians, a small commercial nation + inhabiting the peninsula of Smero. In their tongue it was called + _Klatch_, which means "destroyed." The form of the letter was @@ -4767,7 +4767,7 @@ - live with. The liver is heaven's best gift to the goose; without it - that bird would be unable to supply us with the Strasbourg _pate_. - --LL.D. Letters indicating the degree _Legumptionorum Doctor_, one -+LL.D., Letters indicating the degree _Legumptionorum Doctor_, one - learned in laws, gifted with legal gumption. Some suspicion is cast - upon this derivation by the fact that the title was formerly _LL.d._, - and conferred only upon gentlemen distinguished for their wealth. At + live with. The liver is heaven's best gift to the goose; without it + that bird would be unable to supply us with the Strasbourg _pate_. + +-LL.D. Letters indicating the degree _Legumptionorum Doctor_, one ++LL.D., Letters indicating the degree _Legumptionorum Doctor_, one + learned in laws, gifted with legal gumption. Some suspicion is cast + upon this derivation by the fact that the title was formerly _LL.d._, + and conferred only upon gentlemen distinguished for their wealth. At @@ -8612,7 +8612,7 @@ - civilization and enlightenment, despite their obvious agency in this - incomparable dictionary. - --TZETZE (or TSETSE) FLY, n. An African insect (_Glossina morsitans_) -+TZETZE FLY or TSETSE FLY, n. An African insect (_Glossina morsitans_) - whose bite is commonly regarded as nature's most efficacious remedy - for insomnia, though some patients prefer that of the American - novelist (_Mendax interminabilis_). + civilization and enlightenment, despite their obvious agency in this + incomparable dictionary. + +-TZETZE (or TSETSE) FLY, n. An African insect (_Glossina morsitans_) ++TZETZE FLY or TSETSE FLY, n. An African insect (_Glossina morsitans_) + whose bite is commonly regarded as nature's most efficacious remedy + for insomnia, though some patients prefer that of the American + novelist (_Mendax interminabilis_). @@ -8781,7 +8781,7 @@ - - - --W (double U) has, of all the letters in our alphabet, the only -+W, (double U) has, of all the letters in our alphabet, the only - cumbrous name, the names of the others being monosyllabic. This - advantage of the Roman alphabet over the Grecian is the more valued - after audibly spelling out some simple Greek word, like + + + +-W (double U) has, of all the letters in our alphabet, the only ++W, (double U) has, of all the letters in our alphabet, the only + cumbrous name, the names of the others being monosyllabic. This + advantage of the Roman alphabet over the Grecian is the more valued + after audibly spelling out some simple Greek word, like @@ -9040,7 +9040,7 @@ - - - --X in our alphabet being a needless letter has an added invincibility -+X, in our alphabet being a needless letter has an added invincibility - to the attacks of the spelling reformers, and like them, will - doubtless last as long as the language. X is the sacred symbol of ten - dollars, and in such words as Xmas, Xn, etc., stands for Christ, not, + + + +-X in our alphabet being a needless letter has an added invincibility ++X, in our alphabet being a needless letter has an added invincibility + to the attacks of the spelling reformers, and like them, will + doubtless last as long as the language. X is the sacred symbol of ten + dollars, and in such words as Xmas, Xn, etc., stands for Christ, not,