From a70b3781cb17c543e36c9b2519ed394c4f16e5f3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 5 Nov 2021 20:31:32 +0100 Subject: [PATCH] sys-apps/miscfiles: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../sys-apps/miscfiles/Manifest | 12 +---- .../files/miscfiles-1.3-Makefile.diff | 18 ------- .../sys-apps/miscfiles/metadata.xml | 2 +- .../miscfiles/miscfiles-1.4.2-r1.ebuild | 52 ------------------- ...-1.5-r1.ebuild => miscfiles-1.5-r3.ebuild} | 45 ++++++++-------- 5 files changed, 26 insertions(+), 103 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/files/miscfiles-1.3-Makefile.diff delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/{miscfiles-1.5-r1.ebuild => miscfiles-1.5-r3.ebuild} (52%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/Manifest index a8a7d5e73a..b0c88b1f86 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/Manifest @@ -1,10 +1,2 @@ -AUX miscfiles-1.3-Makefile.diff 637 SHA256 707f03f65ef425b549360e1bd601376ed5cc07140a32507daaa5f52fb73a2f6b SHA512 707287ea7b4f720cc4b23d1e21c00d10fd6afc3ceee1a69955f2185e089393e8bc58980e1c7181b088a66cf1931aaab70e950850f25099a80bd211ec318f7192 WHIRLPOOL e7789ca8401591150d0c4600aee549bcb89edfdef2e7d339cbb6e6e5103508f9b205881cd68a948e560b74689eb7bf213d8c0ae21ff8cc28fe547fcf2c273a3a -DIST UnicodeData-5.2.0.txt.bz2 159460 SHA256 0b4b03725d313f0cc1056b80a4ea6d30a3b0a959316228c60b7a05e958d90486 SHA512 65573a2ad50d6964d593928d34e4315b2dbf7a7b49a480e5bc8a10025975280bb097ea670fb979d6c1da7d8911049313220712dc9ac5d5aa34e85c9193411fdc WHIRLPOOL 72b613fe5a578069b5e2933bb7155ded918602af4fe0063dd86e355c430840844f36feb6960fbc07863ec706cc57801e6e28dfd04ba1a0d872d17c46695c5b58 -DIST UnicodeData-6.1.0.txt.xz 129972 SHA256 044c7f014c601ec4602d8e19c1541a952e2c7e30930c623acc65b1f45acb170a SHA512 9ada361d915f3883e673c6e55f351c7411dc970e180e7e0b05fef498c2f80a5a29bfd6c22513ff4b6b6c4c9fba5c77f0aca2dd54c7a76d3fa9b78623b1fdd93f WHIRLPOOL b052639f5ffe6acab1b875ee55aa917ed6f526deffce1f12f15530f1dd44d3cbb259516c40c725f7a35838d7ecb68f5452e099aef904d0763720cde87cebebf1 -DIST miscfiles-1.4.2.tar.gz 1524786 SHA256 b699ca60d61475578f1f9adb28e6d6e6b649fcf1bdd25aaec7d96b358c0701e6 SHA512 e5cfdb82d9f8901016daff874efce0616bfaaae12cc3587b6bf950df2bd19fa80f2286f69e10ddbb413d5bc632bf91e4165b0187f8cfb5a0d98882ac9b2cccc2 WHIRLPOOL 2867bbfdde83a50cf8666f34c72f8364955eb21df86b891b3f740489c87fe72cf0d3b50c63c938b836889a26080f856531a6ceda6dd4691788c4c9a2ad240c77 -DIST miscfiles-1.5.tar.gz 1585293 SHA256 6aaaa8898b0f6dac18bcaa5492874a6cd1243ffbe7a6dd347ca8f3ec3642a500 SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa WHIRLPOOL 3d134944fcf75231f682d05320ad9b198b99f9eb4c27a949b67e724cb3b16181afedd61e83bcdb672fb7df516d8cdc43310209a07108b35fdb40ea9025be297a -EBUILD miscfiles-1.4.2-r1.ebuild 1473 SHA256 e2afb02d40e9da53d053d90d50c3156d31cf792b039fcf19557fea2a95f79a65 SHA512 6db68fef3ba8c9ce820ecf8f408bc212c15185b63853ad745337782bd5de4d75f93b4c2ef7aee22d2d6417add6bfb01bf31c5dee15db596deb35933ee08f9c4b WHIRLPOOL 003d5c2f4109e836ba53070c3760d5bd0da7a3fe351dc31a450ec0314b111d992dcd92392a06d1c354ca0e1bcd4882ea67052921991858e408cf117b4afd4eb1 -EBUILD miscfiles-1.5-r1.ebuild 1683 SHA256 cf88308bf724a00de5e3c622b648ad081825e09659ca0478ce3f2e273047f539 SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95 WHIRLPOOL c28a32016cae9f21e54d3cdfc76ab01feddaf9a24c403435d4d5bc82621d95e45d8c84aae513f72014500bcbf234080e59aa076b43845efb4da2b20afc76ea5c -MISC ChangeLog 3246 SHA256 4338f42961bb7a42081b804cf62c5b291ee76202b6165981d38119711aca192f SHA512 67d7e76990ec5205a8530b3fefeec5e224d5b21aac50d7d0e554200b2d177cf5f493cbab4c6fffae339bd1eb9b5ad6199855042afcc3fc31e46e8703bff7a978 WHIRLPOOL cc563005543047c852cee7af44e2a8d5af8e101134f27cd3270e0aab6869208d9a64f84fc0513b2b4fd33718833ee445262d614c6b286785d4403f78420b0b8c -MISC ChangeLog-2015 6414 SHA256 167fbc7454d6bd03e53a35f1dcb8ca641425ed8b0d7a8c5a52577bce34622047 SHA512 c67ae2d4c6c748a683aec27988c62f167be8b3502264a08bdf7e467fa0360f4150ddad3424630bf45d2d56018521df8ad3a435cc53d5ba1481c19a49088648f1 WHIRLPOOL 625f636d784a03c128afbfd1ffb4feaa17e81897dbbeb15f778df9602a216097635396c1c4e9025cc1401e944a748d26845343920ea43c4fe1ffedc2762ff21c -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c +DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/files/miscfiles-1.3-Makefile.diff b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/files/miscfiles-1.3-Makefile.diff deleted file mode 100644 index 011d1731ac..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/files/miscfiles-1.3-Makefile.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig 2003-03-08 17:26:28.000000000 +0200 -+++ Makefile.in 2003-03-08 17:28:59.000000000 +0200 -@@ -60,6 +60,7 @@ - $(INSTALL_DATA) $(srcdir)/dict-README $(datadir)/dict/README - rm -f $(datadir)/dict/words - ln $(datadir)/dict/web2 $(datadir)/dict/words -+ ln $(datadir)/dict/web2a $(datadir)/dict/extra.words - for i in $(miscfiles); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/misc/$$i ; \ - done -@@ -80,6 +81,7 @@ - rm -f $(datadir)/dict/$$i ; \ - done - rm -f $(datadir)/dict/README $(datadir)/dict/words -+ rm -f $(datadir)/dict/extra.words - for i in $(miscfiles); do \ - rm -f $(datadir)/misc/$$i ; \ - done diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/metadata.xml index 56c1244130..73dda144f9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild deleted file mode 100644 index 860c9a7382..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" - -inherit eutils - -UNI_PV=5.2.0 -DESCRIPTION="Miscellaneous files" -HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/" -# updated unicode data file from: -# http://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt -SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz - mirror://gentoo/UnicodeData-${UNI_PV}.txt.bz2" - -LICENSE="GPL-2 unicode" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="minimal" -# Collides with older versions/revisions -RDEPEND="!/dev/null ; then - ebegin "Regenerating cracklib dictionary" - create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null - eend $? - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild similarity index 52% rename from sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild index f4a54b376e..8237ad4383 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI="6" -UNI_PV=6.1.0 +UNI_PV="10.0.0" DESCRIPTION="Miscellaneous files" HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/" -# http://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt +# https://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz - mirror://gentoo/UnicodeData-${UNI_PV}.txt.xz" + https://dev.gentoo.org/~whissi/dist/${PN}/UnicodeData-${UNI_PV}.txt.xz" LICENSE="GPL-2 unicode" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="minimal" -# Collides with older versions/revisions -RDEPEND="! /dev/null eend $? fi + + # pkg_postinst isn't supposed to fail + return 0 }