diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
commit | fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch) | |
tree | 10baa743a5340b42ad538dd19d48669ccac209b1 /app-portage | |
parent | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff) |
gentoo resync : 16.06.2019
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/Manifest.gz | bin | 10243 -> 10237 bytes | |||
-rw-r--r-- | app-portage/eix/Manifest | 2 | ||||
-rw-r--r-- | app-portage/eix/eix-0.33.8.ebuild | 104 | ||||
-rw-r--r-- | app-portage/gemato/Manifest | 2 | ||||
-rw-r--r-- | app-portage/gemato/gemato-14.1.ebuild | 2 | ||||
-rw-r--r-- | app-portage/portage-utils/Manifest | 6 | ||||
-rw-r--r-- | app-portage/portage-utils/portage-utils-0.80_pre20190613.ebuild (renamed from app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild) | 15 | ||||
-rw-r--r-- | app-portage/portage-utils/portage-utils-9999.ebuild | 13 | ||||
-rw-r--r-- | app-portage/prefix-toolkit/Manifest | 1 | ||||
-rw-r--r-- | app-portage/prefix-toolkit/prefix-toolkit-3.ebuild | 647 | ||||
-rw-r--r-- | app-portage/unsymlink-lib/Manifest | 8 | ||||
-rw-r--r-- | app-portage/unsymlink-lib/unsymlink-lib-13.ebuild | 25 | ||||
-rw-r--r-- | app-portage/unsymlink-lib/unsymlink-lib-15.ebuild | 2 | ||||
-rw-r--r-- | app-portage/unsymlink-lib/unsymlink-lib-16.ebuild (renamed from app-portage/unsymlink-lib/unsymlink-lib-14.ebuild) | 0 |
14 files changed, 776 insertions, 51 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz Binary files differindex 8cba69c68085..358bbe6b687b 100644 --- a/app-portage/Manifest.gz +++ b/app-portage/Manifest.gz diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index bb175de905b0..a9e92620c934 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -1,3 +1,5 @@ DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077 +DIST eix-0.33.8.tar.xz 627116 BLAKE2B b301b4218d60c13a8d6c4be484b65e9bc257e6c4d1989054cc844861cd6ec96194e60094e72833f82cfaf1b1d14a249045590dbfc91a39e5c92d5dae13b2c643 SHA512 014ce5b660430e117e8037d8043bdfe5e6e98b7cb889e88d93aeb87e650296a8db64871f3eb736842dbebde7eb1f23936f6df9f5f547f89565734b7874e6e907 EBUILD eix-0.33.7.ebuild 2650 BLAKE2B 08a198024ced124b8ee493c33811ffaa83388fb71bf74919a433ffff26f7087887f4dd177ebaccfc92f44b485ce1c34a3e40b0b8078e510c03e82a7319071d24 SHA512 f8816c2b2fd3fcb4c6d1c7f4cf2fdfeab4af7c966b135532a7e99655caf1a8ae22c98af3dec509ce9cd7d8bdfafc75cc4e235743612bae52b4d79eb131ef133e +EBUILD eix-0.33.8.ebuild 2661 BLAKE2B f135d383d67071fb5d29136e4a14568d993525655c7f9c50dfee25d805eba646fddd24b22bf23afdb10c26a15d3d8f026fc184ced10aa8344206b650934018ad SHA512 a0a58dac2ceeb821ff9c6c7f275c3abab04f706d3d83be43645566f6de7b06cf89818a68cd790fcd3bd7ddfd257df9e17b8df389f3566feb53b62b05f0efac82 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6 diff --git a/app-portage/eix/eix-0.33.8.ebuild b/app-portage/eix/eix-0.33.8.ebuild new file mode 100644 index 000000000000..240099310a8f --- /dev/null +++ b/app-portage/eix/eix-0.33.8.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools bash-completion-r1 flag-o-matic tmpfiles + +DESCRIPTION="Search and query ebuilds" +HOMEPAGE="https://github.com/vaeth/eix/" +SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug doc nls sqlite" + +BOTHDEPEND="nls? ( virtual/libintl ) + sqlite? ( >=dev-db/sqlite-3:= )" +RDEPEND="${BOTHDEPEND} + >=app-shells/push-2.0-r1 + >=app-shells/quoter-3.0_p2-r1" +DEPEND="${BOTHDEPEND} + app-arch/xz-utils + nls? ( sys-devel/gettext )" + +pkg_setup() { + # remove stale cache file to prevent collisions + local old_cache=${EROOT%/}/var/cache/${PN} + if [[ -f ${old_cache} ]]; then + rm "${old_cache}" || die + fi +} + +src_prepare() { + default + sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die + + sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \ + -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \ + -i src/eix-functions.sh.in || die + sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \ + -i src/Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + $(use_enable debug paranoic-asserts) + $(use_enable nls) + $(use_with doc extra-doc) + $(use_with sqlite) + + # default configuration + $(use_with prefix always-accept-keywords) + --with-dep-default + --with-required-use-default + + # paths + --with-portage-rootpath="${ROOTPATH}" + --with-eprefix-default="${EPREFIX}" + + # build a single executable with symlinks + --disable-separate-binaries + --disable-separate-tools + + # used purely to control/disrespect *FLAGS + --disable-debugging + --disable-new_dialect + --disable-optimization + --disable-strong-optimization + --disable-security + --disable-nopie-security + --disable-strong-security + ) + + # https://github.com/vaeth/eix/issues/35 + append-cxxflags -std=c++14 + + econf "${myconf[@]}" +} + +src_install() { + default + dobashcomp bash/eix + dotmpfiles tmpfiles.d/eix.conf + + rm -r "${ED%/}"/usr/bin/eix-functions.sh || die + +} + +pkg_postinst() { + tmpfiles_process eix.conf + + local obs=${EROOT%/}/var/cache/eix.previous + if [[ -f ${obs} ]]; then + ewarn "Found obsolete ${obs}, please remove it" + fi +} + +pkg_postrm() { + if [[ ! -n ${REPLACED_BY_VERSION} ]]; then + rm -rf "${EROOT%/}/var/cache/${PN}" || die + fi +} diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest index 84b0864d9a8b..0e5c2be73508 100644 --- a/app-portage/gemato/Manifest +++ b/app-portage/gemato/Manifest @@ -4,7 +4,7 @@ DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591 -EBUILD gemato-14.1.ebuild 1356 BLAKE2B 1eb92d7e72255a38a72083f871a600b61902d2e5f21a035ff545d9f1888b8d1ccbf8c7e53dff3ced9c2de517f229efcd596b294c7da2ca4b01bd3912f1173dd5 SHA512 a1e4652e9a8f91654d8739f42633723162dfde1d7e2c1198aff8bc38bb12a66fcf2762ce5a0a136bf58ad2591beba18c1ba51b602ad1f0348714bfe579895706 +EBUILD gemato-14.1.ebuild 1355 BLAKE2B 98b86d290609513e03ba12b7fcf54412153a151e5cc6e385c77108420865cd4d2d0711a53273d43c098dbb1a9204a62ab3be50dec416fa729a9553b84f61258d SHA512 f74ebed6753f07e12890ccc9addba38559bace6758df0febccfb80a3c356f6ec4f976a7e5a23c15e08d2f6176c456ce3aa9b2e7e1e0b05bca3cfe1c6e312778b EBUILD gemato-14.1m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591 EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28 EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562 diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild index 39ca2a99a869..9548ad6f7eae 100644 --- a/app-portage/gemato/gemato-14.1.ebuild +++ b/app-portage/gemato/gemato-14.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd" +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd" IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index aa699fcbc0d0..6c21759bebd7 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -3,10 +3,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e -DIST portage-utils-0.80_pre20190605.tar.xz 1756988 BLAKE2B 2a6dd8fbfd3ea68fa205010727ba30e17fef6c1ccdfeb7fbe4adcea981c1b57ef027ab607c1f07aa1ef78d530cff004289a27f294c893d1fd204014e77c44b45 SHA512 2bfede4765454eff9247504dc189915cab5f82c32760ef6e42f9452bfa6e7583c046c228bdc043c8c1ad190301b7b530d5753514989bed8633140a43bf0f5106 +DIST portage-utils-0.80_pre20190613.tar.xz 1760016 BLAKE2B c36240f6fff40a3acb9c0f485d73d37dab4d9b4acc280eaabfbb11e17112c11330068a2e0bbb316bbab8a4ed9da1f9bd843b42f062c0cfbd80160709824b0825 SHA512 1b2f9e5eb8adb0f7da8c122374660e4e8f1b7a5af2ea5f4f16d7dcfb7b7c140f424b6980f664a2c5d987710ad046301e95eb72311158bb3187f471fe78e190b1 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a -EBUILD portage-utils-0.80_pre20190605.ebuild 2079 BLAKE2B 03b6ffeb21b35a5f5e6281c82b41c37f63c6d0df341eb60157f5a8b052ccc54ea81c995b886f9f083b22aa52f573c285ff06390023784521ccb7f0803a8edded SHA512 39a1b6c1303b091687cfb3a931cfbc64bea349e1c92b8c2af2b603fcd5814511d3e7e7432b1d0f28a2f1417f1e1cd51394d51d40a5d2acf821085a2c0e9f8ce3 -EBUILD portage-utils-9999.ebuild 1562 BLAKE2B daa09f9974e4cd309d1cbb26fe787fb8e7c80e32353bdb40a876f4be2ed7aecb7bf43caafc51ed74b01268bc294630a40d799159da83121e3dd4789b6544273e SHA512 708375c66fffbb3f81b438d67fbe572806c152d2a99dff39fa8e15088b0b5b0f0a4ccd6f8275cae6517a5ae06fa91ad5b56db5d693b3d503dbd47dd6766e52d5 +EBUILD portage-utils-0.80_pre20190613.ebuild 2082 BLAKE2B c89384283d82201480e205d0f0db94cf27ec89a7f903ea5447bef0749ef4a0861ca7e7714403ea26ba9ae28ab4e514e2e1b447e4ecb6892c0a3c3ebd36c1fd36 SHA512 e457545fdfacfb622850b134ef7c74e47994dac4ce97b467a91263d8245497925b0ccadf5406af7d20b54683ddeb6142da96a94f8aeec8391853fe84074f92e4 +EBUILD portage-utils-9999.ebuild 1542 BLAKE2B bb5c9e5992b4e27e841fe1d8478d24059f2f2ed653afc763347b3ff121eaf8f0d2703f5d55c15fba21d4a8d7e349b1863c2889577ef120f45e4ba36de36f7171 SHA512 fc4245c16681466cdf1f387f508cd862471335b8213a6f09dea00d7adbb85288f3092038ea758707382830bb61bcef54614153bc0925a288216f21939b877a51 MISC metadata.xml 390 BLAKE2B 8912128b1d4cc1afd29f01ca9b9014a5e1726d2a74fd42e57836f40ecfab15c2fc89bc403c9e4a41fd14e40fd732e546d93ed03004c820b5a25be69e0725e606 SHA512 a152ae18c44f4a4946b62e8724d84409c4cc1ffa66892e649551b3815935de4f3a926b7b9926fef9d5c9594fb9f70ef7571e1f9ea3c3709516b47665279a549d diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190613.ebuild index 754e9aafaac0..daaaf9474d2c 100644 --- a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild +++ b/app-portage/portage-utils/portage-utils-0.80_pre20190613.ebuild @@ -14,9 +14,8 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi RDEPEND=" @@ -33,15 +32,15 @@ RDEPEND=" app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) - sys-libs/zlib[static-libs] - app-crypt/gpgme[static-libs] + sys-libs/zlib:=[static-libs] + app-crypt/gpgme:=[static-libs] ) !static? ( - app-crypt/libb2 + app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme + sys-libs/zlib:= + app-crypt/gpgme:= ) ) " diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index d116c33af568..ba0d7c726581 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -14,8 +14,7 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -33,15 +32,15 @@ RDEPEND=" app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) - sys-libs/zlib[static-libs] - app-crypt/gpgme[static-libs] + sys-libs/zlib:=[static-libs] + app-crypt/gpgme:=[static-libs] ) !static? ( - app-crypt/libb2 + app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme + sys-libs/zlib:= + app-crypt/gpgme:= ) ) " diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest index 0fd334cab2e1..b2854b1c65a5 100644 --- a/app-portage/prefix-toolkit/Manifest +++ b/app-portage/prefix-toolkit/Manifest @@ -1,4 +1,5 @@ EBUILD prefix-toolkit-0.ebuild 15920 BLAKE2B 2870e1ec8e65f26f38e15bad7f4ba5e6bedd909d34de3017885fa9d45a885646b586e26af29d226558103800e8b68db637516d5256007bba0f5e07452e565696 SHA512 87ca32003ec443f57d6980db36f098d2abc9bd28ae2c9361ef2f01fc9d9da66bac2fb2f1354b293212fa8cd53605cf5cc9a1974718e0d88f30a120f01816e50d EBUILD prefix-toolkit-1.ebuild 15932 BLAKE2B bd487e55cfc8bbd571d4668505914610d5be4627db4e43b5c941fe72e0ca276501e0312546078f5ca0e510e9630aff7212f9e696709dcd374cbb290f181f6de5 SHA512 86e1e36ca1460622cc6ae2ac2b75a02540966ed27e079b8dbf24d900bcccf5d9249c9d1133ba5228d83e27ad8eabb8bced37befde69b1fb93231425ae0e2ee5c EBUILD prefix-toolkit-2.ebuild 17557 BLAKE2B 333f8c9335aa18e718d408c1572001bdbb2a8d26b1c017b9a8d579d6811e9a909ab6c9b36d5126b2d68801b1972d0371b1caa9634aaa88c644ef45afb2bedf0e SHA512 fdf43f6380d2a172c6ff6814a8521fe7a2494a8b2485b1f97a6bdf7eba8907ec562c499f67af36124f6a0f652c56675f9cec639c7ea094a09c90023c8eac0c12 +EBUILD prefix-toolkit-3.ebuild 18363 BLAKE2B a5a805882f0e654dab5da79ba18940949591272e6ae5f81d11d6ba751faac22a8c39230aecf40df315731e696e86ff5a3861c8ff8aa3302db95ba507b5d85d9b SHA512 6053e11f3c5bb8aaee05da82efa6c78019f32872188da3a0cf6fab1585923241e108f089a7084feaded48827f60397b7d10af8471329d62a75fcfbdae4f19350 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9 diff --git a/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild new file mode 100644 index 000000000000..e4719f87c3a9 --- /dev/null +++ b/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild @@ -0,0 +1,647 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Utilities for users of Gentoo Prefix" +HOMEPAGE="https://prefix.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" + +[[ ${PV} == 9999 ]] || +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + +DEPEND=" + !app-portage/prefix-chain-setup + !sys-apps/prefix-chain-utils +" +BDEPEND="${DEPEND} + >sys-apps/portage-2.3.62 +" +# In prefix-stack, these dependencies actually are the @system set, +# as we rely on the base prefix anyway for package management, +# which should have a proper @system set. +# See als: pkg_preinst +RDEPEND="${DEPEND} + prefix-stack? ( + >=sys-apps/baselayout-prefix-2.6 + sys-apps/gentoo-functions + app-portage/elt-patches + sys-devel/gnuconfig + sys-devel/gcc-config + ) +" + +S="${WORKDIR}" + +my_unpack() { + local infile=$1 + local outfile=${2:-${infile}} + ebegin "extracting ${outfile}" + sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \ + > "${outfile}" || die "Failed to unpack ${outfile}" + eend $? +} + +src_unpack() { + if use prefix-stack ; then + my_unpack prefix-stack.bash_login + my_unpack prefix-stack.bashrc + my_unpack prefix-stack.envd.99stack + my_unpack prefix-stack-ccwrap + local editor pager + for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano + do + [[ -x ${editor} ]] || continue + done + for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less + do + [[ -x ${pager} ]] || continue + done + printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback + else + my_unpack prefix-stack-setup + fi + my_unpack startprefix +} + +my_prefixify() { + local ebash eenv + if use prefix-stack ; then + ebash="${BROOT}/bin/bash" + eenv="${BROOT}/usr/bin/env" + else + ebash="${EPREFIX}/bin/bash" + eenv="${EPREFIX}/usr/bin/env" + fi + + # the @=@ prevents repoman from believing we set readonly vars + sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \ + -e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \ + -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \ + -e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \ + -e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \ + -e "s,@=@,=,g" \ + -i "$@" || die +} + +src_configure() { + # do not eprefixify during unpack, to allow userpatches to apply + my_prefixify * +} + +src_install-prefix-stack-ccwrap() { + # install toolchain wrapper. + local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV} + local wrappercfg=${CHOST}-${P} + + exeinto $wrapperdir + doexe prefix-stack-ccwrap + + local cc + for cc in \ + gcc \ + g++ \ + cpp \ + c++ \ + windres \ + ; do + dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc} + dosym ${CHOST}-${cc} $wrapperdir/${cc} + done + + # LDPATH is required to keep gcc-config happy :( + cat > ./${wrappercfg} <<-EOF + GCC_PATH="${EPREFIX}$wrapperdir" + LDPATH="${EPREFIX}$wrapperdir" + EOF + + insinto /etc/env.d/gcc + doins ./${wrappercfg} +} + +src_install() { + if use prefix-stack; then + src_install-prefix-stack-ccwrap + insinto /etc + doins prefix-stack.bash_login + insinto /etc/bash + newins prefix-stack.bashrc bashrc + newenvd prefix-stack.envd.99stack 99stack + doenvd 000fallback + else + dobin prefix-stack-setup + fi + exeinto / + doexe startprefix +} + +pkg_preinst() { + use prefix-stack || return 0 + ebegin "Purging @system package set for prefix stack" + # In prefix stack we empty out the @system set defined via make.profile, + # as we may be using some normal profile, but that @system set applies + # to the base prefix only. + # Instead, we only put ourselve into the @system set, and have additional + # @system packages in our RDEPEND. + my_lsprofile() { + ( + cd -P "${1:-.}" || exit 1 + [[ -r ./parent ]] && + for p in $(<parent) + do + my_lsprofile "${p}" || exit 1 + done + pwd -P + ) + } + local systemset="/etc/portage/profile/packages" + dodir "${systemset%/*}" + [[ -s ${EROOT}${systemset} ]] && + grep -v "# maintained by ${PN}" \ + "${EROOT}${systemset}" \ + > "${ED}${systemset}" + local p + for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile) + do + [[ -s ${p}/${systemset##*/} ]] || continue + awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \ + < "${p}"/packages || die + done | sort -u >> "${ED}${systemset}" + [[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}" + echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die + eend $? +} + +return 0 + +: startprefix <<'EOIN' +#!@GENTOO_PORTAGE_EBASH@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10 +# Enters the prefix environment by starting a login shell from the +# prefix. The SHELL environment variable is elevated in order to make +# applications that start login shells to work, such as `screen`. + +# if you come from a substantially polluted environment (another +# Prefix), a cleanup as follows resolves most oddities I've ever seen: +# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l +# hence this script starts the Prefix shell like this + +if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]] +then + echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr + exit -1 +elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] && + [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]] +then + echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr + exit -1 +fi + +# What is our prefix? +EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@' +BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@' + +# not all systems have the same location for shells, however what it +# boils down to, is that we need to know what the shell is, and then we +# can find it in the bin dir of our prefix +for SHELL in \ + "${EPREFIX}/bin/${SHELL##*/}" \ + "${BPREFIX}/bin/${SHELL##*/}" \ + ${SHELL##*/} +do + [[ ${SHELL} == */* && -x ${SHELL} ]] && break +done + +# check if the shell exists +if [[ ${SHELL} != */* ]] +then + echo "Failed to find the Prefix shell, this is probably" > /dev/stderr + echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr + exit 1 +fi + +# set the prefix shell in the environment +export SHELL + +# give a small notice +echo "Entering Gentoo Prefix ${EPREFIX}" +# start the login shell, clean the entire environment but what's needed +RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL" +# PROFILEREAD is necessary on SUSE not to wipe the env on shell start +[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD" +# ssh-agent is handy to keep, of if set, inherit it +[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK" +# if we're on some X terminal, makes sense to inherit that too +[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY" +# do it! +if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then + '@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l +elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then + # shell coming from different prefix would load it's own + # etc/profile upon -l, so we have to override + '@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i +else + echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr + exit 1 +fi +# and leave a message when we exit... the shell might return non-zero +# without having real problems, so don't send alarming messages about +# that +echo "Leaving Gentoo Prefix with exit status $?" +EOIN + +: prefix-stack.bashrc <<'EOIN' +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# In stacked Prefix there is no bash installed, yet +# etc/bash/bashrc from base Prefix still is useful. +# + +if [[ $- != *i* ]] ; then + # Shell is non-interactive, bashrc does not apply + return +fi + +if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then + source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc' + # only if base Prefix does have an etc/bash/bashrc, we also + # run bashrc snippets provided by packages in stacked Prefix + for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do + [[ -r ${sh} ]] && source "${sh}" + done + unset sh +else + # etc/profile does expect etc/bash/bashrc to set PS1 + PS1='\u@\h \w \$ ' +fi +EOIN + +: prefix-stack.bash_login <<'EOIN' +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# In stacked Prefix there is no bash installed, so there is +# no bash able to load this Prefix' profile as login shell. +# Instead, you can specify this one as bash rcfile to mimic +# a bash login shell using this stacked Prefix profile. +# + +if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then + . '@GENTOO_PORTAGE_EPREFIX@/etc/profile' +fi +if [[ -s ~/.bash_profile ]] ; then + . ~/.bash_profile +elif [[ -s ~/.bash_login ]] ; then + . ~/.bash_login +elif [[ -s ~/.profile ]] ; then + . ~/.profile +fi +EOIN + +: prefix-stack.envd.99stack <<'EOIN' +PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig" +PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@" +EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@" +EOIN + +: prefix-stack-setup <<'EOIN' +#!@GENTOO_PORTAGE_EPREFIX@/bin/bash +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@" +PARENT_CHOST="@GENTOO_PORTAGE_CHOST@" +CHILD_EPREFIX= +CHILD_PROFILE= +CHILD_CHOST= + +# +# get ourselfs the functions.sh script for ebegin/eend/etc. +# +for f in \ + /lib/gentoo/functions.sh \ + /etc/init.d/functions.sh \ + /sbin/functions.sh \ +; do + if [[ -r ${PARENT_EPREFIX}${f} ]] ; then + . "${PARENT_EPREFIX}${f}" + f=found + break + fi +done + +if [[ ${f} != found ]] ; then + echo "Cannot find Gentoo functions, aborting." >&2 + exit 1 +fi + +for arg in "$@"; do + case "${arg}" in + --eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;; + --profile=*) CHILD_PROFILE="${arg#--profile=}" ;; + --chost=*) CHILD_CHOST="${arg#--chost=}" ;; + + --help) + einfo "$0 usage:" + einfo " --eprefix=[PATH] Path to new EPREFIX to create stacked to the prefix" + einfo " where this script is installed (${PARENT_EPREFIX})" + einfo " --profile=[PATH] The absolute path to the profile to use. This path" + einfo " must point to a directory within ${PARENT_EPREFIX}" + einfo " --chost=[CHOST] The CHOST to use for the new EPREFIX, required if" + einfo " the profile does not set CHOST, or to override." + exit 0 + ;; + esac +done + +# +# sanity check of given values +# + +test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; } +test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; } +test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; } +test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; } + +if [[ -z ${CHILD_CHOST} ]] +then + my_lsprofile() { + ( + cd -P "${1:-.}" || exit 1 + [[ -r ./parent ]] && + for p in $(<parent) + do + my_lsprofile "${p}" || exit 1 + done + pwd -P + ) + } + + for profile in $(my_lsprofile "${CHILD_PROFILE}") missing + do + if [[ ${profile} == missing ]] + then + eerror "profile does not set CHOST, need --chost argument" + exit 1 + fi + [[ -s "${profile}/make.defaults" ]] || continue + grep -q '^[ ]*CHOST@=@' "${profile}/make.defaults" && break + done +fi + +einfo "creating stacked prefix ${CHILD_EPREFIX}" + +# +# functions needed below. +# +eend_exit() { + eend $1 + [[ $1 != 0 ]] && exit 1 +} + +# +# create the directories required to bootstrap the least. +# +ebegin "creating directory structure" +( + set -e + mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask + mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force + mkdir -p "${CHILD_EPREFIX}"/etc/portage/env + mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env + ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf +) +eend_exit $? + +# +# create a make.conf and set PORTDIR and PORTAGE_TMPDIR +# +ebegin "creating make.conf" +( + set -e + echo "#" + echo "# The following values where taken from the parent prefix's" + echo "# environment. Feel free to adopt them as you like." + echo "#" + echo "CFLAGS=\"$(portageq envvar CFLAGS)\"" + echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\"" + echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\"" + niceness=$(portageq envvar PORTAGE_NICENESS || true) + [[ -n ${niceness} ]] && + echo "PORTAGE_NICENESS=\"${niceness}\"" + echo + echo "# Mirrors from parent prefix." + echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\"" + echo + echo "# Below comes the prefix-stack setup. Only change things" + echo "# if you know exactly what you are doing!" + echo "EPREFIX=\"${CHILD_EPREFIX}\"" + echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" + echo "BROOT=\"${PARENT_EPREFIX}\"" + if [[ -n ${CHILD_CHOST} ]] ; then + echo "CHOST=\"${CHILD_CHOST}\"" + fi +) > "${CHILD_EPREFIX}"/etc/portage/make.conf +eend_exit $? + +ebegin "creating use.mask/prefix-stack" +printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack +eend_exit $? + +ebegin "creating use.force/prefix-stack" +printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack +eend_exit $? + +ebegin "creating env/host-cc.conf" +cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM + CC=${PARENT_CHOST}-gcc + CXX=${PARENT_CHOST}-g++ + EOM +eend_exit $? + +ebegin "creating package.env/prefix-stack" +cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM' + # merge with the parent's chost. this forces the use of the parent + # compiler, which generally would be illegal - this is an exception. + # This is required for example on winnt, because the wrapper has to + # be able to use/resolve symlinks, etc. native winnt binaries miss + # that ability, but cygwin binaries don't. + sys-devel/gcc-config host-cc.conf + sys-apps/gentoo-functions host-cc.conf + EOM +eend_exit $? + +# +# create the make.profile symlinks. +# +ebegin "creating make.profile" +( + ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile" +) +eend_exit $? + +# +# adjust permissions of generated files. +# +ebegin "adjusting permissions" +( + set -e + chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf + chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf + chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack +) +eend_exit $? + +# +# now merge some basics. +# +ebegin "installing required basic packages" +( + set -e + export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}" + export EPREFIX@=@"${CHILD_EPREFIX}" + export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}" + + # let baselayout create the directories + USE@=@"${USE} build" \ + emerge --verbose --nodeps --oneshot \ + '>=baselayout-prefix-2.6' + + # In prefix-stack, app-portage/prefix-toolkit does + # install/update an etc/portage/profile/packages file, + # removing all @system packages from current make.profile, + # and adding itself to @system set instead. + emerge --verbose --nodeps --oneshot \ + app-portage/prefix-toolkit + + # In prefix-stack, prefix-toolkit does have an RDEPEND on them, + # to hold them in the @system set. + emerge --verbose --nodeps --oneshot \ + sys-apps/gentoo-functions \ + app-portage/elt-patches \ + sys-devel/gnuconfig \ + sys-devel/gcc-config + + # select the stack wrapper profile from gcc-config + env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \ + "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1 +) +eend_exit $? + +# +# wow, all ok :) +# +ewarn +ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf." +ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"." +ewarn +EOIN + +: prefix-stack-ccwrap <<'EOIN' +#!@GENTOO_PORTAGE_BPREFIX@/bin/bash + +if [ -r /cygdrive/. ]; then + winpath2unix() { cygpath -u "$1"; } + unixpath2win() { cygpath -w "$1"; } +fi + +myself=${0##*/} # basename $0 +link_dirs=() +opts=() +chost="@GENTOO_PORTAGE_CHOST@" +prefix="@GENTOO_PORTAGE_EPREFIX@" +absprefix=${prefix} +if [[ ${chost} == *"-winnt"* ]]; then + # we may get called from windows binary, like pkgdata in dev-libs/icu + # in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix + absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")") +fi +[[ ${myself} == *windres* ]] && mode=compile || mode=link +orig_args=("$@") + +for opt in "$@" +do + case "$opt" in + -L) + link_dirs=("${link_dirs[@]}" "-L$1") + shift + ;; + -L*) + link_dirs=("${link_dirs[@]}" "${opt}") + ;; + *) + case "${opt}" in + -v) + # -v done right: only use mode version if -v is the _only_ + # argument on the command line. + [[ ${#orig_args[@]} -gt 1 ]] || mode=version + ;; + --version) mode=version ;; + -c|-E|-S) mode=compile ;; + -print-search-dirs) mode=dirs ;; + esac + opts=("${opts[@]}" "${opt}") + ;; + esac +done + +# remove any path to current prefix, need base prefix only +new_path= +save_ifs=$IFS +IFS=':' +for p in $PATH +do + IFS=$save_ifs + [[ ${p#${absprefix}} != "${p}" ]] && continue + if [[ -z "${new_path}" ]]; then + new_path="${p}" + else + new_path="${new_path}:${p}" + fi +done +IFS=$save_ifs + +PATH=${new_path} + +pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include") +pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib") +# binutils-config's ldwrapper understands '-R' for aix and hpux too. +pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib") +case "${chost}" in +*-winnt*) + # parity (winnt) understands -rpath only ... + pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib") + ;; +*-linux*) + # With gcc, -isystem would avoid warning messages in installed headers, + # but that breaks with AIX host headers. + pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include") + ;; +esac + +# ensure we run the right chost program in base prefix +[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-} + +case "$mode" in +link) exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;; +compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;; +version) exec "${myself}" "${orig_args[@]}" ;; +dirs) + "${myself}" "${orig_args[@]}" | while read line; do + if [[ "${line}" == "libraries: ="* ]]; then + echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}" + else + echo "${line}" + fi + done + ;; +*) echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;; +esac +EOIN diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest index 526c33569dcd..16caffd260fb 100644 --- a/app-portage/unsymlink-lib/Manifest +++ b/app-portage/unsymlink-lib/Manifest @@ -1,8 +1,6 @@ -DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2 -DIST unsymlink-lib-14.tar.gz 10089 BLAKE2B 24252eb31a0a0fe83a260e8eee76d42c473d76dbebe4d2fd604d1ab663ea7439da4c03dd0b953efa30e0d74d654101b7a0264db1da50de826c5a5f4ae79f3ff0 SHA512 ab3ffcbc7cdcac98068a6e3c86e71cb472cff67aed1ddc570701ed6c34fa17e04d84a13bf5fb2696aeff0f8338b2464d1e06ce829ffc693011c51481ecba2be8 DIST unsymlink-lib-15.tar.gz 10145 BLAKE2B 500b78a84cd555319952ce6420af012354952ebd83983db121f1a48ee34d5c2ce9a9f56ce635d6f77eb38058b79d42cf94d2e421414095c188949db523aacbe0 SHA512 37b8cc4eb7b787a1ccc97750df9fcd4516c2c4ac110c5191b4be3999b1eb994ee567e0f4387aaafe243a745efa61c0d48d78b7f9a4a58bb7f896ccd7bdce03a7 -EBUILD unsymlink-lib-13.ebuild 582 BLAKE2B b62d621c212ba50a4fd23f1a7f82556293cb641fea9780b8912f4eb0574afc4d743487a0d7c0ed1466085de10a5c80f2cd5d2908b1b0c8175e12952fd8275ee9 SHA512 99c47df9a06d16b8ab5a35dd1a5d987641f8652a447de245cce7786a8cfc252d57fd693c9e78078bea53b933664826200e8f3b5fe958974f67cf0152d176cc88 -EBUILD unsymlink-lib-14.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6 -EBUILD unsymlink-lib-15.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6 +DIST unsymlink-lib-16.tar.gz 10139 BLAKE2B 8e43fe85747d97fa44ae30cf6f276e8e5557141004c0c6ec5f1b998c0f5c121e9fb6bb3f7d711d11ca962c703caa7dc6014ddfde2c6ccf16807264a132e37940 SHA512 0c5ebab3622aad1f8a02c2530bfb3f6d48c0ac9744fdde94e8a9b151c5773d10ae642c122642d5f7e2bd442d5969863d8f5f0586c8ed484fa22ac42143a06417 +EBUILD unsymlink-lib-15.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b +EBUILD unsymlink-lib-16.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6 EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6 diff --git a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild deleted file mode 100644 index 77343a9893a4..000000000000 --- a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) -inherit python-single-r1 - -DESCRIPTION="Convert your system to SYMLINK_LIB=no" -HOMEPAGE="https://github.com/mgorny/unsymlink-lib" -SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - sys-apps/portage[${PYTHON_USEDEP}]" - -src_install() { - python_doscript unsymlink-lib - dodoc README -} diff --git a/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild index 90b56e60ca45..562293f6186a 100644 --- a/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild +++ b/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.t LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-16.ebuild index 90b56e60ca45..90b56e60ca45 100644 --- a/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild +++ b/app-portage/unsymlink-lib/unsymlink-lib-16.ebuild |