From c9c609463fab9bcfb35694627bca1429a21fdbb2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Oct 2022 21:06:00 +0000 Subject: gentoo auto-resync : 31:10:2022 - 21:05:59 --- app-misc/egads/Manifest | 3 +- app-misc/egads/egads-0.9.5-r1.ebuild | 51 ------------------ app-misc/egads/egads-0.9.5-r2.ebuild | 62 ++++++++++++++++++++++ .../egads-0.9.5-make-build-work-with-clang16.patch | 16 ++++++ 4 files changed, 80 insertions(+), 52 deletions(-) delete mode 100644 app-misc/egads/egads-0.9.5-r1.ebuild create mode 100644 app-misc/egads/egads-0.9.5-r2.ebuild create mode 100644 app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch (limited to 'app-misc/egads') diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest index 018fba98a5f0..db762c3337ce 100644 --- a/app-misc/egads/Manifest +++ b/app-misc/egads/Manifest @@ -1,3 +1,4 @@ +AUX egads-0.9.5-make-build-work-with-clang16.patch 549 BLAKE2B c2a2e1784059123a06c2f7917d0441a5a915e4a76b5281cdae7f26616478ceb86ff2fe975e50e97b271a1b8625f79a3929cd0eb47d4778d3ed5ae72734a020ca SHA512 2b8638066709db9f4697435c3634bb2716946b3d9ff551c8bd963dba39b02b3fd59959ee9a218c6eee03634415b9a5a7d2e2f9f193a67b3062386ffb7f05ff2c DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b -EBUILD egads-0.9.5-r1.ebuild 1076 BLAKE2B df26ccdd508849946277c932ef8839d50c33d3ed60ef30f703481aff68e132ecc007421094f5bbffb0423330c58c146535c15f06add1988335ccf99c84bf4265 SHA512 36a45db567e23770bf6b3b0551fb523f117685cc1d781203f2fc53cd97ef89ca567c0613b9ca648fd8182b4212aaf4a009ae40b9570dbee82849100ac617c6d3 +EBUILD egads-0.9.5-r2.ebuild 1174 BLAKE2B b36c092d8ef73d6044686a788ff21c687f991ffc2139005d84d315b458c7b57cbdf41c7833500ec8a99e7f93bb9645a2c8a37fd9153fc8a11ee7fc9c9f750161 SHA512 1047791c263306b2a9e27b824381a5b6e181aeea43039c18fd2df67ad282451ef2ce6dac7d8f6e2e4deca3cb0fed3f58d85515717fe36c1ce7b0d43bc07a8506 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild deleted file mode 100644 index 032827037c57..000000000000 --- a/app-misc/egads/egads-0.9.5-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Entropy Gathering And Distribution System" -HOMEPAGE="http://www.securesoftware.com/download_egads.htm" -SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -EGADS_DATADIR=/var/run/egads - -src_prepare() { - default - sed -i \ - -e '/^BINDIR/d' \ - -e '/^LIBDIR/d' \ - -e '/^INCLUDEDIR/d' \ - "${S}"/Makefile.in || die "Failed to fix Makefile.in" - tc-export CC AR RANLIB -} - -src_configure() { - econf \ - --with-egads-datadir="${EGADS_DATADIR}" \ - --with-bindir="${EPREFIX}"/usr/sbin \ - --disable-static -} - -src_compile() { - emake LIBDIR="/usr/$(get_libdir)" -} - -src_install() { - keepdir ${EGADS_DATADIR} - fperms +t ${EGADS_DATADIR} - # NOT parallel safe, and no DESTDIR support - emake -j1 install \ - BINDIR="${D}"/usr/sbin \ - LIBDIR="${D}"/usr/$(get_libdir) \ - INCLUDEDIR="${D}"/usr/include - - dodoc README* doc/*.txt doc/*.html - - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-misc/egads/egads-0.9.5-r2.ebuild b/app-misc/egads/egads-0.9.5-r2.ebuild new file mode 100644 index 000000000000..521388fd56d9 --- /dev/null +++ b/app-misc/egads/egads-0.9.5-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs flag-o-matic + +DESCRIPTION="Entropy Gathering And Distribution System" +HOMEPAGE="http://www.securesoftware.com" +SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" + +EGADS_DATADIR=/var/run/egads + +PATCHES=( + "${FILESDIR}"/${P}-make-build-work-with-clang16.patch +) + +src_prepare() { + default + + rm aclocal.m4 || die + + eautoreconf + + sed -i \ + -e '/^BINDIR/d' \ + -e '/^LIBDIR/d' \ + -e '/^INCLUDEDIR/d' \ + "${S}"/Makefile.in || die "Failed to fix Makefile.in" +} + +src_configure() { + tc-export CC AR RANLIB + + # bug #312983 + append-flags -fno-strict-aliasing + + econf --with-egads-datadir="${EGADS_DATADIR}" +} + +src_compile() { + emake LIBDIR="/usr/$(get_libdir)" +} + +src_install() { + keepdir ${EGADS_DATADIR} + fperms +t ${EGADS_DATADIR} + + # NOT parallel safe, and no DESTDIR support + emake -j1 install \ + BINDIR="${D}"/usr/sbin \ + LIBDIR="${D}"/usr/$(get_libdir) \ + INCLUDEDIR="${D}"/usr/include + + dodoc README* doc/*.txt doc/*.html + + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch b/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch new file mode 100644 index 000000000000..4f1b99c8f319 --- /dev/null +++ b/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch @@ -0,0 +1,16 @@ +Clang16 does not allow K&R C function declarations by default. This changes the declaration to a modern C function declaration. + +Signed-off-by: Pascal Jäger + +--- a/sha1.c ++++ b/sha1.c +@@ -131,8 +131,7 @@ void SHAInit(SHA_CTX *shsInfo) + + Note that this corrupts the shsInfo->data area */ + +-static void SHSTransform( digest, data ) +- UINT4 *digest, *data ; ++static void SHSTransform(UINT4 *digest,UINT4 *data) + { + UINT4 A, B, C, D, E; /* Local vars */ + UINT4 eData[ 16 ]; /* Expanded data */ -- cgit v1.2.3