From fc3556aa4466d278bff2aef2f88113089def0bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Jul 2023 04:10:14 +0100 Subject: gentoo auto-resync : 05:07:2023 - 04:10:14 --- sys-apps/baselayout/Manifest | 4 +-- sys-apps/baselayout/baselayout-2.13-r1.ebuild | 52 +++++++++++++-------------- sys-apps/baselayout/baselayout-9999.ebuild | 52 +++++++++++++-------------- 3 files changed, 54 insertions(+), 54 deletions(-) (limited to 'sys-apps/baselayout') diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 1c807e094514..2bb6692b57d8 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,6 @@ DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02 -EBUILD baselayout-2.13-r1.ebuild 11686 BLAKE2B 288432da0a85bc7e67702bf6522d62fe2d2cdf77fd6db8e954ffaec902cf0a0a1c7d625e34ea25e8389cd6815400a91db4b32997a4eb9c0585fff5c53f4431a7 SHA512 fc6c31119730b59e06eb87684680265c750f6242d4ba93af25c2cc0e108e3cdc25982b39a81bdf56afb63385476a4810117f5455446030835853eb8f7048ecd8 +EBUILD baselayout-2.13-r1.ebuild 11686 BLAKE2B adeac8dc0f417736700c68360b48916aa726132e13e22e1a66f812f05226b61b241c5037b65a9cbcf694c0cb8c5f4444e4c490b84bd26de901f4c4750bd39193 SHA512 e001080c313caf3deaeb5933d840b7a2516eed4fa1cf2a0e3b4f4e7573dda36780356fc5f30b51b695cdf3756e617458c41265ad4ac686296a2649877aad7d2a EBUILD baselayout-2.9.ebuild 11763 BLAKE2B ef42cf863a07defeae11565a3ae9d2a47e305485aab4a7ea756e120dc6d052e4933955eeba75f888fcae8cd3d63a38401b6173acbb5c773685988e62845daa02 SHA512 67c13d8aa872131da4eee4fe8123f9638fc40b1c23b831eb3e0aa7ea74e6760a366dac821e001c379a7f94b9ef02215fd92056beddb7c543b97c512433a6c778 -EBUILD baselayout-9999.ebuild 11694 BLAKE2B e655e8e247a378e456e8c3fc0659503779c09c4085d1c298db62076dc9908434dddcb07144820a24f5b9b3a8b2b63272eb3f3006294204319e8ee52c945e2496 SHA512 03a9e86cfd58f0d8c1093c77d970d7ca8af12e53dcd70ea5f7ac22351db04865ec04681081ed009bacd95c90fb880158d9a924fb5a0ee3ba399030e708953787 +EBUILD baselayout-9999.ebuild 11694 BLAKE2B f0744aeb0e5f4e7729440b80fa50ccb34c8d66a9f0c851bf8da32077b17536b052a4b506d9227aa407114d733919fd8c5e4b22391a125e8341518cde00ea61c0 SHA512 d486d370775a043ae01e372e5601edde30c07567990120dd1bcf65475122536bf349e779df6f57b69f4e48649588241c4927b44e1ea4c4d457943465f8316744 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193 diff --git a/sys-apps/baselayout/baselayout-2.13-r1.ebuild b/sys-apps/baselayout/baselayout-2.13-r1.ebuild index 49f04008670b..8cc92f9d92cc 100644 --- a/sys-apps/baselayout/baselayout-2.13-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.13-r1.ebuild @@ -21,10 +21,6 @@ IUSE="build +split-usr" RDEPEND="!sys-apps/baselayout-prefix" -pkg_setup() { - multilib_layout -} - riscv_compat_symlink() { # Here we apply some special sauce for riscv. # Two multilib layouts exist for now: @@ -191,29 +187,8 @@ multilib_layout() { fi } -pkg_preinst() { - # We need to install directories and maybe some dev nodes when building - # stages, but they cannot be in CONTENTS. - # Also, we cannot reference $S as binpkg will break so we do this. +pkg_setup() { multilib_layout - if use build ; then - if use split-usr ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile || die - - # Create symlinks in pkg_preinst to avoid Portage collision check. - # Create the symlinks in ${ED} via dosym so that we own it. - # Only create the symlinks if it wont cause a conflict in ${EROOT}. - if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then - dosym ../run/lock /var/lock - fi - if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then - dosym ../run /var/run - fi } src_prepare() { @@ -291,6 +266,31 @@ src_install() { fi } +pkg_preinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile || die + + # Create symlinks in pkg_preinst to avoid Portage collision check. + # Create the symlinks in ${ED} via dosym so that we own it. + # Only create the symlinks if it wont cause a conflict in ${EROOT}. + if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then + dosym ../run/lock /var/lock + fi + if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then + dosym ../run /var/run + fi +} + pkg_postinst() { local x diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 2294e5e84cc3..a588c68f51e9 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -21,10 +21,6 @@ IUSE="build +split-usr" RDEPEND="!sys-apps/baselayout-prefix" -pkg_setup() { - multilib_layout -} - riscv_compat_symlink() { # Here we apply some special sauce for riscv. # Two multilib layouts exist for now: @@ -191,29 +187,8 @@ multilib_layout() { fi } -pkg_preinst() { - # We need to install directories and maybe some dev nodes when building - # stages, but they cannot be in CONTENTS. - # Also, we cannot reference $S as binpkg will break so we do this. +pkg_setup() { multilib_layout - if use build ; then - if use split-usr ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile || die - - # Create symlinks in pkg_preinst to avoid Portage collision check. - # Create the symlinks in ${ED} via dosym so that we own it. - # Only create the symlinks if it wont cause a conflict in ${EROOT}. - if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then - dosym ../run/lock /var/lock - fi - if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then - dosym ../run /var/run - fi } src_prepare() { @@ -291,6 +266,31 @@ src_install() { fi } +pkg_preinst() { + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile || die + + # Create symlinks in pkg_preinst to avoid Portage collision check. + # Create the symlinks in ${ED} via dosym so that we own it. + # Only create the symlinks if it wont cause a conflict in ${EROOT}. + if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then + dosym ../run/lock /var/lock + fi + if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then + dosym ../run /var/run + fi +} + pkg_postinst() { local x -- cgit v1.2.3