From 7ae4e1d32a98b596d483a19ed94a21b560eb595d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Oct 2022 21:52:37 +0100 Subject: gentoo auto-resync : 24:10:2022 - 21:52:37 --- dev-util/Manifest.gz | Bin 69143 -> 69135 bytes dev-util/geany-plugins/Manifest | 2 +- .../geany-plugins/geany-plugins-1.38-r2.ebuild | 2 +- dev-util/sgb/Manifest | 5 +- .../sgb-20090810-Fix-build-with-Clang-16.patch | 46 ++++++++++++++++ dev-util/sgb/sgb-20030623-r1.ebuild | 4 +- dev-util/sgb/sgb-20090810-r1.ebuild | 60 +++++++++++++++++++++ dev-util/sgb/sgb-20090810.ebuild | 59 -------------------- 8 files changed, 113 insertions(+), 65 deletions(-) create mode 100644 dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch create mode 100644 dev-util/sgb/sgb-20090810-r1.ebuild delete mode 100644 dev-util/sgb/sgb-20090810.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index dd25eb91eab7..6c36bcff2f02 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest index 1250d851c6fb..21178103ae20 100644 --- a/dev-util/geany-plugins/Manifest +++ b/dev-util/geany-plugins/Manifest @@ -1,5 +1,5 @@ AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339 EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89 -EBUILD geany-plugins-1.38-r2.ebuild 2958 BLAKE2B cf55e5bf55e7e3abe417876185f54ee8055dcbf7177a2ecb2a1639440801a5d5497667a0f84774b9d80e65b7ac91b0b1a7b7dab1c9ef754a731c16615d364deb SHA512 6276cfcb3d879bc4fd68f4d59689a0224ddc7a60daee342678cc9bd84a6d1b4c072601e6b49c22f645a1666eaf7c067b632b2ddf9727c37a753ddf7b65ecff9c +EBUILD geany-plugins-1.38-r2.ebuild 2956 BLAKE2B 34b04f4838c371dd032e39aea981d8146759032e2dfbec17d36ea1f8898340f03f5a07ca33018935454d4ecd01d6738878098faff0f4199d8d90f1b92463ca24 SHA512 2f0391e05ccc5e7a7ddf7a3d93a1eea65207e0829b1e0c69c002b6a8cf2e4a76254519e707e8cebf1b3fd7fca96e8b0d8ca9e54d60ec6c436af5c07e32316c2a MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild index 2fb44f8f7dc1..e0c49a45502a 100644 --- a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild +++ b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc ~x86" IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest index 21df010d5245..c2c5793af93c 100644 --- a/dev-util/sgb/Manifest +++ b/dev-util/sgb/Manifest @@ -1,7 +1,8 @@ AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50 +AUX sgb-20090810-Fix-build-with-Clang-16.patch 1104 BLAKE2B 2c54d544fd7907dc3d4bf7aedb3f03adec9466a38f23e9958bd159af677b8e0be57d7c60c55c59134c47ee3120528fa9e18ee9eac4ab00f15d70f5afd0eb346e SHA512 120e4457e3d5038232426b196a0d8d1d34309aeeb83e7beda0932410391d84c27a3974bf03dc749ac3964b459b4fe07a7783807e2465a6a45c993e424c8f675e DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874 DIST sgb-2009-08-10.tar.gz 496678 BLAKE2B 48c780259fee240e9739166a52972c4f3a37dc44d98a503b1df63aecec553a05888e11a01b8cf40c8a853f7416ce3118109aa6ce5db15fbfed1abbee552735ce SHA512 39afaaaeda9b1e2b0ecd56d8d0fee59754ee9340c497c9bd28aa19f039be605aef6c492969082c230840ca1619de3cb81ba3a38d4d7b6fdac6f19b658d4c01e2 -EBUILD sgb-20030623-r1.ebuild 1190 BLAKE2B 405924bf3b1a94683615274604449c72e9d7e3559641910f40a9ead0327179fa316c68d9de705eb059aca49999bff59a867a1cf8f6676bd26ebc7ff8f8723312 SHA512 4ad9db2cb156d329ded337dc9df29a8397627a2cc8fea52b1ea1fff4d127315a3cfb82b9e9432405157f0e1feac1bbf1f177872d55d36746af89a1c8145f2f72 -EBUILD sgb-20090810.ebuild 1191 BLAKE2B ac8fb483b7092f6bbcc24370e73cce6a62f6872cdec5c5bb8a7aa074b01f45a5e481fe891e201fa84383c5dcaa5a15926c2269eaca55cbf3af0bdd5051f0f90f SHA512 232f33d3b031cb78eb269370620171b56b879b6812deb31e8faf8d26f08ce486be70e735f1dd8b2b4c3d0d8914a83f0fd6a4e90bb2b288b34b06b7549d4a9d29 +EBUILD sgb-20030623-r1.ebuild 1191 BLAKE2B 92e9701977b507b8ee1df84260b2b19f41dea5ab1a3a2e8df8ba07342310ea4755a4f4fb7f30e0d687b33fc75a9da88ed472a1dfaf8cc69dda64f4ad4ff53791 SHA512 4afc524f6ade75c38c3585a60a1cb0efbfe597c7295e96770d1ca844c6015c2d0d1989b043424219cb233c22ee4d81d1b28e56d003e86345b454ca14410d7935 +EBUILD sgb-20090810-r1.ebuild 1250 BLAKE2B a6feee7c3009f114b6a97aa6d811712fca57de4161701a09e14cd8f29ea8b026e3656bb6f5d1bfb5f5a0a51ca8adc41310d1334393d4d52bb90347c87f53035a SHA512 454e27c8b1e63eded4ba49925b8a4ca8c65ffd8208d7ddda139ef25fa85a5dfecf83e5c516e1ecc99062609deff8d5029bfdb4d8fd13915349cd50516e425514 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2 diff --git a/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch new file mode 100644 index 000000000000..d26e26a42e1e --- /dev/null +++ b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch @@ -0,0 +1,46 @@ +From 5d0845e935d9b8d4174b9d98dbc123ec5d5a3460 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 24 Oct 2022 19:54:02 +0100 +Subject: [PATCH] Fix build with Clang 16 + +Bug: https://bugs.gentoo.org/832835 +--- a/gb_graph.w ++++ b/gb_graph.w +@@ -40,11 +40,8 @@ programs at a higher level via the system loading routine. Here is + the general outline of \.{gb\_graph.c}: + + @p +-#ifdef SYSV + #include +-#else + #include +-#endif + #include + #include + @h@# +@@ -63,11 +60,8 @@ interfere with GraphBase use of a useful identifier. We scotch that. + @(gb_graph.h@>= + #include + #include +-#ifdef SYSV + #include +-#else + #include +-#endif + #undef min + @@; + +--- a/gb_io.w ++++ b/gb_io.w +@@ -92,11 +92,8 @@ occasion to use some of the standard string operations. + + @= + #include +-#ifdef SYSV + #include +-#else + #include +-#endif + + @* Inputting a line. The {\sc GB\_\,IO} routines get their input from + an array called |buffer|. This array is internal to {\sc diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild index d89599421b58..26b28efed229 100644 --- a/dev-util/sgb/sgb-20030623-r1.ebuild +++ b/dev-util/sgb/sgb-20030623-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ DESCRIPTION="Stanford GraphBase" HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/" SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz" -LICENSE="BSD" +LICENSE="mmix" SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="" diff --git a/dev-util/sgb/sgb-20090810-r1.ebuild b/dev-util/sgb/sgb-20090810-r1.ebuild new file mode 100644 index 000000000000..411bb22b4b39 --- /dev/null +++ b/dev-util/sgb/sgb-20090810-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Stanford GraphBase" +HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/" +SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz" + +LICENSE="mmix" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="virtual/tex-base" + +S="${WORKDIR}" + +PATCHES=( + "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch + "${FILESDIR}"/sgb-20030623-destdir.patch + "${FILESDIR}"/sgb-20090810-Fix-build-with-Clang-16.patch +) + +src_compile() { + local vars=( + CFLAGS="${CFLAGS}" + SGBDIR=/usr/share/${PN} + INCLUDEDIR=/usr/include/sgb + LIBDIR=/usr/$(get_libdir) + BINDIR=/usr/bin + #CWEBINPUTS=/usr/share/${PN}/cweb + #LDFLAGS="${LDFLAGS}" + ) + # bug #299028 + emake -j1 "${vars[@]}" lib demos tests +} + +src_test() { + emake tests +} + +src_install() { + local vars=( + SGBDIR=/usr/share/${PN} + INCLUDEDIR=/usr/include/sgb + LIBDIR=/usr/$(get_libdir) + BINDIR=/usr/bin + CFLAGS="${CFLAGS}" + # TODO: why are they commented out above? + LDFLAGS="${LDFLAGS}" + CWEBINPUTS=/usr/share/${PN}/cweb + ) + emake DESTDIR="${D}" "${vars[@]}" install + + # we don't need no makefile + rm "${D}"/usr/include/sgb/Makefile || die + + dodoc ERRATA README +} diff --git a/dev-util/sgb/sgb-20090810.ebuild b/dev-util/sgb/sgb-20090810.ebuild deleted file mode 100644 index 4f6d61def77b..000000000000 --- a/dev-util/sgb/sgb-20090810.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Stanford GraphBase" -HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/" -SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="virtual/tex-base" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch - "${FILESDIR}"/sgb-20030623-destdir.patch -) - -src_compile() { - local vars=( - CFLAGS="${CFLAGS}" - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - #CWEBINPUTS=/usr/share/${PN}/cweb - #LDFLAGS="${LDFLAGS}" - ) - # bug #299028 - emake -j1 "${vars[@]}" lib demos tests -} - -src_test() { - emake tests -} - -src_install() { - local vars=( - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - CFLAGS="${CFLAGS}" - # TODO: why are they commented out above? - LDFLAGS="${LDFLAGS}" - CWEBINPUTS=/usr/share/${PN}/cweb - ) - emake DESTDIR="${D}" "${vars[@]}" install - - # we don't need no makefile - rm "${D}"/usr/include/sgb/Makefile || die - - dodoc ERRATA README -} -- cgit v1.2.3