From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- sys-apps/attr/Manifest | 4 +- sys-apps/attr/attr-2.4.48-r2.ebuild | 82 ----------------------------- sys-apps/attr/attr-2.4.48-r3.ebuild | 10 +++- sys-apps/attr/attr-9999.ebuild | 100 ++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 86 deletions(-) delete mode 100644 sys-apps/attr/attr-2.4.48-r2.ebuild create mode 100644 sys-apps/attr/attr-9999.ebuild (limited to 'sys-apps/attr') diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index 8b172fe71626..ccb1e9ddc156 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -4,6 +4,6 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 EBUILD attr-2.4.47-r2.ebuild 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b -EBUILD attr-2.4.48-r2.ebuild 2109 BLAKE2B d871796b5945f20511d9916debec767436e249c68d41605a7203c4fb954992aec8f320f0607e5657308da881ab9b4d54351301ec51fab443469b8cebbab23e01 SHA512 28363d164d4ea15ed83c3b53e45060fbb415667fed8957be3e67f31def9d075353c8c943bd59fbb08f0949432c0561f0cac26b9707f61e22d53cdd192c43e175 -EBUILD attr-2.4.48-r3.ebuild 2194 BLAKE2B 3e71d2333ce22d1c8e5d93daf29579fe77e677eba611301a68d4f6464330f55be574cb282f3b9517a71bb58a3be15d936c3260dae9d921fbbf92267271bff546 SHA512 4588c952bb83cba21e706e92402d9afd4cf2614f0bd2fad70496b3c650fdab0c4ebfe73613e059b6d2503d7daab97c9ddabefeb0214dded923cbadfaeb104775 +EBUILD attr-2.4.48-r3.ebuild 2353 BLAKE2B 293779e6b076e73c2eda3ad51d5282cae7e5b1b1615b660afb8583a7ba820d1b684ef19a42b0f9c65f605f93795b5f349c6b5d2752d825b512b40e15def115d4 SHA512 4943e67eb6843ea5f4cd525bd79c2d959a8318d84727e0dc9ff77928347784c552767f593abac4f5c2a6f4d30d887f7625c497ad229aea8f7cbde7b66c732205 +EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc diff --git a/sys-apps/attr/attr-2.4.48-r2.ebuild b/sys-apps/attr/attr-2.4.48-r2.ebuild deleted file mode 100644 index 0f25cfed5ee3..000000000000 --- a/sys-apps/attr/attr-2.4.48-r2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit libtool ltprune toolchain-funcs multilib-minimal usr-ldscript - -DESCRIPTION="Extended attributes tools" -HOMEPAGE="https://savannah.nongnu.org/projects/attr" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="debug nls static-libs" - -DEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}/${P}-perl-5.26.patch" -) - -src_prepare() { - default - elibtoolize #580792 -} - -multilib_src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - tc-ld-disable-gold #644048 - - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-shared - $(use_enable static-libs static) - $(use_enable nls) - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - $(use_enable debug) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Sanity check until we track down why this is happening. #644048 - local lib="${ED}/usr/$(get_libdir)/libattr.so.1" - if [[ -e ${lib} ]] ; then - local versions=$(readelf -V "${lib}") - local symbols=$(readelf -sW "${lib}") - if [[ "${versions}" != *"ATTR_1.0"* || \ - "${versions}" != *"ATTR_1.1"* || \ - "${versions}" != *"ATTR_1.2"* || \ - "${versions}" != *"ATTR_1.3"* || \ - "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then - echo "# readelf -V ${lib}" - echo "${versions}" - echo "# readelf -sW ${lib}" - echo "${symbols}" - die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048" - else - einfo "${lib} passed symbol checks" - fi - fi - - if multilib_is_native_abi; then - # we install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - fi - - # Add a wrapper until people upgrade. - insinto /usr/include/attr - newins "${FILESDIR}"/xattr-shim.h xattr.h -} - -multilib_src_install_all() { - use static-libs || prune_libtool_files --all - einstalldocs -} diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild index 15333e644dad..c5ed52072cc3 100644 --- a/sys-apps/attr/attr-2.4.48-r3.ebuild +++ b/sys-apps/attr/attr-2.4.48-r3.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit libtool toolchain-funcs multilib-minimal usr-ldscript +inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript DESCRIPTION="Extended attributes tools" HOMEPAGE="https://savannah.nongnu.org/projects/attr" @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="debug nls static-libs" DEPEND="nls? ( sys-devel/gettext )" @@ -21,6 +21,12 @@ PATCHES=( "${FILESDIR}/${P}-switch-back-to-syscall.patch" ) +pkg_setup() { + # Remove -flto* from flags as this breaks binaries (bug #644048) + filter-flags -flto* + append-ldflags "-Wl,--no-gc-sections" #700116 +} + src_prepare() { default elibtoolize #580792 diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild new file mode 100644 index 000000000000..1d01d82440c3 --- /dev/null +++ b/sys-apps/attr/attr-9999.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" + + inherit autotools git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="Extended attributes tools" +HOMEPAGE="https://savannah.nongnu.org/projects/attr" +LICENSE="LGPL-2.1" +SLOT="0" + +IUSE="debug nls static-libs" + +DEPEND="nls? ( sys-devel/gettext )" + +pkg_setup() { + # Remove -flto* from flags as this breaks binaries (bug #644048) + filter-flags -flto* +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles || die + eautopoint + eautoreconf + else + elibtoolize #580792 + fi +} + +multilib_src_configure() { + unset PLATFORM #184564 + export OPTIMIZER=${CFLAGS} + export DEBUG=-DNDEBUG + + tc-ld-disable-gold #644048 + + local myeconfargs=( + --bindir="${EPREFIX%/}"/bin + --enable-shared + $(use_enable static-libs static) + $(use_enable nls) + --libexecdir="${EPREFIX%/}"/usr/$(get_libdir) + $(use_enable debug) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # Sanity check until we track down why this is happening. #644048 + local lib="${ED}/usr/$(get_libdir)/libattr.so.1" + if [[ -e ${lib} ]] ; then + local versions=$(readelf -V "${lib}") + local symbols=$(readelf -sW "${lib}") + if [[ "${versions}" != *"ATTR_1.0"* || \ + "${versions}" != *"ATTR_1.1"* || \ + "${versions}" != *"ATTR_1.2"* || \ + "${versions}" != *"ATTR_1.3"* || \ + "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then + echo "# readelf -V ${lib}" + echo "${versions}" + echo "# readelf -sW ${lib}" + echo "${symbols}" + die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048" + else + einfo "${lib} passed symbol checks" + fi + fi + + if multilib_is_native_abi; then + # we install attr into /bin, so we need the shared lib with it + gen_usr_ldscript -a attr + fi + + # Add a wrapper until people upgrade. + insinto /usr/include/attr + newins "${FILESDIR}"/xattr-shim.h xattr.h +} + +multilib_src_install_all() { + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + einstalldocs +} -- cgit v1.2.3