From 705d045bc96f4aaca072e843d3cebf25ff6da983 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:26:21 +0100 Subject: [PATCH 01/18] app-text/xmlto: Sync with gentoo It's from gentoo commit c94fd2639c28d829963b46dc993e230aeda2f2b0. --- app-text/xmlto/ChangeLog | 360 ------------------ app-text/xmlto/Manifest | 26 +- .../files/xmlto-0.0.28-allow-links.patch | 15 + .../xmlto-0.0.28-dont-hardcode-paths.patch | 37 ++ app-text/xmlto/metadata.xml | 10 +- app-text/xmlto/xmlto-0.0.26.ebuild | 40 -- app-text/xmlto/xmlto-0.0.28-r6.ebuild | 52 +++ app-text/xmlto/xmlto-0.0.28-r8.ebuild | 53 +++ 8 files changed, 166 insertions(+), 427 deletions(-) delete mode 100644 app-text/xmlto/ChangeLog create mode 100644 app-text/xmlto/files/xmlto-0.0.28-allow-links.patch create mode 100644 app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch delete mode 100644 app-text/xmlto/xmlto-0.0.26.ebuild create mode 100644 app-text/xmlto/xmlto-0.0.28-r6.ebuild create mode 100644 app-text/xmlto/xmlto-0.0.28-r8.ebuild diff --git a/app-text/xmlto/ChangeLog b/app-text/xmlto/ChangeLog deleted file mode 100644 index 19ecbf2d6d..0000000000 --- a/app-text/xmlto/ChangeLog +++ /dev/null @@ -1,360 +0,0 @@ -# ChangeLog for app-text/xmlto -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.103 2015/04/08 04:53:47 vapier Exp $ - - 08 Apr 2015; Mike Frysinger xmlto-0.0.26.ebuild: - Mark arm64/m68k/s390/sh stable. - - 28 Feb 2015; Manuel Rüger -xmlto-0.0.25.ebuild: - Remove old. - - 28 Feb 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for ia64, wrt bug #534918 - - 27 Feb 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for sparc, wrt bug #534918 - - 24 Feb 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for alpha, wrt bug #534918 - - 26 Jan 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for x86, wrt bug #534918 - - 18 Jan 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for ppc64, wrt bug #534918 - - 17 Jan 2015; Markus Meier xmlto-0.0.26.ebuild: - arm stable, bug #534918 - - 17 Jan 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for ppc, wrt bug #534918 - - 13 Jan 2015; Jeroen Roovers xmlto-0.0.26.ebuild: - Stable for HPPA (bug #534918). - - 09 Jan 2015; Agostino Sarubbo xmlto-0.0.26.ebuild: - Stable for amd64, wrt bug #534918 - - 21 Jun 2014; Samuli Suominen - -files/xmlto-0.0.24-parallelmake.patch, -xmlto-0.0.24-r1.ebuild: - old - -*xmlto-0.0.26 (21 Jun 2014) - - 21 Jun 2014; Samuli Suominen +xmlto-0.0.26.ebuild: - Version bump; fixing the --noextensions parameter which is required for - disabling fop java extensions as per - http://forums.gentoo.org/viewtopic-p-7571834.html - - 19 Mar 2014; Agostino Sarubbo xmlto-0.0.25.ebuild: - Stable for alpha, wrt bug #502630 - - 12 Mar 2014; Agostino Sarubbo xmlto-0.0.25.ebuild: - Stable for sparc, wrt bug #502630 - - 08 Mar 2014; Markus Meier xmlto-0.0.25.ebuild: - arm stable, bug #502630 - - 06 Mar 2014; Agostino Sarubbo xmlto-0.0.25.ebuild: - Stable for ppc64, wrt bug #502630 - - 05 Mar 2014; Agostino Sarubbo xmlto-0.0.25.ebuild: - Stable for ppc, wrt bug #502630 - - 04 Mar 2014; Agostino Sarubbo xmlto-0.0.25.ebuild: - Stable for x86, wrt bug #502630 - - 02 Mar 2014; Pacho Ramos xmlto-0.0.25.ebuild: - amd64 stable, bug #502630 - - 02 Mar 2014; Akinori Hattori xmlto-0.0.25.ebuild: - ia64 stable wrt bug #502630 - - 01 Mar 2014; Jeroen Roovers xmlto-0.0.25.ebuild: - Stable for HPPA (bug #502630). - - 07 Feb 2014; Mike Frysinger xmlto-0.0.25.ebuild: - Force configure to always detect bash as /bin/bash. Drop unused flex dep and - implicit system grep dep. - - 18 Jan 2014; Mike Frysinger xmlto-0.0.24-r1.ebuild, - xmlto-0.0.25.ebuild: - Add arm64 love. - - 21 Jul 2013; Pacho Ramos metadata.xml: - Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers- - again-td259655.html - - 26 Apr 2012; Alexis Ballier xmlto-0.0.25.ebuild: - keyword ~amd64-fbsd - -*xmlto-0.0.25 (12 Jan 2012) - - 12 Jan 2012; Samuli Suominen +xmlto-0.0.25.ebuild: - Version bump. - - 12 Jan 2012; Samuli Suominen -xmlto-0.0.22.ebuild, - -files/xmlto-0.0.22-parallelmake.patch, -xmlto-0.0.23.ebuild, - -xmlto-0.0.24.ebuild: - old - - 12 Jan 2012; Samuli Suominen xmlto-0.0.24-r1.ebuild: - ppc64 stable wrt #388273 - - 07 Nov 2011; Brent Baude xmlto-0.0.24-r1.ebuild: - Marking xmlto-0.0.24-r1 ppc for bug 388273 - - 05 Nov 2011; Raúl Porcel xmlto-0.0.24-r1.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #388273 - - 29 Oct 2011; Jeroen Roovers xmlto-0.0.24-r1.ebuild: - Stable for HPPA (bug #388273). - - 25 Oct 2011; Pawel Hajdan jr xmlto-0.0.24-r1.ebuild: - x86 stable wrt bug #388273 - - 24 Oct 2011; Markos Chandras xmlto-0.0.24-r1.ebuild: - Stable on amd64 wrt bug #388273 - -*xmlto-0.0.24-r1 (19 Aug 2011) - - 19 Aug 2011; Mike Frysinger +xmlto-0.0.24-r1.ebuild, - +files/xmlto-0.0.24-parallelmake.patch: - Use portable fix for parallel make, include man pages in the dist to avoid - CBUILD vs CHOST issues, and drop autotool regeneration to speed things up. - -*xmlto-0.0.24 (30 Jul 2011) - - 30 Jul 2011; Patrick Lauer +xmlto-0.0.24.ebuild: - Bump for #375641 - - 10 Jul 2011; Mark Loeser xmlto-0.0.23.ebuild: - Stable for ppc/ppc64; bug #361033 - - 16 Apr 2011; Raúl Porcel xmlto-0.0.23.ebuild: - alpha/ia64/m68k/s390/sh/x86 stable wrt #361033 - - 10 Apr 2011; Markus Meier xmlto-0.0.23.ebuild: - arm stable, bug #361033 - - 04 Apr 2011; Jeroen Roovers xmlto-0.0.23.ebuild: - Stable for HPPA SPARC (bug #361033). - - 29 Mar 2011; Christoph Mende xmlto-0.0.23.ebuild: - Stable on amd64 wrt bug #361033 - - 20 Feb 2010; Jonathan Callen xmlto-0.0.23.ebuild: - Transfer prefix keywords, bump EAPI - -*xmlto-0.0.23 (21 Dec 2009) - - 21 Dec 2009; Mike Frysinger +xmlto-0.0.23.ebuild: - Version bump. - - 21 Dec 2009; Mike Frysinger xmlto-0.0.22.ebuild: - Fix by Naohiro Aota for building on BSDs systems #292896. - - 26 Sep 2009; Brent Baude xmlto-0.0.22.ebuild: - Marking xmlto-0.0.22 ppc64 for bug 276677 - - 09 Aug 2009; nixnut xmlto-0.0.22.ebuild: - ppc stable #276677 - - 22 Jul 2009; Raúl Porcel xmlto-0.0.22.ebuild: - arm/ia64/m68k/s390/sh/sparc stable wrt #276677 - - 18 Jul 2009; Tiago Cunha xmlto-0.0.22.ebuild: - stable sparc, bug 276677 - - 12 Jul 2009; Tobias Klausmann xmlto-0.0.22.ebuild: - Stable on alpha, bug #276677 - - 11 Jul 2009; xmlto-0.0.22.ebuild: - Marked stable on AMD64 for bug #276677; tested on a dual Opteron 2354. - - 08 Jul 2009; Samuli Suominen xmlto-0.0.22.ebuild: - xmlto needs sys-apps/which wrt #277092 - - 08 Jul 2009; Christian Faulhammer xmlto-0.0.22.ebuild: - stable x86, bug 276677 - - 08 Jul 2009; Jeroen Roovers xmlto-0.0.22.ebuild: - Stable for HPPA (bug #276677). - - 10 Jun 2009; Diego E. Pettenò xmlto-0.0.22.ebuild, - +files/xmlto-0.0.22-parallelmake.patch: - Add fix for parallel build, closes bug #273143. - - 22 May 2009; Samuli Suominen - files/xmlto-0.0.22-format_fo_passivetex_check.patch: - Change path to texmf-site in patch. - - 22 May 2009; Samuli Suominen xmlto-0.0.18.ebuild, - -xmlto-0.0.21.ebuild, xmlto-0.0.22.ebuild: - Remove usage of -j1 wrt #235998. List sys-devel/flex as depend wrt - #221373. - -*xmlto-0.0.22 (22 May 2009) - - 22 May 2009; Samuli Suominen +xmlto-0.0.22.ebuild, - +files/xmlto-0.0.22-format_fo_passivetex_check.patch: - Version bump. - -*xmlto-0.0.21 (22 Sep 2008) - - 22 Sep 2008; Diego Pettenò +xmlto-0.0.21.ebuild: - Version bump. - - 26 Apr 2008; xmlto-0.0.18.ebuild: - Drop to ~mips due to unstable deps - - 23 Jan 2008; Doug Klima xmlto-0.0.18.ebuild: - sys-apps/coreutils-6.10-r1 and higher now provides /bin/mktemp - - 16 Nov 2007; Michael Sterrett xmlto-0.0.18.ebuild: - remove reference to really old sys-apps/debianutils - - 21 Aug 2007; Leonardo Boshell xmlto-0.0.18.ebuild: - Added mktemp dependency (bug #170147). - - 12 Jul 2007; Roy Marples xmlto-0.0.18.ebuild: - Keyworded ~sparc-fbsd, #182763 - - 13 Mar 2007; Leonardo Boshell - -files/xmlto-head-fix.patch, metadata.xml, -xmlto-0.0.17.ebuild: - Replacing text-markup herd with the new sgml herd. Pruning old ebuild. - - 05 Sep 2006; Joshua Kinard xmlto-0.0.18.ebuild: - Marked stable on mips. - - 24 May 2006; Diego Pettenò xmlto-0.0.18.ebuild: - Add alternative dependency on app-misc/getopt for non-Linux platforms. Add - ~x86-fbsd keyword. - - 16 Mar 2006; Martin Ehmsen xmlto-0.0.17.ebuild, - xmlto-0.0.18.ebuild: - Removed RDEPEND="${DEPEND}", found by QA script. - - 05 Jan 2006; Alexandre Buisse xmlto-0.0.17.ebuild, - xmlto-0.0.18.ebuild: - Don't install INSTALL generic file (bug #117477). - - 08 Jul 2005; Leonardo Boshell xmlto-0.0.18.ebuild, - xmlto-0.0.17.ebuild: - Declare RDEPEND explicitly. Modified docbook-xml-dtd dependency to use - '~' syntax. Added sys-apps/util-linux dependency, resolves bug #98287. - - 25 Jun 2005; Danny van Dyk xmlto-0.0.18.ebuild: - Marked s390. - - 25 Jun 2005; John Mylchreest xmlto-0.0.18.ebuild: - adding ~s390 - - 08 Apr 2005; Markus Rothe xmlto-0.0.18.ebuild: - Stable on ppc64 - - 01 Apr 2005; xmlto-0.0.18.ebuild: - stable on amd64 - - 28 Mar 2005; Guy Martin xmlto-0.0.18.ebuild: - Stable on hppa. - - 27 Mar 2005; Bryan Østergaard xmlto-0.0.18.ebuild: - Stable on alpha. - - 14 Feb 2005; Gustavo Zacarias xmlto-0.0.18.ebuild: - Stable on sparc - - 10 Feb 2005; Mamoru KOMACHI xmlto-0.0.18.ebuild: - Stable on x86 and ppc. - - 02 Jan 2005; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 13 Oct 2004; Mamoru KOMACHI xmlto-0.0.15.ebuild, - xmlto-0.0.17.ebuild, xmlto-0.0.18.ebuild: - Force app-text/docbook-xml-dtd-4.2 series. Thanks to Simone Gotti - , closing bug #67163. - -*xmlto-0.0.18 (15 Sep 2004) - - 15 Sep 2004; Mamoru KOMACHI +xmlto-0.0.18.ebuild: - Version bumped; bug #63624. - - 07 Sep 2004; Tom Gall xmlto-0.0.17.ebuild: - stable on ppc64 - - 13 May 2004; Stephen P. Becker xmlto-0.0.17.ebuild: - Stable on mips. - - 13 May 2004; Bryan Østergaard xmlto-0.0.17.ebuild: - Stable on alpha. - - 15 Mar 2004; Stephen P. Becker xmlto-0.0.17.ebuild: - Added ~mips keyword. - - 07 Mar 2004; Jon Portnoy xmlto-0.0.17.ebuild : - Stable on AMD64 to make repoman happy. - - 07 Feb 2004; Lars Weiler xmlto-0.0.17.ebuild: - stable on ppc - - 01 Feb 2004; Jon Portnoy xmlto-0.0.17.ebuild : - AMD64 keywords. - - 14 Jan 2004; xmlto-0.0.15.ebuild: - stable on hppa - - 13 Jan 2004; xmlto-0.0.15.ebuild: - added sparc keyword - -*xmlto-0.0.17 (11 Jan 2004) - - 11 Jan 2004; Mike Gardiner xmlto-0.0.15.ebuild, - xmlto-0.0.17.ebuild, files/xmlto-0.0.15-head-fix.patch, - files/xmlto-head-fix.patch: - New version - - 11 Jan 2004; Mike Gardiner xmlto-0.0.15.ebuild: - Stylesheets dependency back in, we need it versioned so we get the manpages, - or else we get things like bug #37797 - - 04 Jan 2004; Mike Gardiner xmlto-0.0.15.ebuild: - Changed dependency on xsl-stylesheets to be on xml-dtd-4.2, which is what - really depends on xsl-stylesheets. Thanks to on bug #37078 - - 03 Jan 2004; xmlto-0.0.15.ebuild: - Stable on alpha and ia64 - - 31 Dec 2003; Mike Gardiner xmlto-0.0.15.ebuild: - Marked stable on x86 - - 22 Nov 2003; Jason Wever xmlto-0.0.15.ebuild: - Added ~sparc keyword. - - 17 Nov 2003; Mike Gardiner xmlto-0.0.15.ebuild: - Added MAKEOPTS restriction to -j1 as the build isnt parrallel safe, thanks to - , on bug #33151 - - 26 Oct 2003; Mike Gardiner xmlto-0.0.15.ebuild: - Updated dependency on xsl-stylesheets to 1.62.0-r1 to ensure that the manpages - are included - - 24 Oct 2003; Mike Gardiner xmlto-0.0.15.ebuild, - files/xmlto-0.0.15-head-fix.patch: - Added head-fix.patch to use head -n instead of the obsoleted head - - syntax. - - 24 Oct 2003; Mike Gardiner xmlto-0.0.15.ebuild: - Sharpened up the docbook-xsl-stylesheets dependency to 1.62.0 - - 23 Oct 2003; Mike Gardiner xmlto-0.0.15.ebuild: - Added docbook-xsl-stylesheets dependency - -*xmlto-0.0.15 (22 Oct 2003) - - 22 Oct 2003; Mike Gardiner metadata.xml, - xmlto-0.0.15.ebuild: - First version of xmlto. This version does not currently support tetex output - to pdf/ps/dvi as we need a working passivetex/xmltex implementation before we - can do that. Tex/pdf support is planned for the first revision of this package diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest index 9a16cfed7b..2ac9943a57 100644 --- a/app-text/xmlto/Manifest +++ b/app-text/xmlto/Manifest @@ -1,25 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 WHIRLPOOL ae83df73b7682f05b6e048aa7908331ef5b1ece0f2a40dfb968bfadd1991611fb998edd33dcef2984f0e5259e11a597a1620f9025a1f2d98554bd96da52b18be -DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4 -EBUILD xmlto-0.0.26.ebuild 1444 SHA256 ecfcf46e9a0eee34a639fac1c67b51b7baceae5a84b6f96eaf793e380fe316dc SHA512 7a57e784d81ff468a0fc4facaa7ce52a24eed459d00067b106404528822c3d2f9e5ba0ee27e1f78cadc6b3cc2b3e6b9eb4565f2e8fe37c0f0b0dee0947ca00cf WHIRLPOOL 3c8f1eb0b29c4d6395075a9b49518eaa2b778dc5a225cb24c31f4864e26616623a64c9baff3f8aa924657816fc07899cbcc38d1d6d3e9d777f235c904d723a05 -MISC ChangeLog 12889 SHA256 664e2564cde09621649415b636efae8d8b846c5eaef9dea2eccc321b519721dc SHA512 962a84dc23501ed2699789e4383ff4085b9d14353f6375254bbdec8de766a34b106eeb1f859a4f7dc28209311443c12911b7362e5520bf9a5e42d9700bfcb96c WHIRLPOOL 30dcbad24d85623a3cce1607d6a4181ee34a8f3847a2c1b0589035ac9ce511d2802c6f167c904dbb4985c70563d934265a55f03867751b542d40a613993bfbcf -MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVJLRcAAoJEPGu1DbS6WIA4XEQAIdGAAsj5WflQNAjGjxNOq5T -hqXyabaHLaWvxksFXLtvNVUATqAYy48xRzKPtrAnwqFJUEYAv3/Y2CfVp41CKNVN -sCgk5vv1PjLzobU29RAMGj2njHKsAya+mZL8hfCyXgRHeeiSkz4CP62aoBV6zs1k -Jnn6ooMsf47Wia5Zgn/2N4haaWWi3Dxx9/gxfTMIR8OJ8BytxaBCNYGqz7dchH6c -OTcXynIX8Bfoc8xYcrFwsgQuCAt7qDVuFdzwTXov3O4VVR2shuNsib66dgNZwa2+ -wxHqD3MuqRTGHW2lZggaB9vm8qoEF90ujuUNvAIvz/cLlAX4yOZA+4/JjdW2Khg8 -8vHHTnBUdkaTI9JL3qbCM8XYWSwDgka+P9mq0nXhUtCeG5WyhPRAWY6CYccV+PJ8 -mm1uU7tIGmGQ24Ywza0A6EqFBky5NLZ0qH+AGDgPcERWMENl463UgRV4LZjiWK6v -h4cwDB8EpuPlvF8TiyVfltgESxwJFJkI3OCJW1z6Pjbf73lsKp7DnHc0HdHD0GF/ -XRCASke7KUgPprDva8y+8ihupyiu/d3XG8kyxckSP/ibRCsc0DFc48cV5/s1lzMP -66Hvm5g5Vciv7/kh7Xo9ShUBWpwM1+pyEszQE/ZFeammbgR+NzRy041LCM5swz2b -DWjFc2pvoUCiWzZZT3r6 -=MmlR ------END PGP SIGNATURE----- +DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 diff --git a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch new file mode 100644 index 0000000000..b35b492d91 --- /dev/null +++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/679626 +Thanks-to: dolphinling +--- a/configure.in ++++ b/configure.in +@@ -100,8 +100,8 @@ dnl + AC_ARG_VAR([LYNX], [Name and path of the `lynx' browser.]) + AC_PATH_PROG([LYNX], [lynx], [lynx]) + +-AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.]) +-AC_PATH_PROG([LINKS], [elinks], [elinks]) ++AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.]) ++AC_PATH_PROGS([LINKS], [links elinks], [links]) + + AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.]) + AC_PATH_PROG([W3M], [w3m], [w3m]) diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch new file mode 100644 index 0000000000..7137966b27 --- /dev/null +++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch @@ -0,0 +1,37 @@ +(See https://bugs.gentoo.org/828520 too) + +From: Sam James +Date: Wed, 10 Nov 2021 04:53:33 +0000 +Subject: [PATCH] Don't hardcode paths to utilities + +The path to e.g. links at build time is not necessarily +the same as the path at runtime. + +TODO: Could chop out the checks from configure but +this package is fragile enough. Leaving it for now. +--- a/xmlto.in ++++ b/xmlto.in +@@ -272,13 +272,13 @@ then + USE_BACKEND=DEFAULT + fi + +-LINKS_PATH=@LINKS@ +-W3M_PATH=@W3M@ +-LYNX_PATH=@LYNX@ +-GCP_PATH=@GCP@ +-SED_PATH=@SED@ +-GREP_PATH=@GREP@ +-ZIP_PATH=@ZIP@ ++LINKS_PATH=$(command -v elinks || command -v links) ++W3M_PATH=$(command -v w3m) ++LYNX_PATH=$(command -v lynx) ++GCP_PATH=$(command -v cp) ++SED_PATH=$(command -v sed) ++GREP_PATH=$(command -v grep) ++ZIP_PATH=$(command -v zip) + + # Process any options + ARGS=$(${GETOPT} \ +-- +2.33.1 + diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml index 4538a68724..b1da74ae66 100644 --- a/app-text/xmlto/metadata.xml +++ b/app-text/xmlto/metadata.xml @@ -1,5 +1,11 @@ - + -maintainer-needed@gentoo.org + + sam@gentoo.org + Sam James + + + Support conversion from XML to plain text + diff --git a/app-text/xmlto/xmlto-0.0.26.ebuild b/app-text/xmlto/xmlto-0.0.26.ebuild deleted file mode 100644 index 5f4a5c15a1..0000000000 --- a/app-text/xmlto/xmlto-0.0.26.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.26.ebuild,v 1.11 2015/04/08 04:53:47 vapier Exp $ - -EAPI=5 -inherit eutils - -DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats" -HOMEPAGE="https://fedorahosted.org/xmlto/" -SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="latex" - -RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1 - app-text/docbook-xml-dtd:4.2 - app-shells/bash - dev-libs/libxslt - sys-apps/sed - || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) - || ( sys-apps/util-linux app-misc/getopt ) - || ( sys-apps/which sys-freebsd/freebsd-ubin ) - latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )" -# We only depend on flex when we patch the imput lexer. -DEPEND="${RDEPEND}" - -DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch -} - -src_configure() { - # We don't want the script to detect /bin/sh if it is bash. - export ac_cv_path_BASH=/bin/bash - has_version sys-apps/util-linux || export GETOPT=getopt-long - econf -} diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild new file mode 100644 index 0000000000..9188b524d5 --- /dev/null +++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats" +HOMEPAGE="https://pagure.io/xmlto" +SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="latex text" + +RDEPEND=" + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + || ( sys-apps/util-linux app-misc/getopt ) + text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) + latex? ( dev-texlive/texlive-formatsextra ) +" +# We only depend on flex when we patch the input lexer. +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch + "${FILESDIR}"/${PN}-0.0.28-allow-links.patch +) + +src_prepare() { + default + + # fix symbol clash on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die + fi + + eautoreconf +} + +src_configure() { + # We don't want the script to detect /bin/sh if it is bash. + export ac_cv_path_BASH="${BASH}" + has_version sys-apps/util-linux || export GETOPT=getopt-long + + econf +} diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild new file mode 100644 index 0000000000..c54987d45d --- /dev/null +++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats" +HOMEPAGE="https://pagure.io/xmlto" +SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="latex text" + +RDEPEND=" + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + || ( sys-apps/util-linux app-misc/getopt ) + text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) + latex? ( dev-texlive/texlive-formatsextra ) +" +# We only depend on flex when we patch the input lexer. +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch + "${FILESDIR}"/${PN}-0.0.28-allow-links.patch + "${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch +) + +src_prepare() { + default + + # fix symbol clash on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die + fi + + eautoreconf +} + +src_configure() { + # We don't want the script to detect /bin/sh if it is bash. + export ac_cv_path_BASH="${BASH}" + has_version sys-apps/util-linux || export GETOPT=getopt-long + + econf +} From f409cd2520dadcc869f233e5a6cf1719b5b07a1f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:29:36 +0100 Subject: [PATCH 02/18] dev-libs/libffi: Sync with gentoo It's from gentoo commit c79952c0fbc8e5bb1a6d29cdb4b71248dff21c1b. --- dev-libs/libffi/ChangeLog | 759 ------------------ dev-libs/libffi/Manifest | 18 +- .../libffi-3.0.13-emutramp_pax_proc.patch | 37 - .../libffi/files/libffi-3.1-darwin-x32.patch | 22 - .../libffi/files/libffi-3.1-execstack.patch | 12 - .../files/libffi-3.1-typing_error.patch | 14 - .../files/libffi-3.2.1-complex_alpha.patch | 20 - .../libffi-3.3-compiler-vendor-quote.patch | 33 + .../files/libffi-3.3-power7-memcpy-2.patch | 28 + .../files/libffi-3.3-power7-memcpy.patch | 42 + dev-libs/libffi/files/libffi-3.3-power7.patch | 39 + .../libffi/files/libffi-3.3-ppc-int128.patch | 63 ++ .../files/libffi-3.3-ppc-vector-offset.patch | 53 ++ .../files/libffi-3.3_rc0-ppc-macos-go.patch | 79 ++ dev-libs/libffi/libffi-3.0.13-r1.ebuild | 65 -- dev-libs/libffi/libffi-3.1-r3.ebuild | 63 -- dev-libs/libffi/libffi-3.2.1.ebuild | 59 -- dev-libs/libffi/libffi-3.2.ebuild | 60 -- dev-libs/libffi/libffi-3.3-r2.ebuild | 74 ++ dev-libs/libffi/libffi-3.4.2-r1.ebuild | 73 ++ dev-libs/libffi/metadata.xml | 13 +- 21 files changed, 496 insertions(+), 1130 deletions(-) delete mode 100644 dev-libs/libffi/ChangeLog delete mode 100644 dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch delete mode 100644 dev-libs/libffi/files/libffi-3.1-darwin-x32.patch delete mode 100644 dev-libs/libffi/files/libffi-3.1-execstack.patch delete mode 100644 dev-libs/libffi/files/libffi-3.1-typing_error.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-power7-memcpy-2.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-power7.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-ppc-int128.patch create mode 100644 dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch create mode 100644 dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch delete mode 100644 dev-libs/libffi/libffi-3.0.13-r1.ebuild delete mode 100644 dev-libs/libffi/libffi-3.1-r3.ebuild delete mode 100644 dev-libs/libffi/libffi-3.2.1.ebuild delete mode 100644 dev-libs/libffi/libffi-3.2.ebuild create mode 100644 dev-libs/libffi/libffi-3.3-r2.ebuild create mode 100644 dev-libs/libffi/libffi-3.4.2-r1.ebuild diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog deleted file mode 100644 index e378f341f2..0000000000 --- a/dev-libs/libffi/ChangeLog +++ /dev/null @@ -1,759 +0,0 @@ -# ChangeLog for dev-libs/libffi -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.200 2015/03/20 15:47:45 vapier Exp $ - - 20 Mar 2015; Mike Frysinger libffi-3.1-r3.ebuild: - Drop Darwin patch as it does not apply cleanly and it is already in newer - versions #543856 by Hans de Graaff. - - 18 Jan 2015; Fabian Groffen - +files/libffi-3.1-darwin-x32.patch, libffi-3.1-r3.ebuild, libffi-3.2.1.ebuild, - libffi-3.2.ebuild: - Allow to compile on 32-bits Darwin, bug #536764 - - 16 Jan 2015; Tobias Klausmann - +files/libffi-3.2.1-complex_alpha.patch, libffi-3.2.1.ebuild: - Update src/alpha/osf.S to match ffi.h - - 31 Dec 2014; Mike Frysinger - +files/libffi-3.2.1-o-tmpfile-eacces.patch, libffi-3.2.1.ebuild: - Workaround O_TMPFILE bugs in the system #529044 by Simon MARCHUK. - -*libffi-3.2.1 (05 Dec 2014) - - 05 Dec 2014; William Hubbs +libffi-3.2.1.ebuild: - version bump - - 19 Nov 2014; Mike Frysinger libffi-3.2.ebuild: - Drop KEYWORDS until we can sort out #529044 a bit more. - -*libffi-3.2 (12 Nov 2014) - - 12 Nov 2014; Samuli Suominen +libffi-3.2.ebuild: - Version bump. - - 10 Aug 2014; Sergei Trofimovich libffi-3.0.13-r1.ebuild, - libffi-3.1-r3.ebuild: - QA: drop trailing '.' from DESCRIPTION - - 22 Jul 2014; Samuli Suominen -libffi-3.1-r2.ebuild: - old - -*libffi-3.1-r3 (30 May 2014) - - 30 May 2014; Samuli Suominen +libffi-3.1-r3.ebuild, - +files/libffi-3.1-typing_error.patch: - Fix typing error in ffi.h.in (missing @@) wrt #511752 by Ryan Hill and - Patrick Lauer - - 29 May 2014; Samuli Suominen -libffi-3.1-r1.ebuild, - -libffi-3.1.ebuild: - old - -*libffi-3.1-r2 (28 May 2014) - - 28 May 2014; Samuli Suominen +libffi-3.1-r2.ebuild: - Fix output of `pkg-config --libs libffi` wrt #511726 by Michał Górny - -*libffi-3.1-r1 (28 May 2014) - - 28 May 2014; Samuli Suominen - +files/libffi-3.1-execstack.patch, +libffi-3.1-r1.ebuild: - Fix execstack in libffi.so.6 wrt #511634 by Anthony Basile and Magnus Granberg - - 27 May 2014; Samuli Suominen - -files/libffi-3.0.11-x86-pic-check.patch, -libffi-3.0.11.ebuild, - -libffi-3.0.12.ebuild, -libffi-3.0.13.ebuild: - old - - 27 May 2014; Samuli Suominen libffi-3.1.ebuild: - Time to let preserve_old_lib go and rely upon FEATURES="preserved-libs" which - is enabled by default in the official package manager. - -*libffi-3.1 (27 May 2014) - - 27 May 2014; Samuli Suominen +libffi-3.1.ebuild: - Version bump. - - 14 May 2014; Agostino Sarubbo libffi-3.0.13-r1.ebuild: - Stable for sparc, wrt bug #497760 - - 13 May 2014; Agostino Sarubbo libffi-3.0.13-r1.ebuild: - Stable for ia64, wrt bug #497760 - - 20 Apr 2014; Agostino Sarubbo libffi-3.0.13-r1.ebuild: - Stable for ppc64, wrt bug #497760 - - 13 Apr 2014; Agostino Sarubbo libffi-3.0.13-r1.ebuild: - Stable for ppc, wrt bug #497760 - - 07 Apr 2014; Markus Meier libffi-3.0.13-r1.ebuild: - arm stable, bug #497760 - - 05 Apr 2014; Agostino Sarubbo libffi-3.0.13-r1.ebuild: - Stable for x86, wrt bug #497760 - - 04 Apr 2014; Chema Alonso libffi-3.0.13-r1.ebuild: - Stable for amd64 wrt bug #497760 - - 29 Mar 2014; Matt Turner libffi-3.0.13-r1.ebuild: - alpha stable, bug #497760. - - 28 Mar 2014; Jeroen Roovers libffi-3.0.13-r1.ebuild: - Stable for HPPA (bug #497760). - - 25 Mar 2014; Mike Frysinger libffi-3.0.11.ebuild, - libffi-3.0.12.ebuild, libffi-3.0.13-r1.ebuild, libffi-3.0.13.ebuild: - Mark arm64/m68k/s390/sh stable #497760. - - 18 Jan 2014; Mike Frysinger libffi-3.0.13-r1.ebuild: - Add arm64 love. - - 13 Oct 2013; Michał Górny libffi-3.0.13-r1.ebuild: - Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug - #483304. - - 30 Jul 2013; Alexis Ballier libffi-3.0.13-r1.ebuild: - improve the emul-libs blocker so that it is stacked for baselibs -r2. - -*libffi-3.0.13-r1 (15 Jul 2013) - - 15 Jul 2013; Julian Ospald +libffi-3.0.13-r1.ebuild: - multilib conversion wrt #459072 - - 22 May 2013; Magnus Granberg - files/libffi-3.0.13-emutramp_pax_proc.patch: - Update the emutramp_pax_proc patch with ChangeLog - - 18 May 2013; Magnus Granberg libffi-3.0.13.ebuild: - Did for get to run repoman commit for dev-lib/libffi - - 18 May 2013; Magnus Granberg libffi-3.0.13.ebuild, - +files/libffi-3.0.13-emutramp_pax_proc.patch: - Add patch to use /proc for pax mark on 3.0.13 #457194 - - 28 Mar 2013; Mike Frysinger libffi-3.0.11.ebuild, - libffi-3.0.12.ebuild, libffi-3.0.13.ebuild: - Disable tooldir related hack that breaks --libdir usage #462814 by Thomas - Sachau. - -*libffi-3.0.13 (20 Mar 2013) - - 20 Mar 2013; Samuli Suominen +libffi-3.0.13.ebuild: - Version bump. - - 17 Feb 2013; Zac Medico libffi-3.0.12.ebuild: - Add ~arm-linux keyword. - - 11 Feb 2013; Samuli Suominen - -files/libffi-3.0.9-x32.patch, -libffi-3.0.10.ebuild, - -libffi-3.0.12_rc3.ebuild: - old - -*libffi-3.0.12 (11 Feb 2013) - - 11 Feb 2013; Samuli Suominen +libffi-3.0.12.ebuild: - Version bump. - - 10 Feb 2013; Samuli Suominen libffi-3.0.12_rc3.ebuild, - metadata.xml: - Tie USE="pax_kernel" with --enable-pax_emutramp. Thanks to klondike and - blueness for advise. - -*libffi-3.0.12_rc3 (09 Feb 2013) - - 09 Feb 2013; Samuli Suominen - +libffi-3.0.12_rc3.ebuild: - RC3 for testing, but without keywording for now. - - 27 Jan 2013; Fabian Groffen libffi-3.0.11.ebuild: - Unbreak Prefix bootstraps with host-provided libffi - - 13 Jan 2013; Mike Frysinger - +files/libffi-3.0.11-x86-pic-check.patch, libffi-3.0.11.ebuild: - Add fix from upstream for PIC compile checks #417179 by Richard Yao. - - 07 Dec 2012; Agostino Sarubbo libffi-3.0.11.ebuild: - Stable for ppc64, wrt bug #416669 - - 04 Oct 2012; Samuli Suominen libffi-3.0.11.ebuild: - Check if ${ROOT} is / or not before executing the -lffi sanity link check wrt - #437046 by Alexander Tsoy - - 02 Oct 2012; Fabian Groffen libffi-3.0.11.ebuild: - Fix non-fatal typo effectively disabling the link-check - - 29 Sep 2012; Fabian Groffen libffi-3.0.11.ebuild: - Marked ~m68k-mint, bug #433529 - - 05 Aug 2012; Fabian Groffen libffi-3.0.11.ebuild: - Marked ~x86-freebsd - - 22 Jul 2012; libffi-3.0.11.ebuild: - ppc stable #416669 - - 08 Jul 2012; Raúl Porcel libffi-3.0.11.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #416669 - - 13 Jun 2012; Richard Yao libffi-3.0.10.ebuild, - libffi-3.0.11.ebuild: - Add epatch_user - - 31 May 2012; Jeroen Roovers libffi-3.0.11.ebuild: - Stable for HPPA (bug #416669). - - 30 May 2012; Markus Meier libffi-3.0.11.ebuild: - arm stable, bug #416669 - - 24 May 2012; Matt Turner libffi-3.0.11.ebuild: - Stable on alpha, bug 416669. Also fixes bug 395755. - - 21 May 2012; Jeff Horelick libffi-3.0.11.ebuild: - marked x86 per bug 416669 - - 20 May 2012; Agostino Sarubbo libffi-3.0.11.ebuild: - Stable for amd64, wrt bug #416669 - - 26 Apr 2012; Alexis Ballier libffi-3.0.11.ebuild: - keyword ~amd64-fbsd - - 12 Apr 2012; Samuli Suominen -libffi-3.0.9-r2.ebuild, - -files/libffi-3.0.9-arm-oabi.patch, - -files/libffi-3.0.9-define-generic-symbols-carefully.patch, - -files/libffi-3.0.9-interix.patch, -files/libffi-3.0.9-irix.patch, - -files/libffi-3.0.9-powerpc64-darwin.patch, - -files/libffi-3.0.9-strncmp.patch, -libffi-3.0.11_rc3.ebuild: - old - -*libffi-3.0.11 (12 Apr 2012) - - 12 Apr 2012; Samuli Suominen +libffi-3.0.11.ebuild: - Version bump. - - 06 Apr 2012; Samuli Suominen - -libffi-3.0.11_rc1.ebuild, -libffi-3.0.11_rc2.ebuild, - -files/libffi-3.0.11_rc2-fix-ppc64-compile.patch: - old - -*libffi-3.0.11_rc3 (06 Apr 2012) - - 06 Apr 2012; Samuli Suominen - +libffi-3.0.11_rc3.ebuild: - Version bump. - - 13 Mar 2012; Samuli Suominen libffi-3.0.11_rc2.ebuild, - +files/libffi-3.0.11_rc2-fix-ppc64-compile.patch: - Fix building for PowerPC64 using patch from libffi-discuss ML. - - 19 Feb 2012; Raúl Porcel libffi-3.0.10.ebuild: - arm/ia64/m68k/s390/sh/sparc stable wrt #387063 - - 16 Feb 2012; Mike Frysinger libffi-3.0.9-r2.ebuild, - +files/libffi-3.0.9-x32.patch, libffi-3.0.10.ebuild, - libffi-3.0.11_rc1.ebuild, libffi-3.0.11_rc2.ebuild: - Add patch from upstream for x32 targets. - - 31 Jan 2012; Samuli Suominen libffi-3.0.10.ebuild: - ppc/ppc64 stable wrt #387063 - - 21 Jan 2012; Tobias Klausmann libffi-3.0.10.ebuild: - Stable on alpha, bug #387063 - -*libffi-3.0.11_rc2 (18 Nov 2011) - - 18 Nov 2011; Samuli Suominen - +libffi-3.0.11_rc2.ebuild: - Version bump. - - 09 Nov 2011; Jeroen Roovers libffi-3.0.10.ebuild: - Stable for HPPA (bug #387063). - - 18 Oct 2011; Pawel Hajdan jr libffi-3.0.10.ebuild: - x86 stable wrt bug #387063 - - 14 Oct 2011; Tony Vroon libffi-3.0.10.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & - Elijah "Armageddon" El Lazkani in bug #387063. - -*libffi-3.0.11_rc1 (13 Oct 2011) - - 13 Oct 2011; Samuli Suominen - +libffi-3.0.11_rc1.ebuild: - Version bump. - - 06 Sep 2011; Samuli Suominen -libffi-3.0.9.ebuild, - -libffi-3.0.10_rc8.ebuild, -files/libffi-3.0.10-interix.patch: - old - -*libffi-3.0.10 (29 Aug 2011) - - 29 Aug 2011; Diego E. Pettenò +libffi-3.0.10.ebuild: - Version bump to 3.0.10 final (interix patch not necessary). Somehow this - lowers, rather than increase, the soversion. - - 21 May 2011; Naohiro Aota libffi-3.0.10_rc8.ebuild: - Fix build failure bug #363275 on BSD - - 20 May 2011; Kacper Kowalik libffi-3.0.9-r2.ebuild: - ppc64 stable wrt #360465 - - 12 May 2011; Markus Duft libffi-3.0.10_rc8.ebuild, - +files/libffi-3.0.10-interix.patch: - add patch: build fix for x86-interix (prefix) - - 02 May 2011; Fabian Groffen libffi-3.0.10_rc8.ebuild: - Marked ~x64-freebsd - - 13 Apr 2011; Brent Baude libffi-3.0.9-r2.ebuild: - Marking libffi-3.0.9-r2 ppc for bug 360465 - - 10 Apr 2011; Raúl Porcel libffi-3.0.9-r2.ebuild: - ia64/m68k/s390/sh/sparc/x86 stable wrt #360465 - - 10 Apr 2011; Markus Meier libffi-3.0.9-r2.ebuild: - arm stable, bug #360465 - - 29 Mar 2011; Jeroen Roovers libffi-3.0.9-r2.ebuild: - Stable for HPPA (bug #360465). - - 27 Mar 2011; Tobias Klausmann libffi-3.0.9-r2.ebuild: - Stable on alpha, bug #360465 - - 25 Mar 2011; Christoph Mende libffi-3.0.9-r2.ebuild: - Stable on amd64 wrt bug #360465 - -*libffi-3.0.10_rc8 (25 Mar 2011) - - 25 Mar 2011; Samuli Suominen - +libffi-3.0.10_rc8.ebuild: - Version bump. - - 23 Feb 2011; Samuli Suominen libffi-3.0.10_rc5.ebuild: - Detect and document broken installation of sys-devel/gcc in the build.log wrt - #354903 - -*libffi-3.0.10_rc5 (15 Feb 2011) - - 15 Feb 2011; Samuli Suominen - +libffi-3.0.10_rc5.ebuild: - Version bump. - -*libffi-3.0.10_rc4 (12 Feb 2011) - - 12 Feb 2011; Samuli Suominen - +libffi-3.0.10_rc4.ebuild: - Version bump. - -*libffi-3.0.9-r2 (04 Feb 2011) - - 04 Feb 2011; Samuli Suominen +libffi-3.0.9-r2.ebuild, - +files/libffi-3.0.9-strncmp.patch: - Backport upstream patch for strncmp usage bug by request from Arfrever - Frehtes Taifersar Arahesis. - - 06 Jan 2011; Fabian Groffen libffi-3.0.9-r1.ebuild, - +files/libffi-3.0.9-powerpc64-darwin.patch: - Add patch to allow compilation on powerpc64-*-darwin* - -*libffi-3.0.9-r1 (18 Dec 2010) - - 18 Dec 2010; Samuli Suominen +libffi-3.0.9-r1.ebuild, - +files/libffi-3.0.9-define-generic-symbols-carefully.patch: - Include upstream patch to define generic symbols carefully wrt #347636 by - Dennis Schridde. - - 20 Sep 2010; Raúl Porcel libffi-3.0.9.ebuild, - +files/libffi-3.0.9-arm-oabi.patch: - Add patch to fix ARM OABI, by Diego 'Flameeyes' Pettenò - - - 19 Sep 2010; Raúl Porcel libffi-3.0.9.ebuild: - s390 stable - - 16 Apr 2010; Brent Baude libffi-3.0.9.ebuild: - Marking libffi-3.0.9 ppc for bug 306281 - - 22 Mar 2010; Brent Baude libffi-3.0.9.ebuild: - Marking libffi-3.0.9 ppc64 for bug 306281 - - 16 Mar 2010; Raúl Porcel libffi-3.0.9.ebuild: - alpha/arm/ia64/m68k/sh/sparc stable wrt #306281 - - 03 Mar 2010; Pawel Hajdan jr libffi-3.0.9.ebuild: - x86 stable wrt bug #306281 - - 22 Feb 2010; Samuli Suominen libffi-3.0.9.ebuild: - amd64 stable wrt #306281 - - 22 Feb 2010; Jeroen Roovers libffi-3.0.9.ebuild: - Stable for HPPA (bug #306281). - - 20 Feb 2010; Jonathan Callen libffi-3.0.9.ebuild, - +files/libffi-3.0.9-interix.patch, +files/libffi-3.0.9-irix.patch: - Add patches from prefix, add prefix keywords - - 25 Jan 2010; Raúl Porcel libffi-3.0.9.ebuild: - Add ~m68k, thanks to kolla for testing - - 24 Jan 2010; Raúl Porcel libffi-3.0.9.ebuild: - Add ~ia64/~sh/~sparc wrt #298322 - - 13 Jan 2010; Brent Baude libffi-3.0.9.ebuild: - Marking libffi-3.0.9 ~ppc64 for bug 298322 - - 04 Jan 2010; Markus Meier libffi-3.0.9.ebuild: - add ~arm, bug #298322 - - 03 Jan 2010; Jeroen Roovers libffi-3.0.9.ebuild: - Marked ~ppc (bug #298322). - -*libffi-3.0.9 (31 Dec 2009) - - 31 Dec 2009; Samuli Suominen +libffi-3.0.9.ebuild: - Version bump. - - 26 Dec 2009; Jeroen Roovers libffi-3.0.9_rc6.ebuild, - libffi-3.0.9_rc9.ebuild: - Marked ~hppa (bug #298322). - -*libffi-3.0.9_rc9 (26 Dec 2009) - - 26 Dec 2009; Samuli Suominen - +libffi-3.0.9_rc9.ebuild: - Version bump. - -*libffi-3.0.9_rc6 (25 Dec 2009) - - 25 Dec 2009; Samuli Suominen - +libffi-3.0.9_rc6.ebuild: - Version bump. - -*libffi-3.0.9_rc4 (24 Dec 2009) - - 24 Dec 2009; Samuli Suominen - +libffi-3.0.9_rc4.ebuild, +files/libffi-3.0.9_rc4-revert_includedir.patch: - Version bump. - - 20 Dec 2009; Raúl Porcel libffi-3.0.8.ebuild: - m68k stable - - 13 Dec 2009; Raúl Porcel libffi-3.0.8.ebuild: - Add ~m68k, thanks to kolla for testing - - 10 Dec 2009; Raúl Porcel libffi-3.0.8.ebuild, - +files/libffi-3.0.8-arm.patch: - Steal patch from debian to make it compile on armv6/armv7 - -*libffi-3.0.9_rc3 (30 Oct 2009) - - 30 Oct 2009; Samuli Suominen - +libffi-3.0.9_rc3.ebuild: - Version bump. - -*libffi-3.0.9_rc2 (27 Oct 2009) - - 27 Oct 2009; Samuli Suominen - +libffi-3.0.9_rc2.ebuild: - Version bump. - - 19 Oct 2009; Alexey Shvetsov libffi-3.0.8.ebuild: - Add ~mips keyword - - 17 Oct 2009; Markus Meier metadata.xml: - remove static-libs description as it is global now - - 05 Oct 2009; Samuli Suominen libffi-3.0.8.ebuild, - libffi-3.0.9_rc1.ebuild: - Keyword ~sparc-fbsd. Compile tested on FreeBSD-6.2-RELEASE-sparc64-64bit-ELF. - -*libffi-3.0.9_rc1 (05 Oct 2009) - - 05 Oct 2009; Samuli Suominen - +libffi-3.0.9_rc1.ebuild: - Version bump. - - 03 Oct 2009; Samuli Suominen libffi-3.0.8.ebuild: - Move dev-libs/libffi back to EAPI="0" because dev-lang/python is consuming - it. - - 02 Oct 2009; Samuli Suominen libffi-3.0.8.ebuild, - +files/libffi-3.0.8-autoconf-2.64.patch: - Fix compability with Autoconf 2.64 wrt #287020, thanks to Mike Lundy and - Mike Frysinger. - - 23 Sep 2009; Alexis Ballier libffi-3.0.8.ebuild, - +files/libffi-3.0.8-fbsd.patch: - Fix detection and test on FreeBSD and keyword it. - - 07 Sep 2009; Raúl Porcel libffi-3.0.8.ebuild: - arm/ia64/s390/sh stable - - 05 Sep 2009; Brent Baude libffi-3.0.8.ebuild: - Marking libffi-3.0.8 ppc64 for bug 272675 - - 22 Jul 2009; Tobias Klausmann libffi-3.0.8.ebuild: - Stable on alpha, bug #272675 - - 19 Jul 2009; nixnut libffi-3.0.8.ebuild: - ppc stable #272673 - - 18 Jul 2009; Jeroen Roovers libffi-3.0.8.ebuild: - Stable for HPPA (bug #272675). - - 11 Jun 2009; Markus Meier libffi-3.0.8.ebuild: - amd64 stable, bug #272675 - - 10 Jun 2009; Christian Faulhammer libffi-3.0.8.ebuild: - stable x86, bug 272675 - - 05 Jun 2009; Ferris McCormick libffi-3.0.8.ebuild: - Sparc stable, part of Bug #272675. - - 05 Jun 2009; Samuli Suominen libffi-3.0.8.ebuild: - Block libffi-3.0.8.ebuild: - Keyword ~ppc/~ppc64 wrt #272046, thanks to Luca Barbato for testing. - - 03 Jun 2009; Raúl Porcel libffi-3.0.8.ebuild: - Add ~arm/~ia64/~s390/~sh wrt #272046 - - 03 Jun 2009; Samuli Suominen libffi-3.0.8.ebuild: - Keyword ~alpha wrt #272046, thanks to Tobias Klausmann for testing. - - 02 Jun 2009; Jeroen Roovers libffi-3.0.8.ebuild: - Marked ~hppa (bug #272046). - - 01 Jun 2009; Ferris McCormick libffi-3.0.8.ebuild: - Add sparc for testing, part of Bug #272046. - - 01 Jun 2009; Samuli Suominen -libffi-3.0.5.ebuild, - -libffi-3.0.6.ebuild, libffi-3.0.8.ebuild, metadata.xml: - Only build static libs if USE flag is defined. - -*libffi-3.0.8 (24 Dec 2008) - - 24 Dec 2008; Stephanie Lockwood-Childs - +libffi-3.0.8.ebuild: - version bump requested by Matteo Modesti (bug #252344) - -*libffi-3.0.6 (02 Sep 2008) - - 02 Sep 2008; Marijn Schouten +libffi-3.0.6.ebuild: - bump - - 29 Jun 2008; Marijn Schouten libffi-3.0.5.ebuild: - don't patch anymore, move warning to pkg_setup - - 13 Jun 2008; Samuli Suominen - +files/libffi-3.0.5-includedir.patch, libffi-3.0.5.ebuild: - Fix includedir. USE flag test for dejagnu which is required for make - check. - -*libffi-3.0.5 (13 Jun 2008) - - 13 Jun 2008; Samuli Suominen - -files/libffi-soversion.dpatch, -files/libffi-without-libgcj.dpatch, - +libffi-3.0.5.ebuild, -libffi-3.4.1.ebuild, -libffi-3.4.1-r1.ebuild, - -libffi-3.4.3.ebuild: - Version bump for testing wrt #163724, thanks to Marijn Schouten. Remove - old versions which came from GCC 3.4.x. - - 03 Jun 2008; Michael Sterrett libffi-3.4.1.ebuild, - libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild: - remove reference to app-admin/eselect-compiler which has been removed - - 27 Dec 2007; Christian Heim metadata.xml: - Fixing the maintainer. It's supposed to be maintainer-needed. - - 05 Dec 2007; Michael Sterrett -libffi-3.3.5.ebuild: - remove old, dep-broken version - - 13 Nov 2007; Raúl Porcel libffi-3.3.5.ebuild, - libffi-3.4.1-r1.ebuild: - Drop unneeded ~alpha keyword - - 11 May 2007; Thilo Bangert metadata.xml: - fix herd - - 12 Mar 2007; Raúl Porcel libffi-3.4.3.ebuild: - x86 stable - - 03 Mar 2007; Marius Mauch libffi-3.3.5.ebuild: - Replacing einfo with elog - - 06 Jan 2007; Danny van Dyk -libffi-1.20.ebuild: - QA: Removed unused versions. - - 05 Nov 2006; Piotr Jaroszyński libffi-3.4.1.ebuild: - Fix multilib. Thanks to David Leverton in bug #154065. - - 14 Aug 2006; Christian Heim libffi-3.3.5.ebuild, - libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild: - Switch default ordering of gcc-config and eselect-compiler to work around - portage bug. - - 13 Aug 2006; Markus Rothe libffi-3.4.1-r1.ebuild, - libffi-3.4.3.ebuild: - Dropped ppc64/~ppc64 keywords - - 02 Aug 2006; Andrej Kacian libffi-3.4.1-r1.ebuild: - Stable on x86, bug #105020. - - 01 Aug 2006; Andrej Kacian libffi-3.4.3.ebuild: - Added ~x86, bug #105020. - - 27 Jul 2006; Fabian Groffen libffi-3.3.5.ebuild, - libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild: - QA fixes for bug #141378: build is not really used, so remove its trails. - Remove gnustep as maintainer, gnustep-base is moving away from it. - - 06 Jun 2006; Jeremy Huddleston - libffi-3.3.5.ebuild, libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, - libffi-3.4.3.ebuild: - Updated DEPEND to accept eselect-compiler. - - 08 Jan 2006; Michael Hanselmann metadata.xml: - Remove retiring dev from metadata. - - 05 Jan 2006; Gustavo Zacarias libffi-3.4.3.ebuild: - Stable on sparc - - 22 Dec 2005; Joshua Nichols libffi-3.4.1.ebuild: - Fixed multilib-strict violation (bug #74949). - - 21 Dec 2005; Seemant Kulleen libffi-3.3.5.ebuild, - libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild: - Fix QA violation of awk in the global scope. Change to versionator eclass - instead. Thanks to: Christian Heim in bug #108388 - - 22 May 2005; Jason Wever libffi-3.4.3.ebuild: - Added ~sparc keyword. - - 06 May 2005; Sven Wegener libffi-3.4.1-r1.ebuild, - libffi-3.4.3.ebuild: - Removed * postfix from <, <=, >= and > dependencies. - - 09 Apr 2005; Armando Di Cianno -libffi-3.3.3.ebuild, - -libffi-3.3.3-r1.ebuild, -libffi-3.3.4.ebuild, libffi-3.4.1-r1.ebuild: - Pruning old ebuilds that are no longer needed. - - 06 Apr 2005; Markus Rothe libffi-3.4.3.ebuild: - Stable on ppc64 - - 06 Apr 2005; libffi-3.3.3-r1.ebuild, - libffi-3.3.5.ebuild: - ~alpha cleanup. - - 04 Apr 2005; Michael Hanselmann libffi-3.4.3.ebuild: - Stable on ppc. - - 04 Apr 2005; Gustavo Zacarias libffi-3.3.4.ebuild, - libffi-3.3.5.ebuild: - 3.3.5 to sparc stable, 3.3.4 removed ~sparc for cleanup - - 04 Apr 2005; Gustavo Zacarias libffi-3.3.5.ebuild: - Stable on sparc - -*libffi-3.3.5 (14 Mar 2005) - - 14 Mar 2005; Eric Shattow +libffi-3.3.5.ebuild: - Version Bump (interim, closes #80281). - - 12 Mar 2005; Eric Shattow libffi-3.3.4.ebuild: - quasi-stable on x86 (fixes broken dependency tracking in stable arch) - - 05 Mar 2005; Markus Rothe libffi-3.4.3.ebuild: - Added ~ppc64 to KEYWORDS and don't use multilib on ppc64; bug #72258 - -*libffi-3.4.3 (03 Dec 2004) - - 03 Dec 2004; Armando Di Cianno +libffi-3.4.3.ebuild: - Version bump to match gcc-3.4.3; hopefully this will be the last libffi of - this type/in this series that I make - >=gcc-3.4.3-r1 should support libffi - with gcj and objc now - - 23 Nov 2004; Tom Gall - libffi-3.4.1-r1.ebuild: - added ~ppc64 - - 23 Nov 2004; Jeremy Huddleston - libffi-3.4.1.ebuild: - Stable amd64... bug #68857. - - 31 Oct 2004; libffi-3.3.3-r1.ebuild: - ~alpha keyword. - - 24 Oct 2004; Jason Wever libffi-3.3.4.ebuild: - Added ~sparc keyword wrt bug #68729. - - 24 Oct 2004; Armando Di Cianno libffi-3.3.3-r1.ebuild, - libffi-3.3.4.ebuild: - Making gcc depends more explicit; libffi really needs to be installed - alongside gcc on of these days... - - 09 Oct 2004; David Holm libffi-3.4.1-r1.ebuild: - Added to ~ppc. - -*libffi-3.3.4 (25 Sep 2004) - - 25 Sep 2004; Armando Di Cianno +libffi-3.3.4.ebuild: - New version to complement gcc-3.3.4. - -*libffi-3.3.3-r1 (22 Sep 2004) - - 22 Sep 2004; Armando Di Cianno - +files/libffi-soversion.dpatch, +files/libffi-without-libgcj.dpatch, - +libffi-3.3.3-r1.ebuild, +libffi-3.4.1-r1.ebuild: - Updated,new 3.3.3-r1 and 3.4.1-r1 for ~x86; 3.4.1-r1 now applies patches that - allow building without turning on libgcj as well. - -*libffi-3.3.3 (27 Aug 2004) - - 27 Aug 2004; Armando Di Cianno +libffi-3.3.3.ebuild, - libffi-3.4.1.ebuild: - Added specific as-is type license for libffi; added libffi-3.3.3 for x86; set - HOMEPAGE to more proper url. - - 27 Aug 2004; Armando Di Cianno libffi-3.4.1.ebuild: - Added email address next to comment I had previously made in file. - - 14 Aug 2004; Sven Wegener libffi-3.4.1.ebuild: - Fixed CVS Header. - -*libffi-3.4.1 (17 Jul 2004) - - 17 Jul 2004; Travis Tilley +libffi-3.4.1.ebuild: - added an ebuild for the libffi 2.0 beta from the gcc 3.4.1 tarball. keyworded - ~amd64 - - 01 Jul 2004; Jeremy Huddleston libffi-1.20.ebuild: - virtual/glibc -> virtual/libc - - 18 Mar 2004; David Holm libffi-1.20.ebuild: - Added to ~ppc. - - 14 Mar 2004; Michael Sterrett libffi-1.20.ebuild: - Don't assign default to S; header fix - -*libffi-1.20 (13 Feb 2003) - - 12 Jul 2003; Daniel Ahlberg : - Added missing changelog entry. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*libffi-0.20 ( 10 Feb 2002 ) - - 10 Feb 2002; Karl Trygve Kalleberg ChangeLog files/digest-libffi-0.20 libffi-0.20: - - The libffi library provides a portable, high level programming interface to - various calling conventions. This allows a programmer to call any function - specified by a call interface description at run-time. - - Ffi stands for Foreign Function Interface. A foreign function interface is - the popular name for the interface that allows code written in one language - to call code written in another language. The libffi library really only - provides the lowest, machine dependent layer of a fully featured foreign - function interface. A layer must exist above libffi that handles type - conversions for values passed between the two languages. diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 829836a877..6351b7c81d 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -1,16 +1,2 @@ -AUX libffi-3.0.13-emutramp_pax_proc.patch 911 SHA256 955aa3d87522cb220133fa853bd3a5a7af1fe7cf5cc6b9eb74ffffb9ac563aba SHA512 402712b21feec0f162758adad630ecc588596eaebd2e79bb86802f313e102b8ef6d08eca0580a1aae25dabec3e018c499e2ce1960edc6af9182f67cd8cc9b0e1 WHIRLPOOL 22f76ca6f909c80228958115a8db37fbe5f12e291cdbc1fad672a0903c54a7918e2cee37fdc263e9c350f3c79a7870cc8f7a05789668a8dc87cb8434a6e20f9c -AUX libffi-3.1-darwin-x32.patch 606 SHA256 419007aba26be807a25e6f34d319225458e3febc75c3f3d0c85093ded63e3cb2 SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24 WHIRLPOOL 9f749489499e8e9fa7712ae4111424c47c695cd5ee7b6480a8a2f5cd638d8d95c000e16e81eb13603bd842c2d50d2d0c60480d519960c55b652867fd6cb95cde -AUX libffi-3.1-execstack.patch 277 SHA256 55e95096d8b2bd82188c62b1316c602738336c0a4b58ccce503936dfc436b1d9 SHA512 1365cb102e6ffacd89b399243cd89ddb29259e373d16fd500d9d98bd40edbd0d79b63df6fb9464247cc2f11628d5c692a25f1c6d9cef19feb857e1232c154d4f WHIRLPOOL 597c3cdb8a28dcc15d724fa4d184956bcd4118803070ba63c1d914eb1a3b4c9720f68404a05ba4ad7ad83714f79ee7856bb8921886511bc7d35b39f33b4b41f0 -AUX libffi-3.1-typing_error.patch 350 SHA256 2e134e7f347f392499ec9128b220cff467919dfc048922d72689816d9f40ea95 SHA512 6be05ec604da587ded9d50ba57153b7ca24ee52dbed132d08f8653032153d377b2e399b58010e3c84e2106f077696a0cc9507018687af2082aa5ce055ba5fa07 WHIRLPOOL e8613594118774abaa2d79b0cdcbfd57d1c3ca275543423cec70b368e604c78bc7162d582a5b654b378b60a1d765a12b418bd10f8a8693ccbc3e7fdf225be216 -AUX libffi-3.2.1-complex_alpha.patch 601 SHA256 5653822db3b2338f6b7c63107868d20665a200f139616476fc1411ae76283fa5 SHA512 66890bf241236f08e0e726c820e2ff82df6071c1a3b25aa4f3f005b6431b94ec5a5f730db56de82c006e26415d72fe665d6ced37567bcdec6d84357faeb24bec WHIRLPOOL 1e020a6477eb137f5579de73a76a021eb2444a1223ef1e7b50460cbd92643c841429993d08517b7297b50f7d10aa4e5446f23ac1185d18712a5d28081d35eb74 -AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 SHA256 655ed8d1c6ff1f48d69f28f3393e84fe53e581504f55cfa05b1914ed97be7463 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65 WHIRLPOOL 72305d87d8a96542264c9b4211f14744fd980a29c9d63d78919211ec0d5a027973e9825777a79980c4ec22ed59319c3230780e60746ac860ce5a405b35351659 -DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308 -DIST libffi-3.1.tar.gz 937214 SHA256 97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb SHA512 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 WHIRLPOOL 19c08cffd39c998fcd762b1e3767b4fd86915427226833411302bebd2d5bcf93d515e6df4a4cab11327595d3966e46442e457fbe09ae986b58bdfb2bb6adb913 -DIST libffi-3.2.1.tar.gz 940837 SHA256 d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 WHIRLPOOL b9d3c86e347029fa9f03fd3813405cc731099812ad6186bd4d2ea646354383803c90912b20e1804a6b7fc12719403b3c0c3b800bdbcab564a2c93fcb4fd722ad -DIST libffi-3.2.tar.gz 940691 SHA256 6b2680fbf6ae9c2381d381248705857de22e05bae191889298f8e6bfb2ded4ef SHA512 fed5f6eec86144608966857f54bd69a5faa43427f27bc9178ebe2c7a1cecf925c20dbd6df07a207ae469842874efcf5b99fb7e09db59cbd92ebfc0a7e1bb62b7 WHIRLPOOL db7491bc5914eb6691aa366677c63af51979453330373251b1043b53163d1b56dbed65ba23c9f5047257e476e0d216045a06faa346790987047854ae1d04361d -EBUILD libffi-3.0.13-r1.ebuild 2182 SHA256 a0ac517ad1fb280a3e8a4623456733b3ce898fa4f8e410fccad91f34b748a711 SHA512 7640261bdbc6c05a2ef48464aabbd8151c8b37a052b4b0e405520c56b9515d039e8de6969d91a5162faeea0005fe154f40eb32919da4b1655677fe507da81031 WHIRLPOOL 690aa7fab323bd5c0264533576fa4066fcb4bf3b740d5ce7cf51b318f12955c8fd4acf8b8da4cfa1bc1d0d94524cc5b37ef3d40e974276dcace3f5226748227b -EBUILD libffi-3.1-r3.ebuild 2199 SHA256 c87bbca081c72a1c6619bd7b3bbb7dec76c3173d4200423a768c50f8fb8ecb2b SHA512 3cc6f6eca41a827145fbddb95cff8f8bf9d740d572c4548647c5e5defa862dc70cfc40c547bf9afb51c53f76e0f1655123f8f1602cf5d6f67c38a4ca0077c236 WHIRLPOOL 82f8dfeb5d378b2fde83e427599b1ad2dd539bd93d13bbf54101d21d7231033875b4de555556c81e8383b6a3e54fbe9c0f6ff9c9e259423645371d2616553d18 -EBUILD libffi-3.2.1.ebuild 2143 SHA256 eac917c373ef320474016b89c56853a4d2dd3c58c0b7c07cea7353330759a146 SHA512 2ed1030b949343f1cbf87974b3dd9786171313186dbda7f417f571cc5f609d41704ee0a7e6cf87771ad108d64b17713d2f86f3afbd9c90ae0e8f2c96c0f03493 WHIRLPOOL fd0b280b65a296d07d585ef698546e78562f5ca2d180740cd6adb16e997202f7f9691c57dd22b400af2dfd4bd2e3cd3502bddd103e2b7712f21106c218104909 -EBUILD libffi-3.2.ebuild 2084 SHA256 bcf466ee82c0bebab4b9f5e0b189bf5ad9a878e6998d88d9bf50431dfc337952 SHA512 19682bf7fa101e00b2c276d90d6b7606e12f92bf21f768244fbb82cbd47b0f1a16ae70e6810af2073c56874c408e58e0631b1d6db44a7a828b06bed539a8f339 WHIRLPOOL fe86138074cc8fa00da097fb0426a337730b23c4919274f6408cc668217db3a6869d2164dce170d2252419062714313c3fbd9781235055b730f177efc18a022e -MISC ChangeLog 27182 SHA256 b643eb3993bbd864daf849482c0c2e58133468cfb4efd5b2ccc0170ba9d123bf SHA512 a00480e9d37cf03bcdaf45b43199098349b369580d9cb9eb23c4fab135440a55e47a635255bfcccd9e3cd0be6336b9275a79ecb93ee4177b2587112b09a259db WHIRLPOOL 94783d36d7ba7f246013f435c4c43d84b0438be0d69d9d6fcfc899a9601641baefdee4015872f26fcb10610a95ef398ed6ddeaf99787683c41cc5b523ec09449 -MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45 +DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f +DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1 diff --git a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch deleted file mode 100644 index c27bd9bf88..0000000000 --- a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch +++ /dev/null @@ -1,37 +0,0 @@ -2013-05-22 Magnus Granberg - - #457194 - * src/closuer.c (emutramp_enabled_check): Check with /proc. - ---- a/src/closures.c 2013-03-17 23:27:11.000000000 +0100 -+++ b/src/closures.c 2013-04-29 23:26:02.279022022 +0200 -@@ -181,10 +181,26 @@ static int emutramp_enabled = -1; - static int - emutramp_enabled_check (void) - { -- if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL) -- return 1; -- else -+ char *buf = NULL; -+ size_t len = 0; -+ FILE *f; -+ int ret; -+ f = fopen ("/proc/self/status", "r"); -+ if (f == NULL) - return 0; -+ ret = 0; -+ -+ while (getline (&buf, &len, f) != -1) -+ if (!strncmp (buf, "PaX:", 4)) -+ { -+ char emutramp; -+ if (sscanf (buf, "%*s %*c%c", &emutramp) == 1) -+ ret = (emutramp == 'E'); -+ break; -+ } -+ free (buf); -+ fclose (f); -+ return ret; - } - - #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \ diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch deleted file mode 100644 index e5f100e567..0000000000 --- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=513428 -https://bugs.gentoo.org/show_bug.cgi?id=536764 -https://trac.macports.org/ticket/44170 - ---- libffi-3.2.1/src/x86/win32.S -+++ libffi-3.2.1/src/x86/win32.S -@@ -1184,7 +1184,6 @@ - - #if defined(X86_WIN32) && !defined(__OS2__) - .section .eh_frame,"w" --#endif - .Lframe1: - .LSCIE1: - .long .LECIE1-.LASCIE1 /* Length of Common Information Entry */ -@@ -1343,6 +1342,7 @@ - /* End of DW_CFA_xxx CFI instructions. */ - .align 4 - .LEFDE5: -+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */ - - #endif /* !_MSC_VER */ - diff --git a/dev-libs/libffi/files/libffi-3.1-execstack.patch b/dev-libs/libffi/files/libffi-3.1-execstack.patch deleted file mode 100644 index 6884a47012..0000000000 --- a/dev-libs/libffi/files/libffi-3.1-execstack.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/511634 -http://sourceware.org/ml/libffi-discuss/2014/msg00058.html - ---- src/x86/win32.S -+++ src/x86/win32.S -@@ -1304,3 +1304,6 @@ - - #endif /* !_MSC_VER */ - -+#if defined __ELF__ && defined __linux__ -+ .section .note.GNU-stack,"",@progbits -+#endif diff --git a/dev-libs/libffi/files/libffi-3.1-typing_error.patch b/dev-libs/libffi/files/libffi-3.1-typing_error.patch deleted file mode 100644 index fc24006d5d..0000000000 --- a/dev-libs/libffi/files/libffi-3.1-typing_error.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/511752 -http://sourceware.org/ml/libffi-discuss/2014/msg00059.html - ---- include/ffi.h.in -+++ include/ffi.h.in -@@ -221,7 +221,7 @@ typedef struct { - #endif - } ffi_cif; - --#if HAVE_LONG_DOUBLE_VARIANT -+#if @HAVE_LONG_DOUBLE_VARIANT@ - /* Used to adjust size/alignment of ffi types. */ - void ffi_prep_types (ffi_abi abi); - # endif diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch deleted file mode 100644 index 0d6e0bc290..0000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 -+++ src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 -@@ -279,6 +279,7 @@ - .gprel32 $load_64 # FFI_TYPE_SINT64 - .gprel32 $load_none # FFI_TYPE_STRUCT - .gprel32 $load_64 # FFI_TYPE_POINTER -+ .gprel32 $load_none # FFI_TYPE_COMPLEX - - /* Assert that the table above is in sync with ffi.h. */ - -@@ -294,7 +295,8 @@ - || FFI_TYPE_SINT64 != 12 \ - || FFI_TYPE_STRUCT != 13 \ - || FFI_TYPE_POINTER != 14 \ -- || FFI_TYPE_LAST != 14 -+ || FFI_TYPE_COMPLEX != 15 \ -+ || FFI_TYPE_LAST != 15 - #error "osf.S out of sync with ffi.h" - #endif - diff --git a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch new file mode 100644 index 0000000000..db5b69ce2d --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/753299 +--- a/testsuite/lib/libffi.exp ++++ b/testsuite/lib/libffi.exp +@@ -287,9 +287,6 @@ proc libffi-init { args } { + verbose "libffi $blddirffi" + + # Which compiler are we building with? +- set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"] +- regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor +- + if { [string match $compiler_vendor "gnu"] } { + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + if {$gccdir != ""} { +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,7 @@ fi + cat > local.exp < local.exp < +Date: Fri, 29 Nov 2019 07:00:35 -0500 +Subject: [PATCH] Address platforms with no __int128. + +--- + src/powerpc/ffi_linux64.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index de0d033..7364770 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + if (next_arg.ul == gpr_end.ul) + next_arg.ul = rest.ul; + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) +- *vec_base.f128++ = **p_argv.f128; ++ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); + else +- *next_arg.f128 = **p_argv.f128; ++ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +-- +2.26.0 + diff --git a/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch b/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch new file mode 100644 index 0000000000..91f9a6f60f --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch @@ -0,0 +1,42 @@ +From e50b9ef8b910fa642ef158f6642e60d54d7ad740 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Dec 2019 02:34:14 -0800 +Subject: [PATCH] powerpc64: Use memcpy to help platforms with no __int128. + (#534) + +Signed-off-by: Khem Raj +--- + src/powerpc/ffi_linux64.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index 7364770..4d50878 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + { + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 + && i < nfixedargs) +- *vec_base.f128++ = *arg.f128++; ++ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); + else +- *next_arg.f128 = *arg.f128++; ++ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif, + do + { + if (pvec < end_pvec && i < nfixedargs) +- *to.f128 = *pvec++; ++ memcpy (to.f128, pvec++, sizeof (float128)); + else +- *to.f128 = *from.f128; ++ memcpy (to.f128, from.f128, sizeof (float128)); + to.f128++; + from.f128++; + } +-- +2.26.0 + diff --git a/dev-libs/libffi/files/libffi-3.3-power7.patch b/dev-libs/libffi/files/libffi-3.3-power7.patch new file mode 100644 index 0000000000..83f518f4c2 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-power7.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/701128 + +From 2138adb2a5b6a0bc2fe3518e0645eacc89b6f392 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 28 Nov 2019 00:02:42 +0000 +Subject: [PATCH] powerpc: fix build failure on power7 and older + +Build failure looks as: +``` +libtool: compile: powerpc-unknown-linux-gnu-gcc \ + -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... +In file included from src/powerpc/ffi.c:33: +src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target + 65 | typedef __int128 float128; + | ^~~~~~~~ +``` + +The fix avoids using __int128 in favour of aligned char[16]. + +Closes: https://github.com/libffi/libffi/issues/531 +Signed-off-by: Sergei Trofimovich +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -62,7 +62,7 @@ typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; + #else +-typedef __int128 float128; ++typedef char float128[16] __attribute__((aligned(16))); + #endif + + void FFI_HIDDEN ffi_closure_SYSV (void); +-- +2.24.0 + diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch b/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch new file mode 100644 index 0000000000..ed53ae9990 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch @@ -0,0 +1,63 @@ +From 4f9e20ac51ce13d46fed3c869e1deb6d9bb89444 Mon Sep 17 00:00:00 2001 +From: Andrew Geissler +Date: Fri, 1 May 2020 06:58:30 -0500 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 (#561) + +This is a patch pulled down from the following: +https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch + +This issue is being hit on OpenBMC code when pulling the latest +libffi tag and building on a P8 ppc64le machine. I verified this +patch fixes the issue we are seeing. + +Below is the original commit message: + +Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 +fails on: + +In file included from ../src/powerpc/ffi.c:33:0: +../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target + typedef _Float128 float128; + ^~~~~~~~~ + +Fix this build failure by checking for __HAVE_FLOAT128 before using +_Float128, as _Float128 is enabled only on specific conditions, see +output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: + + /* Defined to 1 if the current compiler invocation provides a + floating-point type with the IEEE 754 binary128 format, and this glibc + includes corresponding *f128 interfaces for it. */ + #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ + && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH + # define __HAVE_FLOAT128 1 + #else + # define __HAVE_FLOAT128 0 + #endif + +Fixes: + - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Andrew Geissler + +Co-authored-by: Fabrice Fontaine +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 8e2f2f0..960a5c4 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -57,7 +57,7 @@ typedef union + double d; + } ffi_dblfl; + +-#if defined(__FLOAT128_TYPE__) ++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) + typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; +-- +2.27.0 + diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch new file mode 100644 index 0000000000..4bcd27e4f1 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch @@ -0,0 +1,53 @@ +From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Fri, 21 Feb 2020 21:06:15 -0600 +Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541) + +Some of the flag bits were moved when adding powerpc64 vector support. + +Fixes #536 +--- + src/powerpc/sysv.S | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S +index 1474ce7..df97734 100644 +--- a/src/powerpc/sysv.S ++++ b/src/powerpc/sysv.S +@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) + bctrl + + /* Now, deal with the return value. */ +- mtcrf 0x01,%r31 /* cr7 */ ++ mtcrf 0x03,%r31 /* cr6-cr7 */ + bt- 31,L(small_struct_return_value) + bt- 30,L(done_return_value) + #ifndef __NO_FPRS__ + bt- 29,L(fp_return_value) + #endif + stw %r3,0(%r30) +- bf+ 28,L(done_return_value) ++ bf+ 27,L(done_return_value) + stw %r4,4(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stw %r5,8(%r30) + stw %r6,12(%r30) + /* Fall through... */ +@@ -145,10 +144,9 @@ L(done_return_value): + #ifndef __NO_FPRS__ + L(fp_return_value): + .cfi_restore_state +- bf 28,L(float_return_value) ++ bf 27,L(float_return_value) + stfd %f1,0(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stfd %f2,8(%r30) + b L(done_return_value) + L(float_return_value): +-- +2.27.0 + diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch new file mode 100644 index 0000000000..88f9b45576 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch @@ -0,0 +1,79 @@ +ffi_darwin: use FFI_GO_CLOSURES guard to avoid unsolvable dependencies + +The go calls depend on compilation and link-time signatures and symbols +which are missing because they aren't build due to FFO_GO_CLOSURES not +being set. + +Signed-off-by: Fabian Groffen + +--- a/src/powerpc/ffi_darwin.c 2018-04-02 14:21:51.000000000 +0200 ++++ b/src/powerpc/ffi_darwin.c 2018-12-10 13:57:26.000000000 +0100 +@@ -909,8 +909,10 @@ + extern void ffi_call_AIX(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void)); + ++#if FFI_GO_CLOSURES + extern void ffi_call_go_AIX(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void), void *closure); ++#endif + + extern void ffi_call_DARWIN(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void), ffi_type*); +@@ -950,6 +952,7 @@ + } + } + ++#if FFI_GO_CLOSURES + void + ffi_call_go (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue, + void *closure) +@@ -981,6 +984,7 @@ + break; + } + } ++#endif + + static void flush_icache(char *); + static void flush_range(char *, int); +@@ -1110,6 +1114,7 @@ + return FFI_OK; + } + ++#if FFI_GO_CLOSURES + ffi_status + ffi_prep_go_closure (ffi_go_closure* closure, + ffi_cif* cif, +@@ -1133,6 +1138,7 @@ + } + return FFI_OK; + } ++#endif + + static void + flush_icache(char *addr) +@@ -1168,9 +1174,11 @@ + ffi_closure_helper_DARWIN (ffi_closure *, void *, + unsigned long *, ffi_dblfl *); + ++#if FFI_GO_CLOSURES + ffi_type * + ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *, + unsigned long *, ffi_dblfl *); ++#endif + + /* Basically the trampoline invokes ffi_closure_ASM, and on + entry, r11 holds the address of the closure. +@@ -1430,6 +1438,7 @@ + closure->user_data, rvalue, pgr, pfr); + } + ++#if FFI_GO_CLOSURES + ffi_type * + ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue, + unsigned long *pgr, ffi_dblfl *pfr) +@@ -1437,4 +1446,5 @@ + return ffi_closure_helper_common (closure->cif, closure->fun, + closure, rvalue, pgr, pfr); + } ++#endif + diff --git a/dev-libs/libffi/libffi-3.0.13-r1.ebuild b/dev-libs/libffi/libffi-3.0.13-r1.ebuild deleted file mode 100644 index be711ccd45..0000000000 --- a/dev-libs/libffi/libffi-3.0.13-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="http://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - epatch "${FILESDIR}"/${P}-emutramp_pax_proc.patch #457194 - epatch_user - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 5) -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 5) -} diff --git a/dev-libs/libffi/libffi-3.1-r3.ebuild b/dev-libs/libffi/libffi-3.1-r3.ebuild deleted file mode 100644 index ee6ac2696b..0000000000 --- a/dev-libs/libffi/libffi-3.1-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="http://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-execstack.patch \ - "${FILESDIR}"/${P}-typing_error.patch - - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - # http://sourceware.org/ml/libffi-discuss/2014/msg00060.html - sed -i -e 's:@toolexeclibdir@:${libdir}:' libffi.pc.in || die #511726 - - epatch_user - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild deleted file mode 100644 index f7b526c70d..0000000000 --- a/dev-libs/libffi/libffi-3.2.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="http://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - epatch "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 - epatch "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch - epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - epatch_user - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.2.ebuild b/dev-libs/libffi/libffi-3.2.ebuild deleted file mode 100644 index 14ba07eac7..0000000000 --- a/dev-libs/libffi/libffi-3.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="http://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -# A number of people report python ctypes errors #529044 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - - epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - - epatch_user - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild new file mode 100644 index 0000000000..3d1f2530f8 --- /dev/null +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib-minimal + +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="a portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" +SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0/7" # SONAME=libffi.so.7 +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug pax-kernel static-libs test" + +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="" +BDEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README.md" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 + "${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch + "${FILESDIR}"/${PN}-3.3-power7.patch + "${FILESDIR}"/${PN}-3.3-power7-memcpy.patch + "${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch + "${FILESDIR}"/${PN}-3.3-ppc-int128.patch + "${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch + "${FILESDIR}"/${PN}-3.3-compiler-vendor-quote.patch +) + +S=${WORKDIR}/${MY_P} + +ECONF_SOURCE=${S} + +src_prepare() { + default + if [[ ${CHOST} == arm64-*-darwin* ]] ; then + # ensure we use aarch64 asm, not x86 on arm64 + sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ + configure configure.host || die + fi +} + +multilib_src_configure() { + # --includedir= path maintains a few properties: + # 1. have stable name across libffi versions: some packages like + # dev-lang/ghc or kde-frameworks/networkmanager-qt embed + # ${includedir} at build-time. Don't require those to be + # rebuilt unless SONAME changes. bug #695788 + # + # We use /usr/.../${PN} (instead of former /usr/.../${P}). + # + # 2. have ${ABI}-specific location as ffi.h is target-dependent. + # + # We use /usr/$(get_libdir)/... to have ABI identifier. + econf \ + --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ + --disable-multi-os-directory \ + $(use_enable static-libs static) \ + $(use_enable pax-kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + einstalldocs +} diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild new file mode 100644 index 0000000000..492d9b34c6 --- /dev/null +++ b/dev-libs/libffi/libffi-3.4.2-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal preserve-libs + +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="a portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" +SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +# This is a core package which is depended on by e.g. Python +# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users +# with FEATURES="-preserved-libs" or another package manager if SONAME +# changes. +SLOT="0/8" # SONAME=libffi.so.8 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug exec-static-trampoline pax-kernel static-libs test" + +RESTRICT="!test? ( test )" +BDEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README.md" + +ECONF_SOURCE=${S} + +src_prepare() { + default + if [[ ${CHOST} == arm64-*-darwin* ]] ; then + # ensure we use aarch64 asm, not x86 on arm64 + sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ + configure configure.host || die + fi +} + +multilib_src_configure() { + # --includedir= path maintains a few properties: + # 1. have stable name across libffi versions: some packages like + # dev-lang/ghc or kde-frameworks/networkmanager-qt embed + # ${includedir} at build-time. Don't require those to be + # rebuilt unless SONAME changes. bug #695788 + # + # We use /usr/.../${PN} (instead of former /usr/.../${P}). + # + # 2. have ${ABI}-specific location as ffi.h is target-dependent. + # + # We use /usr/$(get_libdir)/... to have ABI identifier. + econf \ + --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ + --disable-multi-os-directory \ + $(use_enable static-libs static) \ + $(use_enable exec-static-trampoline exec-static-tramp) \ + $(use_enable pax-kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + einstalldocs +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libffi.so.7 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7 +} diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml index 691534b035..53754327cd 100644 --- a/dev-libs/libffi/metadata.xml +++ b/dev-libs/libffi/metadata.xml @@ -1,7 +1,10 @@ - + - toolchain + + toolchain@gentoo.org + Gentoo Toolchain Project + Compilers for high level languages generate code that follow certain conventions. These conventions are necessary, in part, for separate @@ -31,6 +34,10 @@ between the two languages. - Use PaX emulated trampolines, for we can't use PROT_EXEC + Don't rely on dynamic code generation for trampolines. + Use PaX emulated trampolines, for we can't use PROT_EXEC + + cpe:/a:libffi_project:libffi + From f989994e983bd17d3a00da28abf3e946d854ba23 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:47:21 +0100 Subject: [PATCH 03/18] dev-libs/libaio: Sync with gentoo It's from gentoo commit a9bf59f3fd6ef919eab913ef1d799c093f178081. --- dev-libs/libaio/ChangeLog | 359 ------------------ dev-libs/libaio/Manifest | 17 +- .../libaio/files/libaio-0.3.106-build.patch | 17 - .../files/libaio-0.3.107-ar-ranlib.patch | 17 - .../files/libaio-0.3.107-generic-arch.patch | 101 ----- .../libaio-0.3.107-install-to-slash.patch | 31 -- .../libaio/files/libaio-0.3.107-sparc.patch | 151 -------- .../files/libaio-0.3.109-generic-arch.patch | 62 --- .../libaio/files/libaio-0.3.109-install.patch | 45 --- .../files/libaio-0.3.109-testcase-8.patch | 19 - .../libaio-0.3.109-unify-bits-endian.patch | 73 ---- .../libaio/files/libaio-0.3.109-x32.patch | 63 --- .../files/libaio-0.3.110-cppflags.patch | 25 -- ...h => libaio-0.3.111-optional-werror.patch} | 12 +- .../files/libaio-0.3.112-cppflags.patch | 16 + .../libaio-0.3.112-respect-LDFLAGS.patch | 13 + ...o-0.3.110.ebuild => libaio-0.3.112.ebuild} | 33 +- dev-libs/libaio/libaio-9999.ebuild | 87 +++++ dev-libs/libaio/metadata.xml | 18 +- 19 files changed, 151 insertions(+), 1008 deletions(-) delete mode 100644 dev-libs/libaio/ChangeLog delete mode 100644 dev-libs/libaio/files/libaio-0.3.106-build.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.107-sparc.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.109-install.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.109-x32.patch delete mode 100644 dev-libs/libaio/files/libaio-0.3.110-cppflags.patch rename dev-libs/libaio/files/{libaio-0.3.110-optional-werror.patch => libaio-0.3.111-optional-werror.patch} (66%) create mode 100644 dev-libs/libaio/files/libaio-0.3.112-cppflags.patch create mode 100644 dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch rename dev-libs/libaio/{libaio-0.3.110.ebuild => libaio-0.3.112.ebuild} (67%) create mode 100644 dev-libs/libaio/libaio-9999.ebuild diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog deleted file mode 100644 index 93f49c2dea..0000000000 --- a/dev-libs/libaio/ChangeLog +++ /dev/null @@ -1,359 +0,0 @@ -# ChangeLog for dev-libs/libaio -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.97 2015/05/05 20:51:57 mrueg Exp $ - - 05 May 2015; Manuel Rüger -libaio-0.3.107.ebuild, - -libaio-0.3.109-r2.ebuild, -libaio-0.3.109-r3.ebuild, - -libaio-0.3.109-r4.ebuild, -libaio-0.3.109-r5.ebuild: - Remove old. - - 01 May 2015; Jeroen Roovers libaio-0.3.110.ebuild: - Stable for PPC64 (bug #525980). - - 16 Apr 2015; Yixun Lan metadata.xml: - add Gokturk Yeksek as proxy-maintainer - - 09 Mar 2015; Mike Frysinger libaio-0.3.110.ebuild: - Disable frame-pointer usage for arm systems when thumb is enabled. - - 02 Mar 2015; Agostino Sarubbo libaio-0.3.110.ebuild: - Stable for ppc, wrt bug #525980 - - 20 Feb 2015; Mike Frysinger libaio-0.3.110.ebuild: - Add arm64 love. - - 16 Jan 2015; Raúl Porcel libaio-0.3.109-r4.ebuild, - libaio-0.3.110.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #525980 - - 25 Oct 2014; Markus Meier libaio-0.3.110.ebuild: - arm stable, bug #525980 - - 23 Oct 2014; Pacho Ramos libaio-0.3.110.ebuild: - amd64/x86 stable, bug #525980 - - 21 Oct 2014; Jeroen Roovers libaio-0.3.110.ebuild: - Stable for HPPA (bug #525980). - -*libaio-0.3.110 (27 Mar 2014) - - 27 Mar 2014; Mike Frysinger - +files/libaio-0.3.110-cppflags.patch, - +files/libaio-0.3.110-optional-werror.patch, +libaio-0.3.110.ebuild: - Version bump. - -*libaio-0.3.109-r5 (27 Mar 2014) - - 27 Mar 2014; Mike Frysinger +libaio-0.3.109-r5.ebuild: - Convert from USE=multilib to multilib-minimal eclass #435094 by Matt Turner. - - 16 Mar 2014; Mike Frysinger - files/libaio-0.3.106-build.patch: - Drop soname hunk that does not seem to be needed. - - 20 Mar 2013; Jeroen Roovers metadata.xml: - Remove useless . - - 13 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for ppc, wrt bug #460704 - - 11 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for sh, wrt bug #460704 - - 10 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for s390, wrt bug #460704 - - 09 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for sparc, wrt bug #460704 - - 09 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for x86, wrt bug #460704 - - 09 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for ia64, wrt bug #460704 - - 09 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for alpha, wrt bug #460704 - - 09 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for ppc64, wrt bug #460704 - - 08 Mar 2013; Jeroen Roovers libaio-0.3.109-r4.ebuild: - Stable for HPPA (bug #460704). - - 08 Mar 2013; Agostino Sarubbo libaio-0.3.109-r4.ebuild: - Stable for arm, wrt bug #460704 - - 08 Mar 2013; Sergey Popov libaio-0.3.109-r4.ebuild: - Stable on amd64, wrt bug #460704 - -*libaio-0.3.109-r4 (07 Mar 2013) - - 07 Mar 2013; Julian Ospald +libaio-0.3.109-r4.ebuild: - fix multilib and bump EAPI - - 29 Dec 2012; Mike Frysinger libaio-0.3.109-r3.ebuild: - Mark stable for the rest of the arches. - - 14 Nov 2012; Agostino Sarubbo libaio-0.3.109-r3.ebuild: - Stable for x86, wrt bug #397571 - - 14 Nov 2012; Agostino Sarubbo libaio-0.3.109-r3.ebuild: - Stable for amd64, wrt bug #397571 - - 19 Sep 2012; Jeroen Roovers libaio-0.3.109-r2.ebuild: - Stable for HPPA (bug #379991). - - 02 Apr 2012; Pacho Ramos libaio-0.3.109-r3.ebuild: - -Werror must not be used in final releases, bug #410041 by Markus Oehme. - - 30 Mar 2012; Michael Haubenwallner - libaio-0.3.109-r3.ebuild: - Install non-binary files even for the non-default ABI, bug#407687 - - 30 Mar 2012; Michael Haubenwallner - libaio-0.3.109-r3.ebuild: - Drop unused manpages in src_prepare already, to not break multilib in - src_install, bug#407687. - - 17 Mar 2012; Pacho Ramos -libaio-0.3.109-r1.ebuild, - libaio-0.3.109-r3.ebuild: - Don't build static libs, bug #408265 by Kevin Pyle; drop old. - - 12 Mar 2012; Michael Haubenwallner - libaio-0.3.109-r3.ebuild: - Fix for cross-compile support of multilib-portage, bug#407687 - -*libaio-0.3.109-r3 (09 Mar 2012) - - 09 Mar 2012; Michael Haubenwallner - +libaio-0.3.109-r3.ebuild, +files/libaio-0.3.109-testcase-8.patch: - Add multilib support (for oracle-instantclient-11 multilib). - Fix tests, run those that do not break with sandbox, drop test restriction. - - 07 Dec 2011; Mike Frysinger libaio-0.3.109-r2.ebuild, - +files/libaio-0.3.109-x32.patch: - Add fix for x32 ABIs. - - 03 Oct 2011; Joseph Jezak libaio-0.3.109-r2.ebuild: - Marked ppc/ppc64 stable for bug #379991. - - 03 Sep 2011; Raúl Porcel libaio-0.3.109-r2.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #379991 - - 28 Aug 2011; Markus Meier libaio-0.3.109-r2.ebuild: - arm stable, bug #379991 - - 26 Aug 2011; Jeremy Olexa libaio-0.3.109-r2.ebuild: - Fix for Gentoo Prefix, add ~amd64-linux. bug 380725 - - 24 Aug 2011; Markus Meier libaio-0.3.109-r2.ebuild: - x86 stable, bug #379991 - - 22 Aug 2011; Tony Vroon libaio-0.3.109-r2.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian - "idella4" Delaney in bug #379991. - - 20 Aug 2011; Mike Frysinger libaio-0.3.109-r2.ebuild: - Avoid executing git #379999 by Agostino Sarubbo. - -*libaio-0.3.109-r2 (09 Nov 2010) - - 09 Nov 2010; Mike Frysinger +libaio-0.3.109-r2.ebuild: - Drop lio_listio man page now provided by man-pages. - -*libaio-0.3.109-r1 (21 Oct 2010) - - 21 Oct 2010; Mike Frysinger +libaio-0.3.109-r1.ebuild, - +files/libaio-0.3.109-generic-arch.patch, - files/libaio-0.3.109-install.patch, - +files/libaio-0.3.109-unify-bits-endian.patch: - Clean up ebuild by restoring patches and drop aio_init man page #341953 by - Alec M. - -*libaio-0.3.109 (25 Aug 2010) - - 25 Aug 2010; Maciej Mrozowski - +libaio-0.3.109.ebuild, +files/libaio-0.3.109-install.patch: - Version bump, fix bug 325355 (install to /lib) - - 06 Apr 2010; Jonathan Callen libaio-0.3.107.ebuild: - Bump to EAPI=3, add prefix keywords - - 12 Sep 2009; Víctor Ostorga - -files/libaio-0.3.15-2.5-2-Makefile.patch, - -files/libaio-0.3.104-build.patch: - Cleaning out unused patches - - 06 May 2009; Jeroen Roovers libaio-0.3.107.ebuild: - Stable for HPPA too. - - 18 Mar 2009; Brent Baude libaio-0.3.107.ebuild: - stable ppc, bug 254291 - - 15 Mar 2009; Brent Baude libaio-0.3.107.ebuild: - stable ppc64, bug 254291 - - 24 Feb 2009; Raúl Porcel libaio-0.3.107.ebuild: - arm/ia64/s390/sh/sparc stable - - 09 Feb 2009; Raúl Porcel libaio-0.3.15-r1.ebuild: - ia64/sparc stable wrt #254291 - - 14 Jan 2009; Mike Frysinger - +files/libaio-0.3.107-ar-ranlib.patch, libaio-0.3.107.ebuild: - Respect AR/RANLIB in env. - - 11 Jan 2009; Markus Meier libaio-0.3.107.ebuild: - x86 stable, bug #254291 - - 10 Jan 2009; Tobias Klausmann libaio-0.3.107.ebuild: - Stable on alpha, bug #254291 - - 10 Jan 2009; Thomas Anderson - libaio-0.3.107.ebuild: - stable amd64, bug 254291 - - 24 Dec 2008; Mike Frysinger - +files/libaio-0.3.107-generic-arch.patch, libaio-0.3.107.ebuild: - Add generic support for missing arches (arm, blackfin, sh, etc...). - - 04 Dec 2008; Brent Baude libaio-0.3.106-r2.ebuild: - stable ppc64, bug 245909 - - 14 Nov 2008; Raúl Porcel libaio-0.3.106-r2.ebuild: - alpha/ia64 stable wrt #245909 - - 08 Nov 2008; Markus Meier libaio-0.3.106-r2.ebuild: - amd64/x86 stable, bug #245909 - - 08 Nov 2008; nixnut libaio-0.3.106-r2.ebuild: - Stable on ppc wrt bug 245909 - - 08 Nov 2008; Mike Frysinger libaio-0.3.107.ebuild: - Fix by Olivier Huber for multilib installs #245964. - -*libaio-0.3.107 (06 Nov 2008) - - 06 Nov 2008; Mike Frysinger - +files/libaio-0.3.107-install-to-slash.patch, - +files/libaio-0.3.107-sparc.patch, +libaio-0.3.107.ebuild: - Version bump. - -*libaio-0.3.106-r2 (15 Sep 2008) - - 15 Sep 2008; Jeremy Olexa +libaio-0.3.106-r2.ebuild: - (non maintainer commit) add cross compiler support, thanks to Aaron Carroll - in bug 197720 - - 06 Jan 2007; Danny van Dyk -libaio-0.3.15.ebuild, - -libaio-0.3.104.ebuild, -libaio-0.3.106.ebuild: - QA: Removed unused versions. - - 20 Dec 2006; Steve Dibb libaio-0.3.106-r1.ebuild: - amd64 stable, bug 137915 - - 20 Oct 2006; Bryan Østergaard - libaio-0.3.106-r1.ebuild: - Stable on Alpha. - - 12 Jul 2006; Steve Arnold libaio-0.3.106.ebuild: - Backported fixes to 106 version to use updated patch, but without the - src_test updates (use the -r1 version for test updates). - - 10 Jul 2006; Steve Arnold - +files/libaio-0.3.106-build.patch, libaio-0.3.106-r1.ebuild: - Fixed build patch, soname, and QA issues, works now on amd64. Note the - tests still need a Makefile patch to work correctly, and I'm not sure - about the status of the kernel support (upstream kernel patches stop about - a year ago at 2.6.12). This is used by the ROMIO support in mpich2. - - 09 Jul 2006; Joshua Kinard libaio-0.3.15-r1.ebuild: - Marked stable on mips. - - 26 Jun 2006; Andrej Kacian libaio-0.3.106-r1.ebuild: - Stable on x86, bug #137915. - - 25 Jun 2006; Marcus D. Hanwell libaio-0.3.106.ebuild: - Marked stable on amd64, bug 137915. - - 25 Jun 2006; Tobias Scherbaum - libaio-0.3.106-r1.ebuild: - ppc stable, bug #137915 - - 25 Jun 2006; Markus Rothe libaio-0.3.106-r1.ebuild: - Stable on ppc64; bug #137915 - - 25 May 2006; Guy Martin libaio-0.3.15.ebuild, - libaio-0.3.15-r1.ebuild: - Not ported on hppa. Removing ~hppa keyword. - - 21 May 2006; Markus Rothe libaio-0.3.106.ebuild: - Stable on ppc64 - -*libaio-0.3.106-r1 (17 May 2006) - - 17 May 2006; Patrick McLean - +libaio-0.3.106-r1.ebuild: - Fix for multilib-strict, revbump because this changes the approach to - multilib support. - - 06 May 2006; Mark Loeser libaio-0.3.106.ebuild: - Stable on x86 - - 27 Apr 2006; Marien Zwart files/digest-libaio-0.3.15, - files/digest-libaio-0.3.15-r1, files/digest-libaio-0.3.104, - files/digest-libaio-0.3.106, Manifest: - Fixing SHA256 digest, pass four - - 23 Mar 2006; Luca Barbato libaio-0.3.106.ebuild: - Marked ppc - - 04 Feb 2006; Aron Griffis libaio-0.3.106.ebuild: - Mark 0.3.106 stable on alpha - - 03 Feb 2006; Aron Griffis libaio-0.3.106.ebuild: - Mark 0.3.106 stable on ia64 - -*libaio-0.3.106 (05 Jan 2006) - - 05 Jan 2006; Mike Frysinger +libaio-0.3.106.ebuild: - Version bump. - -*libaio-0.3.104 (11 Oct 2005) - - 11 Oct 2005; Mike Frysinger - +files/libaio-0.3.104-build.patch, +libaio-0.3.104.ebuild: - Version bump #108818 by Steve Yin. - -*libaio-0.3.15-r1 (04 Oct 2005) - - 04 Oct 2005; Mike Frysinger - +files/libaio-0.3.15-CFLAGS.patch, - +files/libaio-0.3.15-no-exec-stack.patch, +libaio-0.3.15-r1.ebuild: - Clean up ebuild, respect user CFLAGS, and fix executable stack markings. - - 02 Oct 2005; Aron Griffis libaio-0.3.15.ebuild: - Mark 0.3.15 stable on alpha - - 24 Aug 2005; Mike Frysinger - +files/libaio-0.3.15-more-arches.patch, libaio-0.3.15.ebuild: - Add support for alpha/arm/hppa/ia64/m68k/mips/ppc/s390/sh/sparc. - - 12 Jun 2004; Ian Leitch libaio-0.3.15.ebuild, - libaio-0.3.92.ebuild: - ~x86 added to KEYWORDS. Description modified. #53567 - - 11 Jun 2004; Danny van Dyk libaio-0.3.15.ebuild: - Applying the -fPIC patch only on necessary archs from now on. - -*libaio-0.3.15 (30 Nov 2003) - - 30 Nov 2003; Brad House libaio-0.3.15.ebuild, - libaio-0.3.92.ebuild, files/libaio-0.3.15-2.5-2-Makefile.patch: - use patched 0.3.15 instead of 0.3.92 - -*libaio-0.3.92 (30 Nov 2003) - - 30 Nov 2003; Brad House libaio-0.3.92.ebuild: - initial commit. needed for Oracle 9i diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index fe04b2345a..e956615f88 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -1,16 +1 @@ -AUX libaio-0.3.106-build.patch 518 SHA256 d9ad69df11e8db16ef8502057849973fcfa1ffd1aef2b1d5667f09d79cb84878 SHA512 305df897c7418b9b43c5b7f970566f5660c0282692d4d2da459cfe57ee213b0a1c3d937866b6dd714df63a0d7db6e186a60b23b5f6d62a39797e06214efe9d65 WHIRLPOOL 222041777b40aa09a4ec7c9ba716754fca1b9c112ba6d7255bd289476f1ac9543178de972eb5a9816d8ba5ca46e921a3a12b6906804a4f760bf21baf7849cd8f -AUX libaio-0.3.107-ar-ranlib.patch 398 SHA256 08f00e00cef21df01ec7327b1789083ea0d93b86b211a7164f1f1926ecde301f SHA512 f28fce187f83330a1e16ff4cc9bcfda9656220a2f73ff37b26d7e54f5035d5da079b751d701cab8500d160583c2e13043452b8d4099fc1cb5f4e534f43bef9ae WHIRLPOOL 14cf2733a4e04b33d80e07ddea6f1a4105b6396115cf63ca687675686ff7870a9ed0ff670121386055885ad3aaf8a0496e5a4be82f8bfcba9a69208edba903ba -AUX libaio-0.3.107-generic-arch.patch 3638 SHA256 90e51ca04c7c6e4a8773efa05f91bf372a010a55b670d6353b849709905f18f8 SHA512 f3505de20f4b4746f47d2bab2b724b96851a7217304869d64d5dae1e16bce0716375cb40b10fe448f289a02d40c58930ab7f31768a6fdc0f377a1df7fb094acf WHIRLPOOL 45cd8bb60e7c8e9333430107277e5a5d4bde152a4ca1acef99b2656125405d1134fc61991ecfdbc13ce883976536a076ad18d73fb6dc3d437d45480a1e935abe -AUX libaio-0.3.107-install-to-slash.patch 1072 SHA256 9405774a83dec8862002b185837495e96fa1c6753de18a8c0ea732cef525588c SHA512 0101f72effcefd43883a8d26217a9e8aa946b151c6010097bdbb5ba863c35f2bd67286d7fd3d525137bd0741a94b676e42aefea42c96a1507bc0579b5f5495bc WHIRLPOOL 883d0b6c59ccb4339168a8df4a14a7a2e9ca0f08dd9e9b124a2838153513850e1b39355e56f1818049c19b9bfadcbe31c31314f8389488e3240fe85cfe50a0ea -AUX libaio-0.3.107-sparc.patch 5331 SHA256 38cc2e213054332ba888cf5e3844e762374dd63f1537fd86ceebccfd516c1c45 SHA512 aaadd1d46bf4d396c6eb89ef3889c62d3b53ef87c09972927a5dde6842d7cbf40c2518ffa3b6801a43fba594c47507cb43dd8b4a28783c310a9c357a04988ce3 WHIRLPOOL 306b01fad1455d3d089990878c136ca2976cf2637fd928a9ef99efbe2a4e16fb3c2cb1c91d02f4dbd06494d502657ad45a8791067eae4fcad677ceba696289c9 -AUX libaio-0.3.109-generic-arch.patch 2047 SHA256 f1bd745d3e6fe42f8a0ab811a4925b9bbdb827d338cf1cf1cf44583951f5abda SHA512 1a3c31e5662650db6eef01b0a903b62dcafb1d7269f5f69611c0b90774547f7253d7a2088ca027ff5e926270256128eaa8a64bb753d2fbc930fd7834721bf2c0 WHIRLPOOL ef2056cfb53badd59069eb695afe5608cb5516bba8f67fd5d1831d6e2900ff9d2e75f164d2a2c79245cb41068044c6ce94d181725468deca4742b6cb68132006 -AUX libaio-0.3.109-install.patch 1506 SHA256 6d4b429bd3f29bf3748256943ee1a7cbb4cb6d9b3af63b2a9ee0be913783e34e SHA512 67c7813c573637fb16f930a4a5eed53c04b520356caa809ec3cdfd1ea587d09a30024f41d03264a31e3ae4410b01193f87e14a40b85a93591573516905abd79e WHIRLPOOL 167abe932291311dc927d6d52499aa465c2f90785ce2f7f98c85592adc4f977f88cc13fb45bd0788c05cdc07890ddee5d1a4b07ffd6d1a656479e2e4a3ccd28a -AUX libaio-0.3.109-testcase-8.patch 579 SHA256 c1ae004284b8ebda84d781cf9caf784de6ddbccbca534bb16f33f36451aec904 SHA512 e39ea546c9035d064f18845ffd2987254eb0205bfe220639df295498aea8a1003d83142c0a8de3d73c7178ad2ccb784e898c5586083ea2b2193d480948828a3c WHIRLPOOL 9c1bb90af32db992e5cac3bc6a4047244a82a1f31fd437bf9da8733c08a6f60b1468f1c7a74a62f6968d2ea48daf50c2be218987b46f0c74d2ce5b1c19ab2fb4 -AUX libaio-0.3.109-unify-bits-endian.patch 2610 SHA256 53c10fda429b47fc2fbbbf3751285a39523b8f8bdae9366294569055bd088f92 SHA512 b0b09d18d627e12f1ded80d1eb79a70dbffc3e24b628d01a1508f809e6a63c5050f33b7043d0700ed35ec553fb5fa9698c2024aa2755457f673da6f708ab663c WHIRLPOOL 80c607f14286def30d8832365b57094213960689a61a5fb91354a4ba12e13f0a7e491085fa0a95a9b2203d0a5fc12c28367d562c4e49f83433029b36372398c1 -AUX libaio-0.3.109-x32.patch 2122 SHA256 23a4c40e8add0125ebb9f50919ff27f55de0e2605ca7800bc875e0e81a936974 SHA512 0de645aa290919de0c82c26a0ecbed1d27dc3fdeeb909a86f36ee875afae2803ce97e0088c75e47a1de1cef99527659da75b9e17e5c310a1a518eb02a948a0b2 WHIRLPOOL 24a29a324ed62755d118c8eaea0e3edc9e38c28a9a9ede8456af9219734a6914b8ba589e4ad479dce24695e3d67e0c270840589148875a88acce611466d65b16 -AUX libaio-0.3.110-cppflags.patch 629 SHA256 76ce5e1b2c23200cff613ab1098c804707bd361d85ea8d18872c5ed891ef02c1 SHA512 b39fabcb37e75ab9300d78476a7468359efa883a49822db28d11d305d557f835ac9245b9c8c3e0a8ff6c7fd70125c841056f1e22175025d16a99ce94f849f80c WHIRLPOOL baa180d184fbd72766d2f85e083bf56cc3ccbcfd93b0281ebefac20e49ce3915fa6765d907ec7ccef21664393c95b9ce7244bb72f3607d521130a92f0e2f0e7d -AUX libaio-0.3.110-optional-werror.patch 832 SHA256 4854607a4569a86c514d3bfa7470e21b06ca82edff174cefc18f3e923dfc9d9c SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067 WHIRLPOOL c0f02e9c28e113ce5daced925c48e0461ee650c06e8103f594931118b34ecfb01e892ef6d829b73058a30f8ba67e5f470b84304fbfe1467f3e7d7b47bc8127cd -DIST libaio-0.3.110.tar.gz 42270 SHA256 e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3 WHIRLPOOL 21666b6d14e8091a52941b54b1c6d882dd495ed2d5ca9047a7951ee44e90aa33348ade0d3e4e7f12076a264b64b354a06cd96433cb39e18fc87b3655b59767af -EBUILD libaio-0.3.110.ebuild 2307 SHA256 e98cd2624bdccd2832b58a74cb86c3a78e734c947a872298c62c1502a78ace07 SHA512 acaffca38cd74696cbd319215acc6bc355afe29c41af16439f129d33f78a416a35c7190d90ea5cb5a11bd7143e508d5886c7b26281e6267610afce2ef13b72ab WHIRLPOOL 9def90589057702f0482827e6e592d8566daec33561ffcea2d5eb7e14139b724981c4641af8f154314466ace73e68ba23b0d8a8a0ebd9c635190b9d47f3ee7a1 -MISC ChangeLog 13084 SHA256 06b80495c4e8e9d2b9b3c23a2800bc2d3996e90fdf67498b2561ddc381a4d333 SHA512 2910bfaff866ac8c06002070e5299fe507e64d37dc3c4d26dffd78593944d5b91497ae35d2ed67b7794763ed6a6d46677f89a0a2c5ad02365bf860f0369fec87 WHIRLPOOL c2994f44d723449f5e8769190d277089a0905620e0befe7dbcaefb6f9ae5a3035c5376ce3fe26be8bf8896ad0033bd39bb46dda304e109719f39196faac23d1a -MISC metadata.xml 478 SHA256 578d7f545669a307ae4acbbf59c44f9d4809a9bf1e2d77119b141e3833ac1047 SHA512 13b3ff24458a2fd59bf136759b821f65de8f9527673e0e5479e71d5bf7ae6644cd75686d92296fc1656e32fd2c7e3cdbd09aec44e6b3a292bba7b82e25bcf466 WHIRLPOOL da66d122781ef716a014c2fecec33d14b50ea696f8728e80e0476414908960c8d1b984826ce321d0dad574fd987c66771e0434c8458fa3e9278b3b9559b6e9de +DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa diff --git a/dev-libs/libaio/files/libaio-0.3.106-build.patch b/dev-libs/libaio/files/libaio-0.3.106-build.patch deleted file mode 100644 index 812c2a4b0e..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.106-build.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/Makefile.orig 2006-07-09 19:46:41.000000000 -0700 -+++ src/Makefile 2006-07-09 19:51:00.000000000 -0700 -@@ -2,11 +2,10 @@ - includedir=$(prefix)/include - libdir=$(prefix)/lib - --ARCH := $(shell uname -m | sed -e s/i.86/i386/) --CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC --SO_CFLAGS=-shared $(CFLAGS) -+CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) --LINK_FLAGS= -+LINK_FLAGS=-lgcc -lrt $(LDFLAGS) - - soname=libaio.so.1 - minor=0 diff --git a/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch b/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch deleted file mode 100644 index d1ec1403a0..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -42,10 +42,12 @@ - $(CC) $(L_CFLAGS) -c -o $@ $< - - -+AR ?= ar -+RANLIB ?= ranlib - libaio.a: $(libaio_objs) - rm -f libaio.a -- ar r libaio.a $^ -- ranlib libaio.a -+ $(AR) r libaio.a $^ -+ $(RANLIB) libaio.a - - $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) diff --git a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch deleted file mode 100644 index 6ecd7f10d5..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch +++ /dev/null @@ -1,101 +0,0 @@ -for arches that lack magic assembly (arm, blackfin, etc...), implement support -using standard syscall() function - ---- src/libaio.h -+++ src/libaio.h -@@ -49,38 +49,34 @@ typedef enum io_iocb_cmd { - IO_CMD_PWRITEV = 8, - } io_iocb_cmd_t; - --#if defined(__i386__) /* little endian, 32 bits */ -+/* little endian, 32 bits */ -+#if defined(__i386__) || defined(__sh__) || defined(__bfin__) || \ -+ defined(__ARMEL__) || defined(__MIPSEL__) || defined(__cris__) - #define PADDED(x, y) x; unsigned y - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y -+ -+/* little endian, 64 bits */ - #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) - #define PADDED(x, y) x, y - #define PADDEDptr(x, y) x - #define PADDEDul(x, y) unsigned long x --#elif defined(__powerpc64__) /* big endian, 64 bits */ -+ -+/* big endian, 64 bits */ -+#elif defined(__powerpc64__) || defined(__s390x__) || \ -+ (defined(__sparc__) && defined(__arch64__)) - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x,y) x - #define PADDEDul(x, y) unsigned long x --#elif defined(__PPC__) /* big endian, 32 bits */ -+ -+/* big endian, 32 bits */ -+#elif defined(__PPC__) || defined(__s390__) || defined(__ARMEB__) || \ -+ defined(__MIPSEB__) || defined(__sparc__) || defined(__m68k__) || \ -+ defined(__hppa__) || defined(__frv__) || defined(__avr32__) - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x, y) unsigned y; x - #define PADDEDul(x, y) unsigned y; unsigned long x --#elif defined(__s390x__) /* big endian, 64 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x,y) x --#define PADDEDul(x, y) unsigned long x --#elif defined(__s390__) /* big endian, 32 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x, y) unsigned y; x --#define PADDEDul(x, y) unsigned y; unsigned long x --#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x,y) x --#define PADDEDul(x, y) unsigned long x --#elif defined(__sparc__) /* big endian, 32 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x, y) unsigned y; x --#define PADDEDul(x, y) unsigned y; unsigned long x -+ - #else - #error endian? - #endif ---- /dev/null -+++ src/syscall-generic.h -@@ -0,0 +1,29 @@ -+#include -+#include -+#include -+ -+#define _body_io_syscall(sname, args...) \ -+{ \ -+ int ret = syscall(__NR_##sname, ## args); \ -+ return ret < 0 ? -errno : ret; \ -+} -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+_body_io_syscall(sname, (long)arg1) -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2) -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3) -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4) -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \ -+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5) ---- src/syscall.h -+++ src/syscall.h -@@ -25,5 +25,6 @@ - #elif defined(__sparc__) - #include "syscall-sparc.h" - #else --#error "add syscall-arch.h" -+#warning "using generic syscall method" -+#include "syscall-generic.h" - #endif diff --git a/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch b/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch deleted file mode 100644 index c47273631f..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch +++ /dev/null @@ -1,31 +0,0 @@ -based on fedora ptach - ---- libaio-0.3.107/src/Makefile -+++ libaio-0.3.107/src/Makefile -@@ -1,6 +1,7 @@ - prefix=/usr --includedir=$(prefix)/include --libdir=$(prefix)/lib -+includedir=/usr/include -+libdir=/usr/lib -+usrlibdir=$(libdir) - - ARCH := $(shell uname -m | sed -e s/i.86/i386/) - CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -@@ -51,11 +52,11 @@ - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - - install: $(all_targets) -- install -D -m 644 libaio.h $(includedir)/libaio.h -- install -D -m 644 libaio.a $(libdir)/libaio.a -- install -D -m 755 $(libname) $(libdir)/$(libname) -- ln -sf $(libname) $(libdir)/$(soname) -- ln -sf $(libname) $(libdir)/libaio.so -+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h -+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a -+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so - - $(libaio_objs): libaio.h - diff --git a/dev-libs/libaio/files/libaio-0.3.107-sparc.patch b/dev-libs/libaio/files/libaio-0.3.107-sparc.patch deleted file mode 100644 index 92bcd5325e..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.107-sparc.patch +++ /dev/null @@ -1,151 +0,0 @@ -ripped from fedora - ---- libaio-0.3.107/src/libaio.h -+++ libaio-0.3.107/src/libaio.h -@@ -73,6 +73,14 @@ - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x, y) unsigned y; x - #define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x - #else - #error endian? - #endif ---- libaio-0.3.107/src/syscall.h -+++ libaio-0.3.107/src/syscall.h -@@ -22,6 +22,8 @@ - #include "syscall-s390.h" - #elif defined(__alpha__) - #include "syscall-alpha.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" - #else - #error "add syscall-arch.h" - #endif ---- libaio-0.3.107/src/syscall-sparc.h -+++ libaio-0.3.107/src/syscall-sparc.h -@@ -0,0 +1,118 @@ -+#include -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} diff --git a/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch deleted file mode 100644 index fea3aeeee4..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 5e96c73d5dfbdea8d0be82b7f3fc8d6735e5dfa7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 17 Jan 2010 17:07:48 -0500 -Subject: [PATCH] add a generic syscall() fallback - -Signed-off-by: Mike Frysinger ---- - src/syscall-generic.h | 29 +++++++++++++++++++++++++++++ - src/syscall.h | 3 ++- - 2 files changed, 31 insertions(+), 1 deletions(-) - create mode 100644 src/syscall-generic.h - -diff --git a/src/syscall-generic.h b/src/syscall-generic.h -new file mode 100644 -index 0000000..24d7c7c ---- /dev/null -+++ b/src/syscall-generic.h -@@ -0,0 +1,29 @@ -+#include -+#include -+#include -+ -+#define _body_io_syscall(sname, args...) \ -+{ \ -+ int ret = syscall(__NR_##sname, ## args); \ -+ return ret < 0 ? -errno : ret; \ -+} -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+_body_io_syscall(sname, (long)arg1) -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2) -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3) -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4) -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \ -+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5) -diff --git a/src/syscall.h b/src/syscall.h -index 78becfe..d954af0 100644 ---- a/src/syscall.h -+++ b/src/syscall.h -@@ -25,5 +25,6 @@ - #elif defined(__arm__) - #include "syscall-arm.h" - #else --#error "add syscall-arch.h" -+#warning "using generic syscall method" -+#include "syscall-generic.h" - #endif --- -1.7.3.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch deleted file mode 100644 index 9c049fcbf5..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-install.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2e34caef82a2367a85de4f06daf5e5a92f61e845 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 17 Jan 2010 17:10:14 -0500 -Subject: [PATCH] fix up install paths - -This is similar to the Fedora patch, but this uses more common conventions -like "DESTDIR" instead of "destdir". - -Signed-off-by: Mike Frysinger ---- - src/Makefile | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 687c7be..ee431a1 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,6 +1,7 @@ - prefix=/usr - includedir=$(prefix)/include - libdir=$(prefix)/lib -+usrlibdir=$(libdir) - - CFLAGS ?= -g -fomit-frame-pointer -O2 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -@@ -53,11 +54,11 @@ $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - - install: $(all_targets) -- install -D -m 644 libaio.h $(includedir)/libaio.h -- install -D -m 644 libaio.a $(libdir)/libaio.a -- install -D -m 755 $(libname) $(libdir)/$(libname) -- ln -sf $(libname) $(libdir)/$(soname) -- ln -sf $(libname) $(libdir)/libaio.so -+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h -+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a -+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so - - $(libaio_objs): libaio.h - --- -1.7.3.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch b/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch deleted file mode 100644 index de66f2110f..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch +++ /dev/null @@ -1,19 +0,0 @@ -Do not ignore return value of ftruncate(): testcases are compiled with -Werror, -and ftruncate is declared with attribute warn_unused_result. ---- harness/cases/8.t.orig 2012-03-09 16:40:04.074168070 +0100 -+++ harness/cases/8.t 2012-03-09 16:40:57.777278646 +0100 -@@ -9,12 +9,13 @@ - { - long long min = 0, max = 9223372036854775807LL; - char c = 0; -+ int ret; - - while (max - min > 1) { - if (pwrite64(fd, &c, 1, (min + max) / 2) == -1) - max = (min + max) / 2; - else { -- ftruncate(fd, 0); -+ ret = ftruncate(fd, 0); assert(ret == 0); - min = (min + max) / 2; - } - } diff --git a/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch b/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch deleted file mode 100644 index 1a4e6ef123..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch +++ /dev/null @@ -1,73 +0,0 @@ -From be673c7afd7a86b89fbe2e09c758f2de3482d19b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 17 Jan 2010 17:07:24 -0500 -Subject: [PATCH] unify LE/BE 32/64bit logic and add more arches - -Signed-off-by: Mike Frysinger ---- - src/libaio.h | 36 +++++++++++++++--------------------- - 1 files changed, 15 insertions(+), 21 deletions(-) - -diff --git a/src/libaio.h b/src/libaio.h -index ffe8259..4a6c9fb 100644 ---- a/src/libaio.h -+++ b/src/libaio.h -@@ -49,40 +49,34 @@ typedef enum io_iocb_cmd { - IO_CMD_PWRITEV = 8, - } io_iocb_cmd_t; - --#if defined(__i386__) /* little endian, 32 bits */ -+/* little endian, 32 bits */ -+#if defined(__i386__) || defined(__sh__) || defined(__bfin__) || \ -+ defined(__ARMEL__) || defined(__MIPSEL__) || defined(__cris__) - #define PADDED(x, y) x; unsigned y - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y -+ -+/* little endian, 64 bits */ - #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) - #define PADDED(x, y) x, y - #define PADDEDptr(x, y) x - #define PADDEDul(x, y) unsigned long x --#elif defined(__powerpc64__) /* big endian, 64 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x,y) x --#define PADDEDul(x, y) unsigned long x --#elif defined(__PPC__) /* big endian, 32 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x, y) unsigned y; x --#define PADDEDul(x, y) unsigned y; unsigned long x --#elif defined(__s390x__) /* big endian, 64 bits */ -+ -+/* big endian, 64 bits */ -+#elif defined(__powerpc64__) || defined(__s390x__) || \ -+ (defined(__sparc__) && defined(__arch64__)) - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x,y) x - #define PADDEDul(x, y) unsigned long x --#elif defined(__s390__) /* big endian, 32 bits */ --#define PADDED(x, y) unsigned y; x --#define PADDEDptr(x, y) unsigned y; x --#define PADDEDul(x, y) unsigned y; unsigned long x --#elif defined(__arm__) --# if defined (__ARMEB__) /* big endian, 32 bits */ -+ -+/* big endian, 32 bits */ -+#elif defined(__PPC__) || defined(__s390__) || defined(__ARMEB__) || \ -+ defined(__MIPSEB__) || defined(__sparc__) || defined(__m68k__) || \ -+ defined(__hppa__) || defined(__frv__) || defined(__avr32__) - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x, y) unsigned y; x - #define PADDEDul(x, y) unsigned y; unsigned long x --# else /* little endian, 32 bits */ --#define PADDED(x, y) x; unsigned y --#define PADDEDptr(x, y) x; unsigned y --#define PADDEDul(x, y) unsigned long x; unsigned y --# endif -+ - #else - #error endian? - #endif --- -1.7.3.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch deleted file mode 100644 index 1d2c2a9050..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-x32.patch +++ /dev/null @@ -1,63 +0,0 @@ -http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826 - -Upstream-Status: Pending - -Properly load arguments 5 an 6 for x86-64 syscall -Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64 -syscall so that it works with both x32 and x86-64. - -Received this patch from H.J. Lu - -Signed-Off-By: Nitin A Kamble -2011/12/02 - ---- libaio-0.3.109/src/syscall-x86_64.h.x32 2009-10-09 11:17:02.000000000 -0700 -+++ libaio-0.3.109/src/syscall-x86_64.h 2011-12-02 09:09:07.537603224 -0800 -@@ -1,8 +1,18 @@ -+#ifndef __NR_io_setup - #define __NR_io_setup 206 -+#endif -+#ifndef __NR_io_destroy - #define __NR_io_destroy 207 -+#endif -+#ifndef __NR_io_getevents - #define __NR_io_getevents 208 -+#endif -+#ifndef __NR_io_submit - #define __NR_io_submit 209 -+#endif -+#ifndef __NR_io_cancel - #define __NR_io_cancel 210 -+#endif - - #define __syscall_clobber "r11","rcx","memory" - #define __syscall "syscall" -@@ -42,10 +52,11 @@ return __res; \ - type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ - { \ - long __res; \ --__asm__ volatile ("movq %5,%%r10 ;" __syscall \ -+register long __a4 asm ("r10") = (long) arg4; \ -+__asm__ volatile (__syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ -- "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ -+ "d" ((long)(arg3)),"r" (__a4)); \ - return __res; \ - } - -@@ -54,10 +65,11 @@ return __res; \ - type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ - { \ - long __res; \ --__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ -+register long __a4 asm ("r10") = (long) arg4; \ -+register long __a5 asm ("r8") = (long) arg5; \ -+__asm__ volatile ( __syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ -- "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ -- __syscall_clobber,"r8","r10" ); \ -+ "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \ - return __res; \ - } diff --git a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch deleted file mode 100644 index 4567ac9466..0000000000 --- a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3bf96bb62370035dba18d4b25459406b32365cfc Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 26 Mar 2014 23:10:18 -0400 -Subject: [PATCH] respect env CPPFLAGS - -Signed-off-by: Mike Frysinger ---- - src/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile b/src/Makefile -index 49f448f..b918c8b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -5,6 +5,7 @@ usrlibdir=$(libdir) - - CFLAGS ?= -g -fomit-frame-pointer -O2 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += $(CPPFLAGS) - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= --- -1.9.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch similarity index 66% rename from dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch rename to dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch index 2933cf5244..5b6f91e56d 100644 --- a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch +++ b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch @@ -1,6 +1,6 @@ -From 0cc7dc108d0b2288b40d82bb2fd1fd8bdc08f764 Mon Sep 17 00:00:00 2001 +From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger -Date: Wed, 26 Mar 2014 23:07:58 -0400 +Date: Sun, 21 Apr 2019 12:44:26 +0200 Subject: [PATCH] make -Werror into an optional flag This lets distros disable the flag as random errors might come up with @@ -12,19 +12,19 @@ Signed-off-by: Mike Frysinger 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/harness/Makefile b/harness/Makefile -index 2a88e71..cf8c90d 100644 +index f477737..a155c4b 100644 --- a/harness/Makefile +++ b/harness/Makefile @@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS) HARNESS_SRCS:=main.c # io_queue.c --CFLAGS+=-Wall -Werror -I../src -g -O +-CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE) +CFLAGS_WERROR?=-Werror -+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O ++CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE) #-lpthread -lrt all: $(PROGS) -- -1.9.1 +2.21.0 diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch new file mode 100644 index 0000000000..dddb9c2166 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch @@ -0,0 +1,16 @@ +respect env CPPFLAGS + +--- a/src/Makefile ++++ b/src/Makefile +@@ -2,8 +2,9 @@ prefix=/usr + includedir=$(prefix)/include + libdir=$(prefix)/lib + +-CFLAGS ?= -g -fomit-frame-pointer -O2 +-CFLAGS += -Wall -I. -fPIC ++CFLAGS ?= -fomit-frame-pointer -O2 ++CFLAGS += -I. -fPIC ++CFLAGS += $(CPPFLAGS) + SO_CFLAGS=-shared $(CFLAGS) + L_CFLAGS=$(CFLAGS) + LINK_FLAGS= diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch new file mode 100644 index 0000000000..20e23874fb --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch @@ -0,0 +1,13 @@ +We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly. +--- a/src/Makefile ++++ b/src/Makefile +@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs) + $(RANLIB) libaio.a + + $(libname): $(libaio_sobjs) libaio.map +- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) ++ $(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) + + install: $(all_targets) + install -D -m 644 libaio.h $(includedir)/libaio.h + diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild similarity index 67% rename from dev-libs/libaio/libaio-0.3.110.ebuild rename to dev-libs/libaio/libaio-0.3.112.ebuild index 9bc6649e06..a83b08bd98 100644 --- a/dev-libs/libaio/libaio-0.3.110.ebuild +++ b/dev-libs/libaio/libaio-0.3.112.ebuild @@ -1,27 +1,32 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.110.ebuild,v 1.9 2015/05/01 19:01:01 jer Exp $ -EAPI=5 +EAPI="7" -inherit eutils multilib-minimal toolchain-funcs flag-o-matic +inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE="https://git.fedorahosted.org/cgit/libaio.git/ http://lse.sourceforge.net/io/aio.html" -SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" - +HOMEPAGE="https://pagure.io/libaio" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://pagure.io/libaio.git" +else + SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.112-cppflags.patch + "${FILESDIR}"/${PN}-0.3.111-optional-werror.patch + "${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.3.109-install.patch \ - "${FILESDIR}"/${PN}-0.3.109-x32.patch \ - "${FILESDIR}"/${PN}-0.3.109-testcase-8.patch \ - "${FILESDIR}"/${PN}-0.3.110-cppflags.patch \ - "${FILESDIR}"/${PN}-0.3.110-optional-werror.patch + default local sed_args=( -e "/^prefix=/s:/usr:${EPREFIX}/usr:" diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild new file mode 100644 index 0000000000..232c536818 --- /dev/null +++ b/dev-libs/libaio/libaio-9999.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript + +DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" +HOMEPAGE="https://pagure.io/libaio" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://pagure.io/libaio.git" +else + SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="LGPL-2" +SLOT="0" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.112-cppflags.patch + "${FILESDIR}"/${PN}-0.3.111-optional-werror.patch + "${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch +) + +src_prepare() { + default + + local sed_args=( + -e "/^prefix=/s:/usr:${EPREFIX}/usr:" + -e '/^libdir=/s:lib$:$(ABI_LIBDIR):' + ) + if ! use static-libs; then + sed_args+=( -e '/\tinstall .*\/libaio.a/d' ) + # Tests require the static library to be built. + use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' ) + fi + sed -i "${sed_args[@]}" src/Makefile Makefile || die + + multilib_copy_sources +} + +multilib_src_configure() { + if use arm ; then + # When building for thumb, we can't allow frame pointers. + # http://crbug.com/464517 + if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then + append-flags -fomit-frame-pointer + fi + fi +} + +_emake() { + CC=$(tc-getCC) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + ABI_LIBDIR=$(get_libdir) \ + CFLAGS_WERROR= \ + emake "$@" +} + +multilib_src_compile() { + _emake +} + +multilib_src_test() { + mkdir -p testdir || die + # 'make check' breaks with sandbox, 'make partcheck' works + _emake partcheck prefix="${S}/src" libdir="${S}/src" +} + +multilib_src_install() { + _emake install DESTDIR="${D}" +} + +multilib_src_install_all() { + doman man/* + dodoc ChangeLog TODO + + # move crap to / for multipath-tools #325355 + gen_usr_ldscript -a aio + + # This lib is a bare minimal shim on top of kernel syscalls. + export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n') +} diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml index f739e440b6..8035a4003e 100644 --- a/dev-libs/libaio/metadata.xml +++ b/dev-libs/libaio/metadata.xml @@ -1,12 +1,12 @@ - + -proxy-maintainers - - gokturk@binghamton.edu - Gokturk Yuksek - Primary Maintainer, Assign bugs - -Library to provide user-level kernel Asynchronous I/O (AIO) - support for Linux (needs kernel patches as of 2.6.12) + + base-system@gentoo.org + Gentoo Base System + + + Library to provide user-level kernel Asynchronous I/O (AIO) + support for Linux (needs kernel patches as of 2.6.12) + From 0436010be379c354f02181d70d34ad8390d6b65b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:49:24 +0100 Subject: [PATCH 04/18] dev-libs/lzo: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- dev-libs/lzo/ChangeLog | 302 -------------------------------- dev-libs/lzo/Manifest | 8 +- dev-libs/lzo/lzo-2.08-r1.ebuild | 48 ----- dev-libs/lzo/lzo-2.08.ebuild | 43 ----- dev-libs/lzo/lzo-2.09.ebuild | 48 ----- dev-libs/lzo/lzo-2.10.ebuild | 38 ++++ dev-libs/lzo/metadata.xml | 14 +- 7 files changed, 47 insertions(+), 454 deletions(-) delete mode 100644 dev-libs/lzo/ChangeLog delete mode 100644 dev-libs/lzo/lzo-2.08-r1.ebuild delete mode 100644 dev-libs/lzo/lzo-2.08.ebuild delete mode 100644 dev-libs/lzo/lzo-2.09.ebuild create mode 100644 dev-libs/lzo/lzo-2.10.ebuild diff --git a/dev-libs/lzo/ChangeLog b/dev-libs/lzo/ChangeLog deleted file mode 100644 index 865e8ae054..0000000000 --- a/dev-libs/lzo/ChangeLog +++ /dev/null @@ -1,302 +0,0 @@ -# ChangeLog for dev-libs/lzo -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.91 2015/03/10 20:19:03 vapier Exp $ - - 10 Mar 2015; Mike Frysinger lzo-2.08.ebuild: - Mark arm64/m68k/s390/sh stable. - - 26 Dec 2014; Mikle Kolyada -lzo-2.06-r1.ebuild, - -lzo-2.06.ebuild: - Security cleanup - - 06 Jul 2014; Markus Meier lzo-2.08.ebuild: - arm stable, bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for sparc, wrt bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for ppc, wrt bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for ppc64, wrt bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for ia64, wrt bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for alpha, wrt bug #515238 - - 05 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for x86, wrt bug #515238 - - 04 Jul 2014; Agostino Sarubbo lzo-2.08.ebuild: - Stable for amd64, wrt bug #515238 - -*lzo-2.08-r1 (02 Jul 2014) - - 02 Jul 2014; Samuli Suominen +lzo-2.08-r1.ebuild: - Move native liblzo2 to / wrt #471640 by Mike Gilbert - - 30 Jun 2014; Jeroen Roovers lzo-2.08.ebuild: - Stable for HPPA (bug #515238). - -*lzo-2.08 (30 Jun 2014) - - 30 Jun 2014; Samuli Suominen +lzo-2.08.ebuild: - Version bump wrt security bug #515238; upstream fixed bug #374699 as well. - -*lzo-2.06-r1 (28 Feb 2014) - - 28 Feb 2014; Michał Górny +lzo-2.06-r1.ebuild: - Introduce multilib support. - - 18 Jan 2014; Mike Frysinger lzo-2.06.ebuild: - Add arm64 love. - - 01 Jul 2013; Fabian Groffen lzo-2.06.ebuild: - Marked ~x64-solaris - - 17 Feb 2013; Zac Medico lzo-2.06.ebuild: - Add ~arm-linux keyword. - - 26 Apr 2012; Alexis Ballier lzo-2.06.ebuild: - keyword ~amd64-fbsd - - 02 Mar 2012; Samuli Suominen -lzo-2.04.ebuild, - -lzo-2.05.ebuild: - old - - 02 Mar 2012; Samuli Suominen lzo-2.06.ebuild: - ppc64 stable wrt #392765 - - 05 Jan 2012; Brent Baude lzo-2.06.ebuild: - Marking lzo-2.06 ppc for bug 392765 - - 08 Dec 2011; Markus Meier lzo-2.06.ebuild: - arm stable, bug #392765 - - 04 Dec 2011; Raúl Porcel lzo-2.06.ebuild: - alpha/ia64/m68k/s390/sh/sparc/x86 stable wrt #392765 - - 03 Dec 2011; Jeroen Roovers lzo-2.06.ebuild: - Stable for HPPA (bug #392765). - - 03 Dec 2011; Fabian Groffen lzo-2.06.ebuild: - One ~amd64-linux keyword is enough, thanks apostrophe in #gentoo-prefix - - 02 Dec 2011; Steve Dibb lzo-2.06.ebuild: - amd64 stable, bug 392765 - - 02 Dec 2011; Samuli Suominen lzo-2.06.ebuild: - Remove duplicate --disable-dependency-tracking from EAPI=4 ebuild. - - 02 Dec 2011; Fabian Groffen lzo-2.06.ebuild: - Migrate from Prefix overlay, add Prefix keywords (migration makes ~amd64-linux - keyword visible) - - 02 Dec 2011; Nathan Phillip Brink metadata.xml: - Commandeer this package, setting myself (binki) as maintainer. - - 02 Dec 2011; Nathan Phillip Brink lzo-2.06.ebuild: - Add keyword ~amd64-linux (tested on ubuntu 10.04). - - 02 Dec 2011; Nathan Phillip Brink lzo-2.06.ebuild: - Fix files wrongly installed into /usr/share/doc/${PN}, reported by jdhore. - -*lzo-2.06 (20 Aug 2011) - - 20 Aug 2011; Matt Turner +lzo-2.06.ebuild: - Version bump, found with euscan. - -*lzo-2.05 (03 Aug 2011) - - 03 Aug 2011; Sebastian Pipping +lzo-2.05.ebuild: - Bump to 2.05 (bug #365407) - - 20 Jul 2011; Pacho Ramos metadata.xml: - Drop maintainer due retirement, bug #34534 - - 23 Mar 2011; Kacper Kowalik lzo-2.04.ebuild: - ppc64 stable wrt #353842 - - 22 Mar 2011; Brent Baude lzo-2.04.ebuild: - Marking lzo-2.04 ppc for bug 353842 - - 21 Feb 2011; Jeroen Roovers lzo-2.04.ebuild: - Stable for HPPA (bug #353842). - - 13 Feb 2011; Raúl Porcel lzo-2.04.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #353842 - - 11 Feb 2011; Markos Chandras lzo-2.04.ebuild: - Stable on amd64 wrt bug #353842 - - 08 Feb 2011; Thomas Kahle lzo-2.04.ebuild: - x86 stable per bug 353842 - - 06 Feb 2011; Mart Raudsepp lzo-2.02-r1.ebuild: - Drop to ~mips - -*lzo-2.04 (01 Dec 2010) - - 01 Dec 2010; Samuli Suominen +lzo-2.04.ebuild: - Version bump. - - 18 Jul 2010; Daniel Black -lzo-1.08-r1.ebuild: - clean out old stuff - -*lzo-2.03 (18 Jun 2008) - - 18 Jun 2008; Daniel Black +lzo-2.03.ebuild: - version bump as per bug #227769 thanks Sergiy Borodych - - 12 Feb 2008; Diego Pettenò lzo-2.02-r1.ebuild: - Run elibtoolize. - - 01 Mar 2007; Daniel Black lzo-2.02-r1.ebuild: - nasm dependency dropped as per bug #168922 thanks to Harald van Dijk - - 16 Jan 2007; Fabian Groffen lzo-1.08-r1.ebuild, - lzo-2.02-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix. - - 07 Jan 2007; Daniel Black lzo-1.08-r1.ebuild: - [e]autotools correction as per bug #160159 thanks Diego - - 05 Jan 2007; Diego Pettenò lzo-1.08-r1.ebuild: - Remove gnuconfig_update usage, leave it to econf. - - 09 Nov 2006; Ilya A. Volynets-Evenbakh - lzo-2.02-r1.ebuild: - Stable on mips - - 17 Oct 2006; Roy Marples lzo-2.02-r1.ebuild: - Added ~sparc-fbsd keyword. - - 22 Sep 2006; Bryan Østergaard lzo-2.02-r1.ebuild: - Stable on Alpha. - - 21 Sep 2006; Tobias Scherbaum lzo-2.02-r1.ebuild: - hppa stable - - 10 Sep 2006; Javier Villavicencio - lzo-2.02-r1.ebuild: - Add ~x86-fbsd keyword - - 13 Jul 2006; Aron Griffis lzo-2.02-r1.ebuild: - Mark 2.02-r1 stable on ia64 - - 23 Apr 2006; Diego Pettenò lzo-1.08-r1.ebuild: - Run elibtoolize and add ~x86-fbsd keyword. - - 20 Apr 2006; Chris Gianelloni lzo-2.02-r1.ebuild: - Marking stable on x86 for bug #129748. - - 19 Apr 2006; Daniel Goller lzo-2.02-r1.ebuild: - Stable on ppc and amd64 as dep. for transcode-1 - - 19 Apr 2006; Jason Wever lzo-2.02-r1.ebuild: - Stable on SPARC wrt bug #129748. - - 17 Apr 2006; Markus Rothe lzo-2.02-r1.ebuild: - Stable on ppc64; bug #129748 - - 29 Dec 2005; Daniel Black - +files/lzo-1.08-exec-stack.patch, +files/lzo-2.02-exec-stack.patch, - lzo-1.08-r1.ebuild, -lzo-2.02.ebuild, lzo-2.02-r1.ebuild: - removed executable stacks bug #116930] thanks to betelgeuse - -*lzo-2.02-r1 (03 Dec 2005) - - 03 Dec 2005; Carsten Lohrke +lzo-2.02-r1.ebuild: - Add examples only when wanted. - -*lzo-2.02 (13 Nov 2005) - - 13 Nov 2005; Daniel Black +metadata.xml, - -lzo-1.08.ebuild, -lzo-2.01.ebuild, +lzo-2.02.ebuild: - version bump to support slots - bug #110877 and bug #110878 thanks to - Francisco Jose Canizares Santofimia. remove older versions - -*lzo-2.01 (16 Jul 2005) - - 16 Jul 2005; Daniel Black -lzo-2.00.ebuild, - +lzo-2.01.ebuild: - version bump. - - 03 Jul 2005; Hardave Riar lzo-1.08-r1.ebuild: - Stable on mips, dep for bug #90726. - -*lzo-2.00 (25 Jun 2005) - - 25 Jun 2005; Daniel Black +lzo-2.00.ebuild: - version bump - - 05 Jun 2005; Joseph Jezak lzo-1.08-r1.ebuild: - Marked ppc-macos stable. - - 01 Apr 2005; Michael Hanselmann lzo-1.08-r1.ebuild: - Stable on ppc. - - 29 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 24 Nov 2004; Kito lzo-1.08-r1.ebuild: - added ~ppc-macos. closes bug 67509 - - 18 Aug 2004; Hardave Riar lzo-1.08-r1.ebuild: - Added ~mips keyword. - - 03 Jul 2004; lzo-1.08-r1.ebuild: - allow user optimizations - - 01 Jul 2004; Jeremy Huddleston lzo-1.08.ebuild: - virtual/glibc -> virtual/libc - - 26 May 2004; Guy Martin lzo-1.08-r1.ebuild: - Marked stable on hppa. - - 23 May 2004; Bryan Østergaard lzo-1.08-r1.ebuild: - Stable on alpha. - - 01 May 2004; Gustavo Zacarias lzo-1.08-r1.ebuild: - Stable on sparc - - 28 Apr 2004; Jon Portnoy lzo-1.08-r1.ebuild : - Stable on x86 and AMD64. - - 14 Mar 2004; Michael Sterrett lzo-1.08.ebuild: - Don't assign default to S; header fix - - 07 Mar 2004; Tom Gall lzo-1.08-r1.ebuild: - mark ppc64 as stable - - 24 Sep 2003; Daniel Robbins : removed nasm from - RDEPEND. - - 12 Sep 2003; Jason Wever lzo-1.08-r1.ebuild: - Fixed dependencies for non-x86 arches as nasm is an x86 assembler and not - keyworded for anything other than x86. - -*lzo-1.08-r1 (11 Sep 2003) - - 11 Sep 2003; Mike Frysinger : - Version bump to fix asm support #28359. - -*lzo-1.08 (21 Sep 2002) - - 07 Apr 2003; Guy Martin lzo-1.08.ebuild : - Added hppa to KEYWORDS. - - 06 Mar 2003; Aron Griffis lzo-1.08.ebuild: - Add alpha to KEYWORDS - - 21 Sep 2002; Daniel Robbins : Bumped version to 1.08. - -*lzo-1.07 (13 Apr 2002) - - 14 Aug 2002; Pieter Van den Abeele : Added ppc keyword - - 13 Apr 2002; Jon Nelson ChangeLog, lzo-1.07.ebuild New - lzo ebuild courtesy of Bryce Allen (ballen at mum.edu) diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest index 3b199498f2..1272fd3c55 100644 --- a/dev-libs/lzo/Manifest +++ b/dev-libs/lzo/Manifest @@ -1,7 +1 @@ -DIST lzo-2.08.tar.gz 589045 SHA256 ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 SHA512 d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd WHIRLPOOL bea0357b01cb64018a5afc7b0934065dda944866aa23f44edd4eb615d53c0242b70c836d2d8144ed64df4a438bea5c1b8b5120ee4a7f08af15db171f85c11ac8 -DIST lzo-2.09.tar.gz 594855 SHA256 f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7 WHIRLPOOL 5c5aaa79ddc4202b784ec29e6607d450a3824564ac3364a1219cd971be32bc58fc583ab5ffcbd52a8ddf975518059eab9bd1b897c052081e19dc0a43a96fee45 -EBUILD lzo-2.08-r1.ebuild 1333 SHA256 593253d16efb3e0e385dc853f007978fc7f5f5499c5de2af4fd11e2d6eb07726 SHA512 3a7967532d13ec8a60ea364ccf8f1132ad5468a4d1cf1df207b3a7eb1972d57b95c8305d91d73afc89f2aa8ae22f6e0dc45ec9def1f0a00d62ac63662d645553 WHIRLPOOL 4e4b0dab0e2ef0252ee41baa1b8bd9ad921df68c3db5005b5c27c6168ab27d3218be782ed17eb15bfb85ab3c5903d42be8937064d4be345f9d8d202d24879ff0 -EBUILD lzo-2.08.ebuild 1194 SHA256 2ffe069a6a076bbefa365c1de21eb12766d4ec0ace207a65937876c49f90b8b0 SHA512 78b5e8c1628dc920289b52910d09cbe2bd8970f86105ce39685199008c13dbdc33ed28c16bc8e15eeb0c2a332e39ab5e575d56219ec91339629b4dd5796ba738 WHIRLPOOL ba03b73fa715598f8acc70ae525e413ce7de93011f4913fba53f920ce6510243d8430ac79079fe2482cc162bbb8c35467cb4dcc1cab9e4a6f48abef996f4de07 -EBUILD lzo-2.09.ebuild 1333 SHA256 593253d16efb3e0e385dc853f007978fc7f5f5499c5de2af4fd11e2d6eb07726 SHA512 3a7967532d13ec8a60ea364ccf8f1132ad5468a4d1cf1df207b3a7eb1972d57b95c8305d91d73afc89f2aa8ae22f6e0dc45ec9def1f0a00d62ac63662d645553 WHIRLPOOL 4e4b0dab0e2ef0252ee41baa1b8bd9ad921df68c3db5005b5c27c6168ab27d3218be782ed17eb15bfb85ab3c5903d42be8937064d4be345f9d8d202d24879ff0 -MISC ChangeLog 10097 SHA256 b6cf7a85a025a7fa8fd1472684db2a6e8e8e5203218db88749ae7852c966d63e SHA512 8713adbd6e06f1d2ed51ee8350591a603f0b57f742a5f94e518b3e4f1a78f9cdf98b55e213bd7d45471fc2d7405ef01a6f078a41eb2783f2674092fdf99289e1 WHIRLPOOL 53d193223cc480fe64fa061b66942c3042553aef546813144d3af212a03c5ba8a3d40d1ead0b2bbcc8e2b19460c01dcda948a221b1360125bd8532d196258ad6 -MISC metadata.xml 276 SHA256 3b3d22063bb3023576eec2aa46b4f2acf7e31e79a041eb88b2b1c543cba5dd32 SHA512 61cf2cb960290d20f64e3f5b76202b4b1afee4c8e4a31f30e50bd2974ff6964717a644480b7ec61995e6744eaa476a560c706b6a1b0379cd400007322fe064f7 WHIRLPOOL c02b5a77e65616cdf05d476d55c38eca5342a0f769b005816cc938c8d372bfc9df428c70ade93d50cf6ce25598acfbf58f542cb651c78a67fadcb1bb548ed6aa +DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4 diff --git a/dev-libs/lzo/lzo-2.08-r1.ebuild b/dev-libs/lzo/lzo-2.08-r1.ebuild deleted file mode 100644 index 616c15716c..0000000000 --- a/dev-libs/lzo/lzo-2.08-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib-minimal toolchain-funcs - -DESCRIPTION="An extremely fast compression and decompression library" -HOMEPAGE="http://www.oberhumer.com/opensource/lzo/" -SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples static-libs" - -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" - -DOCS="BUGS ChangeLog README THANKS doc/*" - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --enable-shared \ - $(use_enable static-libs static) -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a lzo2 -} - -multilib_src_install_all() { - einstalldocs - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - - if use examples; then - docinto examples - dodoc examples/*.{c,h} - fi - - prune_libtool_files -} diff --git a/dev-libs/lzo/lzo-2.08.ebuild b/dev-libs/lzo/lzo-2.08.ebuild deleted file mode 100644 index a38e9f5974..0000000000 --- a/dev-libs/lzo/lzo-2.08.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib-minimal - -DESCRIPTION="An extremely fast compression and decompression library" -HOMEPAGE="http://www.oberhumer.com/opensource/lzo/" -SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples static-libs" - -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" - -DOCS="BUGS ChangeLog README THANKS doc/*" - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --enable-shared \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - - if use examples; then - docinto examples - dodoc examples/*.{c,h} - fi - - prune_libtool_files -} diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild deleted file mode 100644 index 616c15716c..0000000000 --- a/dev-libs/lzo/lzo-2.09.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils multilib-minimal toolchain-funcs - -DESCRIPTION="An extremely fast compression and decompression library" -HOMEPAGE="http://www.oberhumer.com/opensource/lzo/" -SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples static-libs" - -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" - -DOCS="BUGS ChangeLog README THANKS doc/*" - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --enable-shared \ - $(use_enable static-libs static) -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a lzo2 -} - -multilib_src_install_all() { - einstalldocs - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - - if use examples; then - docinto examples - dodoc examples/*.{c,h} - fi - - prune_libtool_files -} diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild new file mode 100644 index 0000000000..d21765fe4f --- /dev/null +++ b/dev-libs/lzo/lzo-2.10.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal usr-ldscript + +DESCRIPTION="An extremely fast compression and decompression library" +HOMEPAGE="https://www.oberhumer.com/opensource/lzo/" +SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples static-libs" + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + gen_usr_ldscript -a lzo2 +} + +multilib_src_install_all() { + rm "${ED}"/usr/share/doc/${PF}/COPYING || die + + if use examples; then + docinto examples + dodoc examples/*.{c,h} + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/lzo/metadata.xml b/dev-libs/lzo/metadata.xml index caaa4ac67b..58200bf156 100644 --- a/dev-libs/lzo/metadata.xml +++ b/dev-libs/lzo/metadata.xml @@ -1,9 +1,11 @@ - + - - binki@gentoo.org - Nathan Phillip Brink - - + + mgorny@gentoo.org + Michał Górny + + + cpe:/a:lzo_project:lzo + From 399be118183540f026aee9057d0794716eeb77a4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:51:25 +0100 Subject: [PATCH 05/18] dev-libs/ding-libs: Sync with gentoo It's from gentoo commit db6c2e5161a3320ae4c30b71c40f3ac837427faf. --- dev-libs/ding-libs/ChangeLog | 65 -------------- dev-libs/ding-libs/ChangeLog-2015 | 84 ------------------- dev-libs/ding-libs/Manifest | 6 +- dev-libs/ding-libs/ding-libs-0.4.0.ebuild | 24 ------ dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild | 36 ++++++++ dev-libs/ding-libs/ding-libs-0.6.1.ebuild | 31 +++++++ ...-INI-Fix-detection-of-error-messages.patch | 47 +++++++++++ ...1-path_utils_ut-allow-single-as-well.patch | 36 ++++++++ ...ors_ut_check-Fix-fail-with-new-glibc.patch | 49 +++++++++++ dev-libs/ding-libs/metadata.xml | 17 +--- 10 files changed, 202 insertions(+), 193 deletions(-) delete mode 100644 dev-libs/ding-libs/ChangeLog delete mode 100644 dev-libs/ding-libs/ChangeLog-2015 delete mode 100644 dev-libs/ding-libs/ding-libs-0.4.0.ebuild create mode 100644 dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild create mode 100644 dev-libs/ding-libs/ding-libs-0.6.1.ebuild create mode 100644 dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch create mode 100644 dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch create mode 100644 dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch diff --git a/dev-libs/ding-libs/ChangeLog b/dev-libs/ding-libs/ChangeLog deleted file mode 100644 index aa9ee051cf..0000000000 --- a/dev-libs/ding-libs/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -# ChangeLog for dev-libs/ding-libs -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*ding-libs-0.4.0 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +ding-libs-0.4.0.ebuild, - +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/dev-libs/ding-libs/ChangeLog-2015 b/dev-libs/ding-libs/ChangeLog-2015 deleted file mode 100644 index d025a9d5c5..0000000000 --- a/dev-libs/ding-libs/ChangeLog-2015 +++ /dev/null @@ -1,84 +0,0 @@ -# ChangeLog for dev-libs/ding-libs -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ChangeLog,v 1.21 2015/04/10 00:10:17 blueness Exp $ - - 10 Apr 2015; Anthony G. Basile ding-libs-0.4.0.ebuild: - Keyword ~ppc, ~ppc64. Bug #540540. - - 06 Mar 2015; Jeroen Roovers ding-libs-0.4.0.ebuild: - Marked ~hppa (bug #540540). - - 03 Mar 2015; Markus Meier ding-libs-0.4.0.ebuild: - add ~arm, bug #540540 - - 26 Jan 2015; Manuel Rüger -ding-libs-0.1.3.ebuild, - -ding-libs-0.2.91.ebuild, -ding-libs-0.3.0.1.ebuild: - Remove old. - - 26 Jan 2015; Agostino Sarubbo ding-libs-0.4.0.ebuild: - Stable for x86, wrt bug #535106 - - 09 Jan 2015; Agostino Sarubbo ding-libs-0.4.0.ebuild: - Stable for amd64, wrt bug #535106 - -*ding-libs-0.4.0 (27 Jun 2014) - - 27 Jun 2014; Maxim Koltsov +ding-libs-0.4.0.ebuild: - Bump to 0.4.0, thanks to slepnoga - - 01 Dec 2013; Markos Chandras ding-libs-0.1.3.ebuild, - ding-libs-0.2.91.ebuild, ding-libs-0.3.0.1.ebuild: - Do not override src_install function. Fixes installation failures - - 14 Jul 2013; Agostino Sarubbo ding-libs-0.3.0.1.ebuild: - Stable for x86, wrt bug #476792 - - 14 Jul 2013; Agostino Sarubbo ding-libs-0.3.0.1.ebuild: - Stable for amd64, wrt bug #476792 - -*ding-libs-0.3.0.1 (07 Apr 2013) - - 07 Apr 2013; Maxim Koltsov +ding-libs-0.3.0.1.ebuild: - Bump to 0.3.0.1, thanks to slepnoga - - 17 Mar 2013; Markos Chandras metadata.xml: - Add proxy-maintainers to metadata.xml - - 03 Nov 2012; Sergey Popov metadata.xml: - Correct metadata, requested by Andreis Vinogradovs - -*ding-libs-0.2.91 (06 Aug 2012) - - 06 Aug 2012; Maxim Koltsov +ding-libs-0.2.91.ebuild: - Bump to 0.2.91, thanks to slepnoga - - 02 Jun 2012; Maxim Koltsov -ding-libs-0.1.2-r1.ebuild: - Remove old 0.1.2-r1 - - 21 May 2012; Jeff Horelick ding-libs-0.1.3.ebuild: - marked x86 per bug 415505 - - 02 Mar 2012; Agostino Sarubbo ding-libs-0.1.3.ebuild: - Stable for amd64, wrt bug #406291 - - 04 Feb 2012; Maxim Koltsov metadata.xml: - Fix maintainer's email in metadata - -*ding-libs-0.1.3 (08 Oct 2011) - - 08 Oct 2011; Maxim Koltsov +ding-libs-0.1.3.ebuild: - Bump to 0.1.3, by slepnoga. - -*ding-libs-0.1.2-r1 (15 Sep 2011) - - 15 Sep 2011; Maxim Koltsov - +ding-libs-0.1.2-r1.ebuild, -ding-libs-0.1.2.ebuild: - (ChangeLog by Andreis Vinogradovs ) - Disable install useless .la files #382715; - Thanks Samuli Suominen for report - -*ding-libs-0.1.2 (11 Aug 2011) - - 11 Aug 2011; Maxim Koltsov +ding-libs-0.1.2.ebuild, - +metadata.xml: - Add initial ebuild from rion-overlay, thanks to slepnoga diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest index 8103527fb9..88f8db9149 100644 --- a/dev-libs/ding-libs/Manifest +++ b/dev-libs/ding-libs/Manifest @@ -1,5 +1 @@ -DIST ding-libs-0.4.0.tar.gz 827058 SHA256 bdeb90b07ceaa9145e6784ce40a71b69a37fffc7373c51fee258ffffd5390457 SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0 WHIRLPOOL 41733ac92c3c7fcaa19f19843a2464a0644632cc345b77fc033910974fa449f91780725302fafadd233c6ef4379174261bbab45e49830e8673a46d9ee3d6f652 -EBUILD ding-libs-0.4.0.ebuild 497 SHA256 d7d313a3221c76c4c6c317235145aee8df5dcfff92366beb9d3113365cc3cb8d SHA512 ca1a446f51e2eb2ef441e521e55c943439eefbff6fc0bc3910a5ebffa535a748676ea8f2ae0ff0a36c97985bedcbca7a68c1722dbf523f3df77faafc96cc0cf5 WHIRLPOOL 297bf87645e6bb5f7ef13fc16cba94d1c504d73b971f6b00ad6da673e5925e21f97fbc9643ecb15da1167c21ddc504a02b16c76f560c9f146a83c2694e4c665c -MISC ChangeLog 2433 SHA256 d640b7cb7e7ecbe7f29b52bdf7a6212fbb74411f1f4f4c9233ebabe28ac0f957 SHA512 fd37af97f9a0e4d73f41742e0c700dcab8efa355e43cebe65d9d98099fb13b93ccbf11f15a8ff67d958a3e5267fd18d40927fc64fec470c25d36a10d3b55f6a8 WHIRLPOOL a3b8b6f2331cc9540d53ad9fbf5a6f287d2e176d34417e9d198f0f44daa2023276cd9da3fce1f91984173ca6e40ab3b513141d3d3e69d9f17e6ef90ecca8d8d4 -MISC ChangeLog-2015 3038 SHA256 b5834d36691c6cadabbf1f7c5a15387696afd8b7d2e328c840f77fdf3a7ef0b5 SHA512 3070f202ae9432ee0437e79cc7b555951a2a6a7a7fe892103be3ce2fcfe3d94f1cb33d3fa94dca4c65de33dbfac5349da511215f84d555e5f58456b394dffb64 WHIRLPOOL 349f303f87209cf88f9507e7dcddd5f5daab8d9818611e7c0a05b6d8e523dba0951471b108ef54bddb916e6b07fd7faaf6e4999803e26107a4315e935665c7e1 -MISC metadata.xml 599 SHA256 a5e01e3375343a49fe9f0f2daae627cab85084a5cb111fe4b8eca8808c4be28b SHA512 8eb65f04aff8bcd9c14c81ccf6a2ba9292da7a5b6c40bcbb242dc8812988a60146814851ce1f3205cc76744cb11c49e05d22d6e94f8875e694eaf528973b061d WHIRLPOOL 040905a8e211e70e02f8d0c6497f5fe028a3b925bf612ceefbc63ca2792ddd5c5d69a3ffa19898ea4c328d091d48019251afcd7946bfb018a70a405d2cf36bb0 +DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628 diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild deleted file mode 100644 index 48143ce829..0000000000 --- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-multilib - -DESCRIPTION="Library set needed for build sssd" -HOMEPAGE="https://fedorahosted.org/sssd" -SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 GPL-3" -SLOT="0" - -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="test static-libs" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check ) - " diff --git a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild new file mode 100644 index 0000000000..1445f869fe --- /dev/null +++ b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="set of utility libraries (mostly used by sssd)" +HOMEPAGE="https://pagure.io/SSSD/ding-libs" +SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3 GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-libs/check )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch + "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch + "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch +) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf --disable-static +} + +multilib_src_install_all() { + einstalldocs + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild new file mode 100644 index 0000000000..f64be15bf4 --- /dev/null +++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit multilib-minimal + +DESCRIPTION="set of utility libraries (mostly used by sssd)" +HOMEPAGE="https://pagure.io/SSSD/ding-libs" +SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3 GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" +IUSE="test static-libs" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-libs/check )" + +PATCHES=( + "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch + "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch + "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch +) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf +} diff --git a/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch new file mode 100644 index 0000000000..62e436c7c9 --- /dev/null +++ b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch @@ -0,0 +1,47 @@ +From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik +Date: Wed, 3 Jan 2018 18:03:44 +0100 +Subject: [PATCH] INI: Fix detection of error messages +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libc on BSD returns different error messages. + +Reviewed-by: Michal Židek +--- + ini/ini_validators_ut_check.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c +index fa7105a..9ecde75 100644 +--- a/ini/ini_validators_ut_check.c ++++ b/ini/ini_validators_ut_check.c +@@ -607,6 +607,12 @@ START_TEST(test_ini_allowed_options_wrong_regex) + "[rule/options_for_foo]: Cannot compile regular expression " + "from option 'section_re'. " + "Error: 'Unmatched [ or [^'"); ++ if (ret != 0) { ++ ret = strcmp(errmsg, ++ "[rule/options_for_foo]: Cannot compile regular expression " ++ "from option 'section_re'. " ++ "Error: 'brackets ([ ]) not balanced'"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +@@ -1028,6 +1034,11 @@ START_TEST(test_ini_allowed_sections_wrong_regex) + ret = strcmp(errmsg, + "[rule/section_list]: Validator failed to use regex " + "[^foo\\(*$]:[Unmatched ( or \\(]"); ++ if (ret !=0) { ++ ret = strcmp(errmsg, ++ "[rule/section_list]: Validator failed to use regex " ++ "[^foo\\(*$]:[parentheses not balanced]"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +-- +2.21.0 + diff --git a/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch new file mode 100644 index 0000000000..a9ca8e9edc --- /dev/null +++ b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch @@ -0,0 +1,36 @@ +From 4236e323e8ab4f13770e1ac9e94666b304b693fb Mon Sep 17 00:00:00 2001 +From: Henrik Riomar +Date: Tue, 24 Jul 2018 21:59:36 +0000 +Subject: [PATCH 1/2] path_utils_ut: allow single / as well +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266 + Multiple successive slashes are considered to be the same as one slash. + +When running the tests on a musl libc system + get_dirname(p, PATH_MAX, "//foo//") +actually results in a / and not // + +Reviewed-by: Michal Židek +--- + path_utils/path_utils_ut.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/path_utils/path_utils_ut.c b/path_utils/path_utils_ut.c +index 27c99b6..061abfb 100644 +--- a/path_utils/path_utils_ut.c ++++ b/path_utils/path_utils_ut.c +@@ -62,7 +62,7 @@ START_TEST(test_dirname) + fail_unless_str_equal(p, "//foo"); + + fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS); +- fail_unless_str_equal(p, "//"); ++ fail_unless(!strcmp(p, "/") || !strcmp(p, "//")); + + fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS); + fail_unless_str_equal(p, "foo"); +-- +2.21.0 + diff --git a/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch new file mode 100644 index 0000000000..0524a128d6 --- /dev/null +++ b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch @@ -0,0 +1,49 @@ +From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C5=BDidek?= +Date: Wed, 1 Aug 2018 17:48:10 +0200 +Subject: [PATCH 2/2] validators_ut_check: Fix fail with new glibc + +Error message was slightly change from previous version +of glibc which caused fails in validators unit tests. + +Reviewed-by: Jakub Hrozek +--- + ini/ini_validators_ut_check.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c +index 9ecde75..3af8551 100644 +--- a/ini/ini_validators_ut_check.c ++++ b/ini/ini_validators_ut_check.c +@@ -602,6 +602,8 @@ START_TEST(test_ini_allowed_options_wrong_regex) + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + ++ /* Different versions of libc produce slightly different error strings ++ * in this case. For simplicity compare against all of them. */ + errmsg = ini_errobj_get_msg(errobj); + ret = strcmp(errmsg, + "[rule/options_for_foo]: Cannot compile regular expression " +@@ -609,10 +611,17 @@ START_TEST(test_ini_allowed_options_wrong_regex) + "Error: 'Unmatched [ or [^'"); + if (ret != 0) { + ret = strcmp(errmsg, +- "[rule/options_for_foo]: Cannot compile regular expression " +- "from option 'section_re'. " ++ "[rule/options_for_foo]: Cannot compile regular " ++ "expression from option 'section_re'. " + "Error: 'brackets ([ ]) not balanced'"); + } ++ ++ if (ret != 0) { ++ ret = strcmp(errmsg, ++ "[rule/options_for_foo]: Cannot compile regular " ++ "expression from option 'section_re'. " ++ "Error: 'Unmatched [, [^, [:, [., or [='"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +-- +2.21.0 + diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml index 47e116b000..85e4ed814f 100644 --- a/dev-libs/ding-libs/metadata.xml +++ b/dev-libs/ding-libs/metadata.xml @@ -1,18 +1,5 @@ - + - - andreis.vinogradovs@gmail.com - Andreis Vinogradovs - Maintainer. Assign bugs to him - - - maksbotan@gentoo.org - Maxim Koltsov - Proxy maintainer. CC him on bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - + From 335461fcb4c8a118a4b4e8a60f046fb443c8e4e5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:52:35 +0100 Subject: [PATCH 06/18] x11-libs/pixman: Sync with gentoo It's from gentoo commit 18745f353da4ddd132b344f0f20e035dfa917b93. --- x11-libs/pixman/ChangeLog | 777 --------------------------- x11-libs/pixman/Manifest | 12 +- x11-libs/pixman/metadata.xml | 7 +- x11-libs/pixman/pixman-0.32.6.ebuild | 32 -- x11-libs/pixman/pixman-0.32.8.ebuild | 32 -- x11-libs/pixman/pixman-0.33.2.ebuild | 37 -- x11-libs/pixman/pixman-0.33.4.ebuild | 37 -- x11-libs/pixman/pixman-0.40.0.ebuild | 56 ++ x11-libs/pixman/pixman-9999.ebuild | 71 ++- 9 files changed, 109 insertions(+), 952 deletions(-) delete mode 100644 x11-libs/pixman/ChangeLog delete mode 100644 x11-libs/pixman/pixman-0.32.6.ebuild delete mode 100644 x11-libs/pixman/pixman-0.32.8.ebuild delete mode 100644 x11-libs/pixman/pixman-0.33.2.ebuild delete mode 100644 x11-libs/pixman/pixman-0.33.4.ebuild create mode 100644 x11-libs/pixman/pixman-0.40.0.ebuild diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog deleted file mode 100644 index b4e608c138..0000000000 --- a/x11-libs/pixman/ChangeLog +++ /dev/null @@ -1,777 +0,0 @@ -# ChangeLog for x11-libs/pixman -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.201 2015/08/03 19:42:23 mrueg Exp $ - - 03 Aug 2015; Manuel Rüger -pixman-0.32.4.ebuild: - Version bump. Remove old. - -*pixman-0.33.2 (03 Aug 2015) - - 03 Aug 2015; Manuel Rüger +pixman-0.33.2.ebuild: - Version bump. Remove old. - - 14 Mar 2015; Markus Meier pixman-0.32.6.ebuild: - arm stable, bug #530652 - - 06 Mar 2015; Jeroen Roovers pixman-0.32.6.ebuild: - Stable for HPPA (bug #530652). - - 03 Mar 2015; Yixun Lan pixman-0.32.6.ebuild: - add arm64 support, tested on A53 board - - 24 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for alpha, wrt bug #530652 - - 23 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for sparc, wrt bug #530652 - - 22 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for ia64, wrt bug #530652 - - 21 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for ppc64, wrt bug #530652 - - 20 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for ppc, wrt bug #530652 - - 19 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for x86, wrt bug #530652 - - 18 Feb 2015; Agostino Sarubbo pixman-0.32.6.ebuild: - Stable for amd64, wrt bug #530652 - - 28 Jan 2015; Michał Górny pixman-0.32.4.ebuild, - pixman-0.32.6.ebuild: - Switch to CPU_FLAGS_X86. - -*pixman-0.32.6 (22 Oct 2014) - - 22 Oct 2014; Chí-Thanh Christopher Nguyễn - +pixman-0.32.6.ebuild, pixman-0.32.4.ebuild: - Version bump. - - 27 Dec 2013; Matt Turner -pixman-0.28.0.ebuild, - -pixman-0.28.2.ebuild, -pixman-0.30.0.ebuild, -pixman-0.30.2-r1.ebuild, - -pixman-0.30.2.ebuild: - Drop vulnerable versions, bug 493292. - - 26 Dec 2013; Mikle Kolyada pixman-0.32.4.ebuild: - ia64 stable wrt bug #493292 - - 18 Dec 2013; Matt Turner metadata.xml: - Drop mmxext and ssse3 local descriptions, now that they are global USE flags. - - 14 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for sparc, wrt bug #493292 - - 08 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for alpha, wrt bug #493292 - - 07 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for arm, wrt bug #493292 - - 07 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for ppc64, wrt bug #493292 - - 07 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for ppc, wrt bug #493292 - - 06 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for x86, wrt bug #493292 - - 06 Dec 2013; Agostino Sarubbo pixman-0.32.4.ebuild: - Stable for amd64, wrt bug #493292 - - 05 Dec 2013; Jeroen Roovers pixman-0.32.4.ebuild: - Stable for HPPA (bug #493292). - - 04 Dec 2013; Matt Turner metadata.xml, - pixman-0.32.4.ebuild: - Add ssse3 USE flag, bug 493152. - -*pixman-0.32.4 (18 Nov 2013) - - 18 Nov 2013; Matt Turner +pixman-0.32.4.ebuild, - -pixman-0.32.2.ebuild: - Version bump to 0.32.4, bug 491110. - -*pixman-0.32.2 (14 Nov 2013) - - 14 Nov 2013; Chí-Thanh Christopher Nguyễn - +pixman-0.32.2.ebuild: - Version bump. - -*pixman-0.30.2-r1 (26 Oct 2013) - - 26 Oct 2013; Alexis Ballier +pixman-0.30.2-r1.ebuild: - Convert to multilib, by Andrew Church , bug #488662, slat if for - emul-gtklibs-20131008-r1 - - 08 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for x86, wrt bug #475480 - - 07 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for sparc, wrt bug #475480 - - 06 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for ia64, wrt bug #475480 - - 05 Oct 2013; Markus Meier pixman-0.30.2.ebuild: - arm stable, bug #475480 - - 05 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for alpha, wrt bug #475480 - - 04 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for ppc64, wrt bug #475480 - - 03 Oct 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for ppc, wrt bug #475480 - - 02 Oct 2013; Jeroen Roovers pixman-0.30.2.ebuild: - Stable for HPPA (bug #475480). - - 29 Sep 2013; Agostino Sarubbo pixman-0.30.2.ebuild: - Stable for amd64, wrt bug #475480 - -*pixman-0.30.2 (08 Aug 2013) - - 08 Aug 2013; Chí-Thanh Christopher Nguyễn - +pixman-0.30.2.ebuild: - Version bump. - - 05 Jun 2013; Mike Frysinger metadata.xml: - Add upstream CPE tag (security info) from ChromiumOS. - - 09 May 2013; Chí-Thanh Christopher Nguyễn - -pixman-0.29.4.ebuild: - Drop old prerelease. - -*pixman-0.30.0 (09 May 2013) - - 09 May 2013; Matt Turner +pixman-0.30.0.ebuild: - Version bump to 0.30.0. - -*pixman-0.29.4 (04 May 2013) - - 04 May 2013; Chí-Thanh Christopher Nguyễn - +pixman-0.29.4.ebuild, -pixman-0.29.2.ebuild: - Bump to latest prerelease. - - 21 Feb 2013; Zac Medico pixman-0.29.2.ebuild: - Add ~arm-linux keyword. - - 07 Feb 2013; Matt Turner pixman-0.29.2.ebuild: - Typo fix for loongson-mmi, bug 455966. - - 06 Feb 2013; Matt Turner metadata.xml, - pixman-0.29.2.ebuild: - Add loongson2f USE flag, bug 431422. - - 06 Feb 2013; Matt Turner - -files/pixman-0.24.0-posix-test.patch, - -files/pixman-0.26.0-add-missing-_mm_empty-calls.patch, -pixman-0.20.2.ebuild, - -pixman-0.22.0.ebuild, -pixman-0.22.2.ebuild, -pixman-0.24.0.ebuild, - -pixman-0.24.2.ebuild, -pixman-0.24.4.ebuild, -pixman-0.26.0.ebuild, - -pixman-0.26.2.ebuild, metadata.xml, pixman-0.28.0.ebuild, - pixman-0.28.2.ebuild, pixman-0.29.2.ebuild: - Drop old. Rename mmx USE flag to mmxext to reflect reality. - - 31 Jan 2013; Matt Turner pixman-0.20.2.ebuild, - pixman-0.22.0.ebuild, pixman-0.22.2.ebuild, pixman-0.24.0.ebuild, - pixman-0.24.2.ebuild, pixman-0.24.4.ebuild, pixman-0.26.0.ebuild, - pixman-0.26.2.ebuild, pixman-0.28.0.ebuild, pixman-0.28.2.ebuild, - pixman-0.29.2.ebuild: - Add --disable-libpng, bug 453510. - -*pixman-0.29.2 (31 Jan 2013) - - 31 Jan 2013; Matt Turner +pixman-0.29.2.ebuild: - Version bump to 0.29.2. - - 04 Jan 2013; Jeroen Roovers pixman-0.28.0.ebuild: - Stable for HPPA (bug #440872). - - 01 Jan 2013; Raúl Porcel pixman-0.28.0.ebuild: - s390/sh stable wrt #440872 - - 30 Dec 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for alpha, wrt bug #440872 - - 28 Dec 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for sparc, wrt bug #440872 - - 28 Dec 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for ia64, wrt bug #440872 - - 17 Dec 2012; Markus Meier pixman-0.28.0.ebuild: - arm stable, bug #440872 - -*pixman-0.28.2 (10 Dec 2012) - - 10 Dec 2012; Chí-Thanh Christopher Nguyễn - +pixman-0.28.2.ebuild: - Version bump. - - 08 Dec 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for ppc64, wrt bug #440872 - - 28 Nov 2012; Brent Baude pixman-0.28.0.ebuild: - Marking pixman-0.28.0 ppc stable for bug 440872 - - 18 Nov 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for x86, wrt bug #440872 - - 16 Nov 2012; Agostino Sarubbo pixman-0.28.0.ebuild: - Stable for amd64, wrt bug #440872 - -*pixman-0.28.0 (10 Nov 2012) - - 10 Nov 2012; Chí-Thanh Christopher Nguyễn - +pixman-0.28.0.ebuild, -pixman-0.27.2.ebuild, -pixman-0.27.4.ebuild: - Version bump. - -*pixman-0.27.4 (26 Oct 2012) - - 26 Oct 2012; Chí-Thanh Christopher Nguyễn - +pixman-0.27.4.ebuild: - Version bump. - - 26 Aug 2012; Raúl Porcel pixman-0.26.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #419473 - -*pixman-0.27.2 (02 Aug 2012) - - 02 Aug 2012; Matt Turner +pixman-0.27.2.ebuild: - Version bump, bug 429460. - - 12 Jul 2012; Brent Baude pixman-0.26.0.ebuild: - Marking pixman-0.26.0 ppc stable for bug 419473 - - 11 Jul 2012; Brent Baude pixman-0.26.0.ebuild: - Marking pixman-0.26.0 ppc64 stable for bug 419473 - -*pixman-0.26.2 (30 Jun 2012) - - 30 Jun 2012; Matt Turner +pixman-0.26.2.ebuild: - Version bump. - - 29 Jun 2012; Markus Meier pixman-0.26.0.ebuild: - arm stable, bug #419473 - - 28 Jun 2012; Jeroen Roovers pixman-0.26.0.ebuild: - Stable for HPPA (bug #419473). - - 24 Jun 2012; Agostino Sarubbo pixman-0.26.0.ebuild: - Stable for x86, wrt bug #419473 - - 22 Jun 2012; Agostino Sarubbo pixman-0.26.0.ebuild: - Stable for amd64, wrt bug #419473 - -*pixman-0.26.0 (27 May 2012) - - 27 May 2012; Matt Turner +pixman-0.26.0.ebuild, - +files/pixman-0.26.0-add-missing-_mm_empty-calls.patch: - Version bump. - - 26 Apr 2012; Alexis Ballier pixman-0.24.4.ebuild: - keyword ~amd64-fbsd - - 14 Mar 2012; Matt Turner pixman-0.24.4.ebuild: - Drop code to disable sse2 if pixman-0.24.0.ebuild: - Marking pixman-0.24.0 ppc64 stable for bug 394393 - - 25 Feb 2012; Samuli Suominen pixman-0.24.0.ebuild: - Move XORG_EAUTORECONF above inherit line to pick up dependencies wrt #400629 - -*pixman-0.24.4 (24 Feb 2012) - - 24 Feb 2012; Chí-Thanh Christopher Nguyễn - +pixman-0.24.4.ebuild: - Version bump. - - 19 Feb 2012; Raúl Porcel pixman-0.24.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #394393 - - 15 Feb 2012; Brent Baude pixman-0.24.0.ebuild: - Marking pixman-0.24.0 ppc stable for bug 394393 - -*pixman-0.24.2 (31 Jan 2012) - - 31 Jan 2012; Chí-Thanh Christopher Nguyễn - +pixman-0.24.2.ebuild: - Version bump. - - 02 Jan 2012; Samuli Suominen metadata.xml: - USE description for flag "neon" is in use.desc now. - - 27 Dec 2011; Markus Meier pixman-0.24.0.ebuild: - x86 stable, bug #394393 - - 21 Dec 2011; Markus Meier pixman-0.24.0.ebuild: - arm stable, bug #394393 - - 20 Dec 2011; Jeroen Roovers pixman-0.24.0.ebuild: - Stable for HPPA (bug #394393). - - 20 Dec 2011; Agostino Sarubbo pixman-0.24.0.ebuild: - Stable for AMD64, wrt bug #394393 - - 25 Nov 2011; Naohiro Aota pixman-0.24.0.ebuild, - +files/pixman-0.24.0-posix-test.patch: - Add patch to replace non-POSIX test. Bug #387087 - -*pixman-0.24.0 (07 Nov 2011) - - 07 Nov 2011; Chí-Thanh Christopher Nguyễn - -pixman-0.23.8.ebuild, +pixman-0.24.0.ebuild: - Version bump. - -*pixman-0.23.8 (31 Oct 2011) - - 31 Oct 2011; Chí-Thanh Christopher Nguyễn - -pixman-0.23.6.ebuild, +pixman-0.23.8.ebuild: - Bump to latest development release. - -*pixman-0.23.6 (22 Oct 2011) - - 22 Oct 2011; Matt Turner +pixman-0.23.6.ebuild: - Version bump. Add ARM's iwmmxt USE flag. - - 03 Oct 2011; Joseph Jezak pixman-0.22.2.ebuild: - Marked ppc ppc64 stable for bug #380421. - - 02 Oct 2011; Raúl Porcel pixman-0.22.2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #380421 - - 21 Sep 2011; Jeroen Roovers pixman-0.22.2.ebuild: - Stable for HPPA (bug #380421). - - 05 Sep 2011; Markus Meier pixman-0.22.2.ebuild: - arm stable, bug #380421 - - 04 Sep 2011; Markus Meier pixman-0.22.2.ebuild: - x86 stable, bug #380421 - - 30 Aug 2011; Tony Vroon pixman-0.22.2.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug - #380421 filed by Chí-Thanh Christopher Nguyễn. - - 20 Aug 2011; Jeroen Roovers pixman-0.22.0.ebuild: - Stable for HPPA (bug #371857). - - 30 Jul 2011; Raúl Porcel pixman-0.22.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #371857 - - 29 Jul 2011; Kacper Kowalik pixman-0.22.0.ebuild: - ppc64 stable wrt #371857 - - 13 Jul 2011; Markus Meier pixman-0.22.0.ebuild: - x86 stable, bug #371857 - -*pixman-0.22.2 (06 Jul 2011) - - 06 Jul 2011; Chí-Thanh Christopher Nguyễn - +pixman-0.22.2.ebuild: - Version bump. - - 28 Jun 2011; Brent Baude pixman-0.22.0.ebuild: - Marking pixman-0.22.0 ppc stable for bug 371857 - - 26 Jun 2011; Markus Meier pixman-0.22.0.ebuild: - arm stable, bug #371857 - - 23 Jun 2011; Markos Chandras pixman-0.22.0.ebuild: - Stable on amd64 wrt bug #372333 - -*pixman-0.22.0 (02 May 2011) - - 02 May 2011; Tomáš Chvátal -pixman-0.21.8.ebuild, - +pixman-0.22.0.ebuild: - Version bump to latest. - -*pixman-0.21.8 (20 Apr 2011) - - 20 Apr 2011; Chí-Thanh Christopher Nguyễn - +pixman-0.21.8.ebuild: - Bump to release candidate. - - 20 Mar 2011; Diego E. Pettenò pixman-0.20.2.ebuild, - metadata.xml: - Add neon USE flag to enable SIMD optimisations on ARM. - - 07 Mar 2011; Tomáš Chvátal -pixman-0.20.0.ebuild: - old - - 05 Mar 2011; Kacper Kowalik pixman-0.20.2.ebuild: - ppc64 stable wrt #354237 - - 05 Mar 2011; Raúl Porcel pixman-0.20.2.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #354237 - - 23 Feb 2011; Jeroen Roovers pixman-0.20.2.ebuild: - Stable for HPPA (bug #354237). - - 15 Feb 2011; Tomáš Chvátal -pixman-0.18.2.ebuild: - old - - 14 Feb 2011; Kacper Kowalik pixman-0.20.2.ebuild: - ppc stable wrt #344827, #354237 - - 12 Feb 2011; Raúl Porcel pixman-0.20.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #344827 - - 12 Feb 2011; Christian Faulhammer pixman-0.20.2.ebuild: - stable x86, bug 354237 - - 12 Feb 2011; Markos Chandras pixman-0.20.2.ebuild: - Stable on amd64 wrt bug #354237 - - 27 Jan 2011; Jeremy Olexa pixman-0.20.2.ebuild: - Push Gentoo Prefix changes from x11 overlay, as approved - -*pixman-0.20.2 (19 Jan 2011) - - 19 Jan 2011; Tomáš Chvátal +pixman-0.20.2.ebuild: - Version bump to latest. - - 31 Dec 2010; Jeroen Roovers pixman-0.20.0.ebuild: - Stable for HPPA (bug #344827). - - 29 Dec 2010; Markus Meier pixman-0.20.0.ebuild: - arm stable, bug #344827 - - 25 Dec 2010; Christian Faulhammer pixman-0.20.0.ebuild: - x86 stable, bug 344827 - - 23 Dec 2010; Samuli Suominen pixman-0.20.0.ebuild: - amd64 stable wrt #344827 - - 19 Dec 2010; Samuli Suominen pixman-0.20.0.ebuild: - ppc64 stable wrt #344827 - - 20 Nov 2010; Tomáš Chvátal -pixman-0.18.4.ebuild: - old - -*pixman-0.20.0 (28 Oct 2010) - - 28 Oct 2010; Tomáš Chvátal - +pixman-0.20.0.ebuild: - Version bump. - - 21 Oct 2010; Tomáš Chvátal - -pixman-0.17.2.ebuild, -files/pixman-0.17.2-armv7.patch: - old - - 21 Oct 2010; Brent Baude pixman-0.18.2.ebuild: - Marking pixman-0.18.2 ppc stable for bug 239063 - - 28 Sep 2010; Samuli Suominen pixman-0.18.2.ebuild: - ppc64 stable wrt #327777 - - 19 Sep 2010; Raúl Porcel pixman-0.18.2.ebuild: - ia64/s390/sh/sparc stable wrt #327777 - - 12 Sep 2010; Tobias Klausmann pixman-0.18.2.ebuild: - Stable on alpha, bug #327777 - -*pixman-0.18.4 (17 Aug 2010) - - 17 Aug 2010; Tomáš Chvátal - +pixman-0.18.4.ebuild: - Version bump. - - 22 Jul 2010; Markus Meier pixman-0.18.2.ebuild: - arm stable, bug #327777 - - 14 Jul 2010; Jeroen Roovers pixman-0.18.2.ebuild: - Stable for HPPA (bug #327777). - - 13 Jul 2010; Christian Faulhammer pixman-0.18.2.ebuild: - x86 stable, bug 327777 - - 12 Jul 2010; Markos Chandras pixman-0.18.2.ebuild: - Stable on amd64 wrt bug #327777 - -*pixman-0.18.2 (12 May 2010) - - 12 May 2010; Chí-Thanh Christopher Nguyễn - -pixman-0.18.0.ebuild, +pixman-0.18.2.ebuild: - Version bump. - - 08 Apr 2010; Tomáš Chvátal - -pixman-0.16.0.ebuild, -pixman-0.16.4.ebuild: - Drop old - -*pixman-0.18.0 (02 Apr 2010) - - 02 Apr 2010; Tomáš Chvátal - -pixman-0.17.4.ebuild, -pixman-0.17.14.ebuild, +pixman-0.18.0.ebuild: - Version bump. Drop dev. releases. - -*pixman-0.17.14 (31 Mar 2010) - - 31 Mar 2010; Chí-Thanh Christopher Nguyễn - +pixman-0.17.14.ebuild: - Version bump. - -*pixman-0.17.4 (22 Jan 2010) -*pixman-0.16.4 (22 Jan 2010) - - 22 Jan 2010; Tomáš Chvátal - -pixman-0.10.0.ebuild, -pixman-0.12.0.ebuild, - -files/pixman-0.12.0-sse.patch, -pixman-0.14.0-r1.ebuild, - -pixman-0.16.2.ebuild, +pixman-0.16.4.ebuild, +pixman-0.17.4.ebuild: - Version bumps. Drop old. - - 19 Jan 2010; Raúl Porcel pixman-0.17.2.ebuild: - s390 stable wrt #294958 - - 18 Jan 2010; Raúl Porcel pixman-0.17.2.ebuild: - alpha/ia64/sh/sparc stable wrt #294958 - - 16 Jan 2010; Raúl Porcel pixman-0.17.2.ebuild: - arm stable - - 14 Jan 2010; Jeroen Roovers pixman-0.17.2.ebuild: - Stable for HPPA (bug #294958). - - 12 Jan 2010; Raúl Porcel pixman-0.16.2.ebuild, - pixman-0.17.2.ebuild, +files/pixman-0.17.2-armv7.patch: - Add patch to fix build failure on armv4 and mark 0.16.2 stable on arm - - 27 Dec 2009; Joseph Jezak pixman-0.17.2.ebuild: - Marked ppc stable for bug #294958. - - 15 Dec 2009; Brent Baude pixman-0.17.2.ebuild: - Marking pixman-0.17.2 ppc64 stable for bug 294958 - - 15 Dec 2009; Raúl Porcel pixman-0.16.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #282290 - - 10 Dec 2009; Christian Faulhammer pixman-0.17.2.ebuild: - x86 stable, bug 294958 - - 10 Dec 2009; Samuli Suominen pixman-0.17.2.ebuild: - amd64 stable wrt #294958 - -*pixman-0.17.2 (21 Nov 2009) - - 21 Nov 2009; Tomáš Chvátal - +pixman-0.17.2.ebuild: - Version bump. - - 26 Oct 2009; Jeroen Roovers pixman-0.16.0.ebuild: - Stable for HPPA (bug #282290). - - 11 Oct 2009; nixnut pixman-0.16.0.ebuild: - ppc stable #282290 - - 09 Oct 2009; Markus Meier pixman-0.16.0.ebuild: - arm stable, bug #282290 - - 05 Oct 2009; Christian Faulhammer pixman-0.16.0.ebuild: - x86 stable, bug 282290 - - 30 Sep 2009; Samuli Suominen pixman-0.16.0.ebuild: - amd64 stable wrt #282290 - -*pixman-0.16.2 (29 Sep 2009) - - 29 Sep 2009; Rémi Cardona +pixman-0.16.2.ebuild: - bump to 0.16.2, sync with x11 overlay - - 01 Sep 2009; Jeroen Roovers pixman-0.12.0.ebuild: - Stable for HPPA (scarabeus). - -*pixman-0.16.0 (01 Sep 2009) - - 01 Sep 2009; Tomáš Chvátal -pixman-0.9.6.ebuild, - -files/pixman-0.11.4-memleak.patch, -pixman-0.11.6.ebuild, - -pixman-0.11.8.ebuild, -files/pixman-0.11.8-sse.patch, - -files/pixman-0.11.8-sse2-intrinsics-check.patch, -pixman-0.14.0.ebuild, - -pixman-0.15.20.ebuild, +pixman-0.16.0.ebuild: - Version bump, remove old unstable. Keep 3 stable version branches .10 .12 - and .14. - 0.16 is new stable branch. Has few fixes over 0.15.20. Moreover it has - some performance gains and losses in comparsion to 0.14. - -*pixman-0.15.20 (12 Aug 2009) - - 12 Aug 2009; Arfrever Frehtes Taifersar Arahesis - +pixman-0.15.20.ebuild: - Version bump (bug #267437). - - 15 May 2009; Raúl Porcel pixman-0.14.0-r1.ebuild: - arm/s390 stable - - 04 May 2009; Samuli Suominen pixman-0.11.6.ebuild, - pixman-0.11.8.ebuild, pixman-0.12.0.ebuild, pixman-0.14.0.ebuild: - Move use_ functions out of global scope. - - 16 Apr 2009; Jeroen Roovers pixman-0.14.0-r1.ebuild: - Stable for HPPA (bug #251832). - - 15 Apr 2009; Raúl Porcel pixman-0.14.0-r1.ebuild: - ia64/sh stable wrt #251832 - - 06 Apr 2009; Friedrich Oslage - pixman-0.14.0-r1.ebuild: - Stable on sparc, bug #251832 - - 05 Apr 2009; Markus Meier pixman-0.14.0-r1.ebuild: - x86 stable, bug #251832 - - 05 Apr 2009; Olivier Crête pixman-0.14.0-r1.ebuild: - Stable on amd64, bug #251832 - - 03 Apr 2009; Brent Baude pixman-0.14.0-r1.ebuild: - Marking pixman-0.14.0-r1 ppc64 stable for bug 251832 - - 03 Apr 2009; Brent Baude pixman-0.14.0-r1.ebuild: - Marking pixman-0.14.0-r1 ppc stable for bug 251832 - - 27 Mar 2009; Raúl Porcel pixman-0.12.0.ebuild: - arm/s390/sh/sparc stable - -*pixman-0.14.0-r1 (24 Mar 2009) - - 24 Mar 2009; Rémi Cardona +pixman-0.14.0-r1.ebuild: - drop the useless sse USE flag, disable mmx/sse2 instead of dying (fixes - bugs #236558 and #260287 among others) - - 18 Mar 2009; Raúl Porcel pixman-0.12.0.ebuild: - alpha/ia64 stable wrt #260063 - - 15 Mar 2009; Markus Meier pixman-0.12.0.ebuild: - x86 stable, bug #260063 - - 11 Mar 2009; Daniel Gryniewicz pixman-0.12.0.ebuild: - Marked stable on amd64 - - 06 Mar 2009; Brent Baude pixman-0.12.0.ebuild: - Marking pixman-0.12.0 ppc stable for bug 260063 - - 05 Mar 2009; Brent Baude pixman-0.12.0.ebuild: - Marking pixman-0.12.0 ppc64 stable for bug 260063 - - 03 Mar 2009; Raúl Porcel pixman-0.14.0.ebuild: - Re-add ~s390 keyword - -*pixman-0.14.0 (26 Feb 2009) - - 26 Feb 2009; Donnie Berkholz ; - +pixman-0.14.0.ebuild: - Version bump. - - 24 Feb 2009; Raúl Porcel pixman-0.10.0.ebuild, - pixman-0.11.6.ebuild, pixman-0.11.8.ebuild: - Fix some s390 keywording - - 07 Dec 2008; Mike Frysinger pixman-0.12.0.ebuild: - Add s390 love #202529. - - 29 Sep 2008; Donnie Berkholz ; pixman-0.12.0.ebuild: - (#238716) sse2 + gcc 4.2 check is only required for x86. - -*pixman-0.12.0 (26 Sep 2008) - - 26 Sep 2008; Saleem Abdulrasool - +files/pixman-0.12.0-sse.patch, +pixman-0.12.0.ebuild: - Version bump from upstream - - 26 Jul 2008; Jeroen Roovers pixman-0.10.0.ebuild: - Stable for HPPA (bug #224929). - - 21 Jul 2008; Doug Goldstein pixman-0.11.8.ebuild: - Add pkg_setup() checks for SSE & SSE2 use flags as well as SSE2 and GCC - 4.2 - - 20 Jul 2008; Ben de Groot - +files/pixman-0.11.8-sse.patch, pixman-0.11.8.ebuild: - Fixing libtool problems as reported in bug #232301 and adding sse useflag - and patch from bug #232126. - - 19 Jul 2008; Doug Goldstein - +files/pixman-0.11.8-sse2-intrinsics-check.patch, -pixman-0.11.4.ebuild, - -pixman-0.11.4-r1.ebuild, pixman-0.11.8.ebuild: - fix bug #232126. Patch from Søren Sandmann to fix - SSE2 check - -*pixman-0.11.8 (17 Jul 2008) - - 17 Jul 2008; Doug Goldstein +pixman-0.11.8.ebuild: - version bump. should fix SSE2 issues people were having - - 02 Jul 2008; Doug Goldstein pixman-0.11.6.ebuild: - add altivec, mmx and sse2 USE flags. disable gtk always for tests since - GTK won't be installed when you install pixman - -*pixman-0.11.6 (30 Jun 2008) - - 30 Jun 2008; Doug Goldstein +pixman-0.11.6.ebuild: - bump to new pixman release - -*pixman-0.11.4-r1 (12 Jun 2008) - - 12 Jun 2008; Doug Goldstein - +files/pixman-0.11.4-memleak.patch, +pixman-0.11.4-r1.ebuild: - fix #225907. Patch by Maximilian Grothusmann fixing - the memory leak - -*pixman-0.11.4 (10 Jun 2008) - - 10 Jun 2008; Donnie Berkholz ; - -pixman-0.11.2.ebuild, +pixman-0.11.4.ebuild: - Bump to fix some compilation issues with the last one. - -*pixman-0.11.2 (09 Jun 2008) - - 09 Jun 2008; Donnie Berkholz ; - +pixman-0.11.2.ebuild: - Bump. Notable new features: many compositing operations in SSE2 & VMX - (AltiVec), opacity-based optimization for operators, and 32-bit regions. - - 07 Jun 2008; Kenneth Prugh pixman-0.10.0.ebuild: - amd64 stable, bug #224929 - - 07 Jun 2008; nixnut pixman-0.10.0.ebuild: - Stable on ppc wrt bug 224929 - - 05 Jun 2008; Raúl Porcel pixman-0.10.0.ebuild: - alpha/ia64/sparc/x86 stable wrt #224929 - - 04 Jun 2008; Markus Rothe pixman-0.10.0.ebuild: - Stable on ppc64; bug #224929 - -*pixman-0.10.0 (02 Apr 2008) - - 02 Apr 2008; Donnie Berkholz ; - +pixman-0.10.0.ebuild: - Bump. Lots of bugfixes and optimizations. - - 31 Jan 2008; Donnie Berkholz ; - -files/0.9.5-pixman-compose-fix.patch, -pixman-0.9.5.ebuild, - -pixman-0.9.5-r1.ebuild: - Clean up. - -*pixman-0.9.6 (07 Nov 2007) - - 07 Nov 2007; Donnie Berkholz ; +pixman-0.9.6.ebuild: - Bump. Incorporates a slightly different amd64 fix. - -*pixman-0.9.5-r1 (14 Oct 2007) - - 14 Oct 2007; Donnie Berkholz ; - +files/0.9.5-pixman-compose-fix.patch, +pixman-0.9.5-r1.ebuild: - (#12398, fd.o #12398) Add an amd64 crasher fix. - -*pixman-0.9.5 (08 Sep 2007) - - 08 Sep 2007; Donnie Berkholz ; +metadata.xml, - +pixman-0.9.5.ebuild: - Add a low-level pixel manipulation routine library used by Xorg and cairo. - Since the code basically originated in xorg-server, I'm retaining the - keywords. diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest index 8c6e0c7738..e31b21c01b 100644 --- a/x11-libs/pixman/Manifest +++ b/x11-libs/pixman/Manifest @@ -1,11 +1 @@ -DIST pixman-0.32.6.tar.bz2 672201 SHA256 201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4 SHA512 162e34a3ac728b348b8cd429172fa9f6ba1fc8d94716368c84a8081c42c4e2639ec7624e5528d9059695736be785ee210835c7d832b4a07a2175aec349ddffe9 WHIRLPOOL f12567cf1feb7a82956f7b2edd1db29e439933e437a9419bf505eb1ce61ce8ac9ab1fe678f0e91064ef4a776b47892930940a10c9051da165155304f3757cd92 -DIST pixman-0.32.8.tar.bz2 696038 SHA256 5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1 SHA512 43924a92f0d3e03359bd74701cc2a27c000b24fc513e0f760389da7e6ee1acec666a734003ef193d45251cc9645c07caf91142c3ff9134b1429a38a9167332a2 WHIRLPOOL 0035c6e5713a79caeeb88e865204d708f9dc2fdc8881cc4468d64f1d31243b7399f1404d76c33f43b3c17daf46f7c5e33659a961f0847993cfd3d09015fa26eb -DIST pixman-0.33.2.tar.bz2 725382 SHA256 0d12c669d69024c055ec9f877ecd6beb253796444ea3de14f8f197d438fb93fd SHA512 d74303840122160888c3983d1cb160ce29ecfbd8266f154fde69a489c7abe2c5d09c15c2414199c6e9f5458fe5dfcc166b02c7721489b493d9c5ee81bdc12b00 WHIRLPOOL 9e983b52ff26a586bec3afabf23553b7de773f3fe232ee19a217225fcc106bca93b437b7468b364a6e0cb63576a5f82a38a570b84b25feb6f490d26f6aec359d -DIST pixman-0.33.4.tar.bz2 722970 SHA256 f3fc9a2aadf40196af1c3a8ee5a94f18e4fcbaa5741e23fbf0351772b9c92e09 SHA512 db7d1bea08e61e6f70091ed484c963ca00bf4746f5b09a2e58fe60dd1b85045c0aaa69e831bd77c60e81af8e0c29518c4bdad7f13c6a57e59d246e7908aeed82 WHIRLPOOL d073dfe87dc8871470a0148d341f47b5b943621fdb63beb94456a24a9b15af7ffa78f15e0a86cb07a0b042161757cf1c724d5ac27a059376075b80ad6b4c5362 -EBUILD pixman-0.32.6.ebuild 1140 SHA256 824abb3530f85e881e595198c17562cec020e95b128c93466ea39e383530d856 SHA512 927478b741fc1ef4e9aeffae02c0c8a045efcdfa55e0a1a5b58037b97ba784031fcd032916b54669f5a954dd9c90df8b724f1eb0f3bd342446d862131459f2ec WHIRLPOOL fd61d2e6347d676f16544797fd576f166aef902b184d9f4a32d7dccdc108205faab283ea1df14d9d923b901fbc9dcaec842c1e514c6662316aa82abe894c3d2f -EBUILD pixman-0.32.8.ebuild 1143 SHA256 21c56712cadd6a0a0240e085726d41f730becc9433529a6c6577fe91b4870a57 SHA512 9dfc7b0465b38e3f6ee65e567b41e9453e599116c30d9d8931f72ee1d975e05ddf37c19fd0b36ad78f77e8471a86029933ce3b3e490c7a479cb1728b5b2f9766 WHIRLPOOL 3ddd62fe766230308aab69d1205e268d8fe8ce2ed4c54afb463ed5a2b2f2233bd210564b83a0f9ce9c2baca3208f86492e4908c99cd47c4a5b3cfd8a2babcbfc -EBUILD pixman-0.33.2.ebuild 1171 SHA256 e844c2bc547ec72afc35f27dafd652197245b9b5bad616ec310c779a4e0c54e2 SHA512 937bc9cfeee3e99f939bcf929fc6c8af74944b23187a5b57c9a5db4447cffb76e360e1f5703b38bbef27150ee5f3fe2c4ac0ac654ca1e3efc7b3d9c69129ed13 WHIRLPOOL be19e08d19370093e1d7cd421f6bb78abe649c64baa03c406719f057eeeb92a4dca6c85b94887cb2056ef7d00540597426e28fb108cd9bef363e66f1df00d521 -EBUILD pixman-0.33.4.ebuild 1171 SHA256 e844c2bc547ec72afc35f27dafd652197245b9b5bad616ec310c779a4e0c54e2 SHA512 937bc9cfeee3e99f939bcf929fc6c8af74944b23187a5b57c9a5db4447cffb76e360e1f5703b38bbef27150ee5f3fe2c4ac0ac654ca1e3efc7b3d9c69129ed13 WHIRLPOOL be19e08d19370093e1d7cd421f6bb78abe649c64baa03c406719f057eeeb92a4dca6c85b94887cb2056ef7d00540597426e28fb108cd9bef363e66f1df00d521 -EBUILD pixman-9999.ebuild 1039 SHA256 886321ddf01df40f0bb7985994285d1b7518311f7360f8ca159721d5ee7b2093 SHA512 9e40585551fc67380a78d6d391df76a0517887187cfb8ca1bc66323fb4401cffbe8e1d94a14a655f93d26f2c7014c849730a1716830cab0ef12d0788558bae74 WHIRLPOOL c9ece0ae13aec8d48891a0166e6a9e7c31811d6959d27db11eea9f5f1f6c549103c7bb0586d6e98ce8a85ac0822026142b5602f91810920a4dabc5e6c5e5022d -MISC ChangeLog 26398 SHA256 772224cd0014b0910681481a47bca076bd98e9b36800e1f1b7610816b011dbd9 SHA512 c1efebc2d499f6d8c0e26bd90380a90fa7907f12a5a4e7434386eae5d8d82b2753be5c9b8704f8d3e2fdcffe391f585100cc6fcca954e71de93085eefe4605ef WHIRLPOOL 755dbf3bc80d70d3d457991eedb8531531f21f8649160c2e852366847cfe2954e1c006c2f1072b5940a99ec46b51d60b72ae7f4093b20ce41b91e23dbbd9f285 -MISC metadata.xml 317 SHA256 ceb9d4b118a9bd98b35133f87226f05488407f665541ccec0bc3b31ec5c3ccd5 SHA512 b311eca7ce00c4495b82f9bd69feed07ac311fc1023b6a9cfdd058549fcd24aa23e930fe89b6ec764852b408b504fed6a82ead81317c394eaa0b6c3251832bbd WHIRLPOOL 7a7dd2afdcee2f2a617ed1176b6a96df7050cfb865f645c393b97ebcd355af08b828825333441a9ec29722162b4708afd6025ba88ad1a951faf06d8aef8064a0 +DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml index ab31961e33..b6b501a3b8 100644 --- a/x11-libs/pixman/metadata.xml +++ b/x11-libs/pixman/metadata.xml @@ -1,7 +1,10 @@ - + -x11 + + x11@gentoo.org + X11 + Enable Loongson2f MMI optimizations. diff --git a/x11-libs/pixman/pixman-0.32.6.ebuild b/x11-libs/pixman/pixman-0.32.6.ebuild deleted file mode 100644 index cefd42305d..0000000000 --- a/x11-libs/pixman/pixman-0.32.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 toolchain-funcs versionator - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" -DESCRIPTION="Low-level pixel manipulation routines" - -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable iwmmxt arm-iwmmxt) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng - ) - xorg-2_src_configure -} diff --git a/x11-libs/pixman/pixman-0.32.8.ebuild b/x11-libs/pixman/pixman-0.32.8.ebuild deleted file mode 100644 index 79cfba33c1..0000000000 --- a/x11-libs/pixman/pixman-0.32.8.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 toolchain-funcs versionator - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" -DESCRIPTION="Low-level pixel manipulation routines" - -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable iwmmxt arm-iwmmxt) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng - ) - xorg-2_src_configure -} diff --git a/x11-libs/pixman/pixman-0.33.2.ebuild b/x11-libs/pixman/pixman-0.33.2.ebuild deleted file mode 100644 index dc3517f48d..0000000000 --- a/x11-libs/pixman/pixman-0.33.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" -DESCRIPTION="Low-level pixel manipulation routines" - -if [[ $PV = 9999* ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -fi - -IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable iwmmxt arm-iwmmxt) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng - ) - xorg-2_src_configure -} diff --git a/x11-libs/pixman/pixman-0.33.4.ebuild b/x11-libs/pixman/pixman-0.33.4.ebuild deleted file mode 100644 index dc3517f48d..0000000000 --- a/x11-libs/pixman/pixman-0.33.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" -DESCRIPTION="Low-level pixel manipulation routines" - -if [[ $PV = 9999* ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -fi - -IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable iwmmxt arm-iwmmxt) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng - ) - xorg-2_src_configure -} diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild new file mode 100644 index 0000000000..a269bcee70 --- /dev/null +++ b/x11-libs/pixman/pixman-0.40.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs + +DESCRIPTION="Low-level pixel manipulation routines" +HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs" + +multilib_src_configure() { + local openmp=disabled + tc-has-openmp && openmp=enabled + + if use arm && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi + + local emesonargs=( + $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) + $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) + $(meson_feature cpu_flags_x86_mmxext mmx) + $(meson_feature cpu_flags_x86_sse2 sse2) + $(meson_feature cpu_flags_x86_ssse3 ssse3) + $(meson_feature cpu_flags_ppc_altivec vmx) + $(meson_feature cpu_flags_arm_neon neon) + $(meson_feature loongson2f loongson-mmi) + -Ddefault_library=$(usex static-libs both shared) + -Dgtk=disabled + -Dlibpng=disabled + -Dopenmp=$openmp # only used in unit tests + ) + meson_src_configure +} + +multilib_src_test() { + export OMP_NUM_THREADS=$(makeopts_jobs) + meson_src_test -t 100 +} diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 525e9db88c..e6332d5386 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -1,33 +1,56 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 +EAPI=7 -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" -DESCRIPTION="Low-level pixel manipulation routines" +EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi -if [[ $PV = 9999* ]]; then - KEYWORDS="" +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs + +DESCRIPTION="Low-level pixel manipulation routines" +HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi -IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable iwmmxt arm-iwmmxt) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng +LICENSE="MIT" +SLOT="0" +IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs" + +multilib_src_configure() { + local openmp=disabled + tc-has-openmp && openmp=enabled + + if use arm && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi + + local emesonargs=( + $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) + $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) + $(meson_feature cpu_flags_x86_mmxext mmx) + $(meson_feature cpu_flags_x86_sse2 sse2) + $(meson_feature cpu_flags_x86_ssse3 ssse3) + $(meson_feature cpu_flags_ppc_altivec vmx) + $(meson_feature cpu_flags_arm_neon neon) + $(meson_feature loongson2f loongson-mmi) + -Ddefault_library=$(usex static-libs both shared) + -Dgtk=disabled + -Dlibpng=disabled + -Dopenmp=$openmp # only used in unit tests ) - xorg-2_src_configure + meson_src_configure +} + +multilib_src_test() { + export OMP_NUM_THREADS=$(makeopts_jobs) + meson_src_test -t 100 } From 282da2b45400168a3e8cc4fd0fa0ce7ee7d79ec3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:55:18 +0100 Subject: [PATCH 07/18] app-misc/c_rehash: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- app-misc/c_rehash/ChangeLog | 74 ------------------------ app-misc/c_rehash/Manifest | 5 +- app-misc/c_rehash/c_rehash-1.7-r1.ebuild | 22 +++---- app-misc/c_rehash/metadata.xml | 11 ++-- 4 files changed, 15 insertions(+), 97 deletions(-) delete mode 100644 app-misc/c_rehash/ChangeLog diff --git a/app-misc/c_rehash/ChangeLog b/app-misc/c_rehash/ChangeLog deleted file mode 100644 index 432d3f7a8e..0000000000 --- a/app-misc/c_rehash/ChangeLog +++ /dev/null @@ -1,74 +0,0 @@ -# ChangeLog for app-misc/c_rehash -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*c_rehash-1.7 (20 Sep 2015) - - 20 Sep 2015; Julian Ospald +c_rehash-1.7.ebuild, - +metadata.xml: - initial import of version 1.7 for libressl compat - -*c_rehash-1.7-r1 (01 Oct 2015) - - 01 Oct 2015; Julian Ospald +c_rehash-1.7-r1.ebuild: - update openssl blocker - - Gentoo-Bug: 561852 - - 01 Oct 2015; Julian Ospald metadata.xml: - add base-system to maintainers - - 01 Oct 2015; Julian Ospald -c_rehash-1.7.ebuild: - drop old - - 05 Dec 2015; Jeroen Roovers c_rehash-1.7-r1.ebuild: - Stable for HPPA PPC64 (bug #567476). - - Package-Manager: portage-2.2.26 - RepoMan-Options: --ignore-arches - - 06 Dec 2015; Matt Turner c_rehash-1.7-r1.ebuild: - alpha stable, bug 567476. - - 07 Dec 2015; Agostino Sarubbo c_rehash-1.7-r1.ebuild: - amd64 stable wrt bug #567476 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 09 Dec 2015; Markus Meier c_rehash-1.7-r1.ebuild: - arm stable, bug #567476 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="arm" - - 11 Dec 2015; Mikle Kolyada c_rehash-1.7-r1.ebuild: - ia64 stable wrt bug #567476 - - Package-Manager: portage-2.2.20.1 - - 13 Dec 2015; Mike Frysinger c_rehash-1.7-r1.ebuild: - mark 1.7-r1 arm64/m68k/s390/sh/sparc/x86 stable #567476 - - 26 Dec 2015; Agostino Sarubbo c_rehash-1.7-r1.ebuild: - ppc stable wrt bug #567476 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 05 Jan 2016; Fabian Groffen c_rehash-1.7-r1.ebuild: - add Prefix keywords - - Package-Manager: portage-2.2.20-prefix - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest index 2c38848dd4..8767c622c3 100644 --- a/app-misc/c_rehash/Manifest +++ b/app-misc/c_rehash/Manifest @@ -1,4 +1 @@ -DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 -EBUILD c_rehash-1.7-r1.ebuild 1068 SHA256 dde1e96500684608791224bdbb0d70dfff565a371250f7e5893e3ea1db9a7e95 SHA512 75c085d0351c393b4e694cb57865b5e3185d4716ff315f9fde15e21365a863fb924d1917c3501a9da73d972b5090a45ff040530214f96461d9654720a335fd55 WHIRLPOOL 86e7c8719e2fc82c668c003d42316558a2c3f0248bc61e2eca9bef70e2437e537bb3b14357d2ffa76a8187c9d9fe8e76b9dbbadfbf1747725dec6f4fa2cdbc2f -MISC ChangeLog 2368 SHA256 7b9d529dc1148212fb36a4444f18aaf0ab14fb42f836d0be0a872278893ef2b6 SHA512 26f912eda284e5568c9e4eb7614dab94df804adc1df0105897cd406e8e4dae480966944d5f38cbc1e6ab1eadd4691d0c226492cbb1d84525b5690356802412e6 WHIRLPOOL 66a5265457d0f39c2c39cc6f7cb7868ae9aacae6803f163690680f579aee2646a45a8fe9c1b67237fd8eeed3183ca75b9058b1bc2705924de0f6791a168fdd19 -MISC metadata.xml 365 SHA256 e9566ee099aed7cde218942171f32b8d0df0af6ac186be9f3e13a30f5a2022da SHA512 ab8fb7f042519cbac402c27d2a2f1b57d05fff5021b517777e8d48ec37b922148b26620e517715ad9024e085c60187352618ab6cc91f31ffcc57b995e2e74c6d WHIRLPOOL ef630f317096917132a99ce4f58fb15c3a16f414693fb35adbd12bfb5343dfeb0959d39904acb42e2ff75a39c9d140c6afd8e357def7677ddd4e93265621044d +DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild index 5b6eb29810..1aecc57e19 100644 --- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild +++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild @@ -1,32 +1,28 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=7 DESCRIPTION="c_rehash script from OpenSSL" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}" +HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/" +SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}" +S="${WORKDIR}" LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="! "${WORKDIR}"/c_rehash || die #416717 } src_install() { - dobin "${WORKDIR}"/c_rehash + dobin c_rehash } diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml index 34f212d18c..c475d14b20 100644 --- a/app-misc/c_rehash/metadata.xml +++ b/app-misc/c_rehash/metadata.xml @@ -1,12 +1,11 @@ - + - - hasufell@gentoo.org - Julian Ospald - - + base-system@gentoo.org Gentoo Base System + + pld-linux/openssl + From 6c9d55198a49088cce8f2dd4a0539907076aeffc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:56:29 +0100 Subject: [PATCH 08/18] dev-libs/libyaml: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- dev-libs/libyaml/ChangeLog | 191 -------------------------- dev-libs/libyaml/Manifest | 6 +- dev-libs/libyaml/libyaml-0.1.6.ebuild | 40 ------ dev-libs/libyaml/libyaml-0.2.2.ebuild | 45 ++++++ dev-libs/libyaml/libyaml-0.2.5.ebuild | 45 ++++++ dev-libs/libyaml/metadata.xml | 12 +- 6 files changed, 96 insertions(+), 243 deletions(-) delete mode 100644 dev-libs/libyaml/ChangeLog delete mode 100644 dev-libs/libyaml/libyaml-0.1.6.ebuild create mode 100644 dev-libs/libyaml/libyaml-0.2.2.ebuild create mode 100644 dev-libs/libyaml/libyaml-0.2.5.ebuild diff --git a/dev-libs/libyaml/ChangeLog b/dev-libs/libyaml/ChangeLog deleted file mode 100644 index 0706db5779..0000000000 --- a/dev-libs/libyaml/ChangeLog +++ /dev/null @@ -1,191 +0,0 @@ -# ChangeLog for dev-libs/libyaml -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/ChangeLog,v 1.58 2015/03/12 06:09:00 vapier Exp $ - - 12 Mar 2015; Mike Frysinger libyaml-0.1.6.ebuild: - Mark arm64/m68k/s390/sh stable. - - 14 May 2014; Tim Harder -libyaml-0.1.5.ebuild: - Remove old. - - 14 May 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for sparc, wrt bug #505948 - - 13 May 2014; Akinori Hattori libyaml-0.1.6.ebuild: - ia64 stable wrt bug #505948 - - 11 May 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for ppc64, wrt bug #505948 - - 21 Apr 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for alpha, wrt bug #505948 - - 13 Apr 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for ppc, wrt bug #505948 - - 01 Apr 2014; Markus Meier libyaml-0.1.6.ebuild: - arm stable, bug #505948 - - 28 Mar 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for x86, wrt bug #505948 - - 28 Mar 2014; Agostino Sarubbo libyaml-0.1.6.ebuild: - Stable for amd64, wrt bug #505948 - - 28 Mar 2014; Jeroen Roovers libyaml-0.1.6.ebuild: - Stable for HPPA (bug #505948). - -*libyaml-0.1.6 (27 Mar 2014) - - 27 Mar 2014; Tim Harder +libyaml-0.1.6.ebuild: - Security bump (bug #505948). - - 27 Feb 2014; Sergey Popov -libyaml-0.1.4.ebuild: - Security cleanup, wrt bug #499920 - - 17 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for arm, wrt bug #499920 - - 16 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for alpha, wrt bug #499920 - - 09 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for sparc, wrt bug #499920 - - 09 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for ppc64, wrt bug #499920 - - 09 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for ppc, wrt bug #499920 - - 09 Feb 2014; Pawel Hajdan jr libyaml-0.1.5.ebuild: - x86 stable wrt security bug #499920 - - 08 Feb 2014; Agostino Sarubbo libyaml-0.1.5.ebuild: - Stable for amd64, wrt bug #499920 - - 08 Feb 2014; Akinori Hattori libyaml-0.1.5.ebuild: - ia64 stable wrt bug #499920 - - 07 Feb 2014; Jeroen Roovers libyaml-0.1.5.ebuild: - Stable for HPPA (bug #499920). - -*libyaml-0.1.5 (07 Feb 2014) - - 07 Feb 2014; Tim Harder +libyaml-0.1.5.ebuild: - Version bump. - - 08 Aug 2013; Tim Harder metadata.xml: - Add myself as maintainer. - - 21 Jul 2013; Pacho Ramos -libyaml-0.0.1.ebuild, - -libyaml-0.1.2.ebuild, -libyaml-0.1.3.ebuild, metadata.xml: - Cleanup due #92799 - - 28 Jan 2013; Alexis Ballier libyaml-0.1.4.ebuild: - keyword ~amd64-fbsd - - 26 Jan 2013; Fabian Groffen libyaml-0.1.4.ebuild: - Run elibtoolize for FreeMiNT, keyworded, bug #446970 - - 06 Nov 2012; Jeroen Roovers libyaml-0.1.4.ebuild: - Stable for HPPA (bug #411507). - - 10 Oct 2012; Jeroen Roovers libyaml-0.1.4.ebuild: - Invert USE=test logic. Sed must die() (bug #421611). - - 30 Sep 2012; Raúl Porcel libyaml-0.1.4.ebuild: - alpha/s390/sh/sparc stable wrt #421611 - - 27 Jul 2012; Fabian Groffen libyaml-0.1.4.ebuild: - Marked ~{sparc,sparc64,x64}-solaris - - 10 Jul 2012; Brent Baude libyaml-0.1.4.ebuild: - Marking libyaml-0.1.4 ppc64 for bug 421611 - - 10 Jul 2012; Brent Baude libyaml-0.1.4.ebuild: - Marking libyaml-0.1.4 ppc for bug 421611 - - 01 Jul 2012; Akinori Hattori libyaml-0.1.4.ebuild: - ia64 stable wrt bug #421611. - - 28 Jun 2012; Stefan Briesenick libyaml-0.1.4.ebuild: - fixed static-libs support - - 26 Jun 2012; Agostino Sarubbo libyaml-0.1.4.ebuild: - Stable for amd64, wrt bug #421611 - - 25 Jun 2012; Jeff Horelick libyaml-0.1.4.ebuild: - marked x86 per bug 421611 - - 27 May 2012; Markus Meier libyaml-0.1.4.ebuild: - arm stable, bug #411507 - - 29 Dec 2011; Jeroen Roovers libyaml-0.1.3.ebuild, - libyaml-0.1.4.ebuild: - Marked ~hppa (bug #332593). - -*libyaml-0.1.4 (27 Dec 2011) - - 27 Dec 2011; Stefan Briesenick +libyaml-0.1.4.ebuild: - version bump. switching to EAPI=4, adding USE=static-libs. - - 18 Nov 2011; Naohiro Aota libyaml-0.1.3.ebuild: - Add ~x86-fbsd - - 15 Jul 2011; Matt Turner libyaml-0.1.3.ebuild: - Added ~mips, bug 332593 - - 07 Mar 2011; Raúl Porcel libyaml-0.1.3.ebuild: - Add ~alpha/~arm/~ia64/~s390/~sh/~sparc - - 30 Sep 2010; Fabian Groffen libyaml-0.1.3.ebuild: - Marked ~ppc-macos, ~x86-solaris - - 14 Sep 2010; Jonathan Callen libyaml-0.1.3.ebuild: - Add ~amd64-linux ~x64-macos for bug 337200 - -*libyaml-0.1.3 (07 May 2010) - - 07 May 2010; Stefan Briesenick - +libyaml-0.1.3.ebuild: - version bump, solving bug #308247. - - 14 Jan 2010; Christian Faulhammer libyaml-0.1.2.ebuild: - Transfer Prefix keywords - - 05 Sep 2009; Brent Baude libyaml-0.1.2.ebuild: - Marking libyaml-0.1.2 ppc64 for bug 277974 - - 09 Aug 2009; nixnut libyaml-0.1.2.ebuild: - ppc stable #277974 - - 16 Jul 2009; Thomas Anderson - libyaml-0.1.2.ebuild: - stable amd64, bug 277974 - - 15 Jul 2009; Christian Faulhammer libyaml-0.1.2.ebuild: - stable x86, bug 277861 - - 24 May 2009; Raúl Porcel libyaml-0.1.2.ebuild: - Add ~arm - - 10 Mar 2009; Diego E. Pettenò - libyaml-0.1.2.ebuild: - Add missing test flag to IUSE. - -*libyaml-0.1.2 (01 Mar 2009) - - 01 Mar 2009; Patrick Lauer libyaml-0.0.1.ebuild, - +libyaml-0.1.2.ebuild: - Bump to 0.1.2, fixes #259821, invalid test for FEATURES changed into - USE=test check - - 16 Oct 2007; Stefan Briesenick libyaml-0.0.1.ebuild: - some cleanups - -*libyaml-0.0.1 (05 Oct 2007) - - 05 Oct 2007; Stefan Briesenick +metadata.xml, - +libyaml-0.0.1.ebuild: - initial commit. diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest index e6cfc231b2..46772dd378 100644 --- a/dev-libs/libyaml/Manifest +++ b/dev-libs/libyaml/Manifest @@ -1,4 +1,2 @@ -DIST yaml-0.1.6.tar.gz 503012 SHA256 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 SHA512 eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44 WHIRLPOOL b3dc733ae79c2798ad80390fee90648ab65b32b9550d6b3d336138e3d664ee6fa50f71594747e49c7e0b9b72600cb4dd22aaac62970bbf50ae343be4a8c956ca -EBUILD libyaml-0.1.6.ebuild 1032 SHA256 bf5d9d57e9dce1887e0ded931a40d69b44a60a128d0a61246802cbf204c5151b SHA512 d0c19b277795764600326a0a19e01f35fac9c6cd1d972af7ea8d156b8d090466ae4bd400581ce4756acd1fb31256bfc975743affd2562061d1b7f1bbf756eadb WHIRLPOOL 7b13d33c037dd400522a9c1bdbe8961b6b4f2464f6f8279b36efde80e34f29606c2c4e7c14fac4d3c15f445b8ca2b99998fc4238e0a8923ece6056659964ea36 -MISC ChangeLog 6477 SHA256 d26b7e68b6e50ee65d6f4ccbbda588c063fd48c0b53feea84f4f5c486246107d SHA512 8fc1ec9ba8ff332d6e79698f5e3b9e0b4ab2e60dc2d5a4bf579c146cd0f0a143d568d8023a7b2b1dc810ab1ae20514cbda08e0ed14a5fa1e2634efb3f7a6df84 WHIRLPOOL 9b246d31d8dafa7ac7da9550f086e4e2e647b9b04da89f8c75da9a7cd5c59c149cfb617c434fefbf40475c9bcfdbf82c5e05f5754c45d3225f8249a06d19cd6e -MISC metadata.xml 379 SHA256 80b7e3c654145df8a1dd27023af6315cfe9fb048fdff476855b5893979ff26d3 SHA512 391119b16ca85eae2f0196bf33ff94d761058d3d6b6317e8a728e989a436fc33492d2c21317134fca9a68196fd4412a4fe062e621021601fba0745fa7a9ff211 WHIRLPOOL b4f1677863f39ea6478910494915fd3b5426cd3316a75d6ee9c7d1c503c654af0f7b1e7dbadf9916e6ace02c313429b745cb00e09a356b11792a03de43c38fef +DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06 +DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e diff --git a/dev-libs/libyaml/libyaml-0.1.6.ebuild b/dev-libs/libyaml/libyaml-0.1.6.ebuild deleted file mode 100644 index 8be20ac08b..0000000000 --- a/dev-libs/libyaml/libyaml-0.1.6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-utils eutils libtool - -MY_P="${P/lib}" - -DESCRIPTION="YAML 1.1 parser and emitter written in C" -HOMEPAGE="http://pyyaml.org/wiki/LibYAML" -SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples test static-libs" - -S="${WORKDIR}/${MY_P}" - -DOCS="README" - -src_prepare() { - # conditionally remove tests - if ! use test; then - sed -i -e 's: tests::g' Makefile* || die - fi - elibtoolize # for FreeMiNT -} - -src_install() { - autotools-utils_src_install - use doc && dohtml -r doc/html/. - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - insinto /usr/share/doc/${PF}/examples - doins tests/example-*.c - fi -} diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild new file mode 100644 index 0000000000..98fc658a8d --- /dev/null +++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools libtool + +DESCRIPTION="YAML 1.1 parser and emitter written in C" +HOMEPAGE="https://github.com/yaml/libyaml" +SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + default + + # conditionally remove tests + if ! use test; then + sed -i -e 's: tests::g' Makefile* || die + fi + + elibtoolize + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_compile() { + emake + use doc && emake html +} + +src_install() { + use doc && HTML_DOCS=( doc/html/. ) + default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild new file mode 100644 index 0000000000..98fc658a8d --- /dev/null +++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools libtool + +DESCRIPTION="YAML 1.1 parser and emitter written in C" +HOMEPAGE="https://github.com/yaml/libyaml" +SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + default + + # conditionally remove tests + if ! use test; then + sed -i -e 's: tests::g' Makefile* || die + fi + + elibtoolize + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_compile() { + emake + use doc && emake html +} + +src_install() { + use doc && HTML_DOCS=( doc/html/. ) + default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libyaml/metadata.xml b/dev-libs/libyaml/metadata.xml index 4e98176ca8..bd6443d4a3 100644 --- a/dev-libs/libyaml/metadata.xml +++ b/dev-libs/libyaml/metadata.xml @@ -1,12 +1,8 @@ - + - - radhermit@gentoo.org - Tim Harder + + chutzpah@gentoo.org + Patrick McLean - - LibYAML is a YAML 1.1 parser and emitter written in C. - It's in an early stage of development. - From a9de7c2824172ad848a4b6387b9662d9fb72edb3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:58:06 +0100 Subject: [PATCH 09/18] app-crypt/shash: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- app-crypt/shash/ChangeLog | 60 --------- app-crypt/shash/ChangeLog-2015 | 126 ------------------ app-crypt/shash/Manifest | 9 +- .../files/shash-0.2.6-format-security.patch | 28 ++++ app-crypt/shash/files/shash.bash-completion | 1 - app-crypt/shash/metadata.xml | 3 +- ...-0.2.6-r2.ebuild => shash-0.2.6-r3.ebuild} | 21 +-- 7 files changed, 41 insertions(+), 207 deletions(-) delete mode 100644 app-crypt/shash/ChangeLog delete mode 100644 app-crypt/shash/ChangeLog-2015 create mode 100644 app-crypt/shash/files/shash-0.2.6-format-security.patch rename app-crypt/shash/{shash-0.2.6-r2.ebuild => shash-0.2.6-r3.ebuild} (55%) diff --git a/app-crypt/shash/ChangeLog b/app-crypt/shash/ChangeLog deleted file mode 100644 index 695ba3315c..0000000000 --- a/app-crypt/shash/ChangeLog +++ /dev/null @@ -1,60 +0,0 @@ -# ChangeLog for app-crypt/shash -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*shash-0.2.6-r2 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/0.2.6-manpage-fixes.patch, +files/shash-0.2.6-binary-files.patch, - +files/shash.bash-completion, +metadata.xml, +shash-0.2.6-r2.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/app-crypt/shash/ChangeLog-2015 b/app-crypt/shash/ChangeLog-2015 deleted file mode 100644 index 789e3c38a5..0000000000 --- a/app-crypt/shash/ChangeLog-2015 +++ /dev/null @@ -1,126 +0,0 @@ -# ChangeLog for app-crypt/shash -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.39 2015/02/26 20:42:43 tgall Exp $ - - 26 Feb 2015; shash-0.2.6-r2.ebuild: - Stable for arm64 - - 02 Jan 2015; Michał Górny -shash-0.2.6-r1.ebuild: - Remove old now that -r2 has complete stable keyword set. - - 11 Nov 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for ia64, wrt bug #524820 - - 04 Nov 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for sparc, wrt bug #524820 - - 02 Nov 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for alpha, wrt bug #524820 - - 01 Nov 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for ppc, wrt bug #524820 - - 31 Oct 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for ppc64, wrt bug #524820 - - 30 Oct 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for x86, wrt bug #524820 - - 29 Oct 2014; Agostino Sarubbo shash-0.2.6-r2.ebuild: - Stable for amd64, wrt bug #524820 - - 23 Oct 2014; Markus Meier shash-0.2.6-r2.ebuild: - arm stable, bug #524820 - - 23 Oct 2014; Jeroen Roovers shash-0.2.6-r2.ebuild: - Stable for HPPA (bug #524820). - - 23 Oct 2014; Sven Wegener files/shash.bash-completion: - Unconditionally enable completion, bug #526232. - -*shash-0.2.6-r2 (27 Aug 2014) - - 27 Aug 2014; Michał Górny +shash-0.2.6-r2.ebuild: - Convert to a modern EAPI and bash-completion-r1. - - 18 Jan 2014; Mike Frysinger shash-0.2.6-r1.ebuild: - Add arm64 love. - - 04 May 2012; Alexis Ballier shash-0.2.6-r1.ebuild: - keyword ~amd64-fbsd - - 06 Feb 2011; Mart Raudsepp shash-0.2.6-r1.ebuild: - Drop to ~mips - - 01 Jan 2010; Christian Faulhammer - shash-0.2.6-r1.ebuild: - Transfer Prefix keywords - - 07 Jun 2008; Sven Wegener - +files/shash-0.2.6-binary-files.patch, shash-0.2.6-r1.ebuild: - Add patch to fix -c with binary files, bug #182417. - - 04 Feb 2008; Fabian Groffen shash-0.2.6-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 22 Oct 2006; Diego Pettenò shash-0.2.6-r1.ebuild: - Add ~x86-fbsd keyword. - - 19 Oct 2006; Roy Marples shash-0.2.6-r1.ebuild: - Added ~sparc-fbsd keyword. - - 13 Oct 2006; Sven Wegener - files/shash.bash-completion, shash-0.2.6-r1.ebuild: - Touchup bash completion support. - - 29 Sep 2006; Daniel Drake shash-0.2.6-r1.ebuild: - Fix RDEPEND - - 21 May 2006; Markus Rothe shash-0.2.6-r1.ebuild: - Stable on ppc64 - - 19 Jan 2006; Gustavo Zacarias shash-0.2.6-r1.ebuild: - Stable on sparc - - 21 Dec 2005; Markus Rothe shash-0.2.6-r1.ebuild: - Added ~ppc64; bug #116186 - - 20 Dec 2005; Gustavo Zacarias shash-0.2.6-r1.ebuild: - Keyworded ~sparc wrt #116186 - - 20 Sep 2005; Fabian Groffen shash-0.2.6-r1.ebuild: - Marking ~ppc-macos (bug #106613) - - 15 Nov 2004; Sven Wegener shash-0.2.6-r1.ebuild: - Added missing inherit eutils for epatch which was dropped accidently. - Thanks to Daniel Webert in bug #71224. - - 06 Nov 2004; Sven Wegener shash-0.2.6-r1.ebuild, - -shash-0.2.6.ebuild: - Marked stable on x86. Removed old ebuild. - - 17 Oct 2004; David Holm shash-0.2.6-r1.ebuild: - Added to ~ppc. - -*shash-0.2.6-r1 (27 Sep 2004) - - 27 Sep 2004; Sven Wegener - +files/shash.bash-completion, +shash-0.2.6-r1.ebuild: - Revision bump. Added support for bash-completion. Thanks to James Rowe - in bug #64493. - - 24 Sep 2004; Sven Wegener - +files/0.2.6-manpage-fixes.patch, shash-0.2.6.ebuild: - Added a patch that corrects some manpage errors. Closes bug #64491. - - 15 Jul 2004; Sven Wegener metadata.xml: - Taking over primary maintainership. - - 07 Jun 2004; Daniel Black +metadata.xml, - shash-0.2.6.ebuild: - Added DEPENDS. marked stable - -*shash-0.2.6 (20 Jan 2004) - - 20 Jan 2004; Robin H. Johnson shash-0.2.6.ebuild: - initial commit, ebuild by Sven Wegener , bug #38108 diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest index 5c37c077a4..8917298158 100644 --- a/app-crypt/shash/Manifest +++ b/app-crypt/shash/Manifest @@ -1,8 +1 @@ -AUX 0.2.6-manpage-fixes.patch 1451 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551 WHIRLPOOL 11b4d1aaf6feae4dd00d7abfbe704fcb8ba665d0de46de724098fa57b60960060c6df7661c9e3735c9ccd5865ab6c66cad3527395fec4279822e114dc59ab92d -AUX shash-0.2.6-binary-files.patch 898 SHA256 e06660afe1afb338bf4f209d39ac33c412ecc6fb22feec684c0a7b5fd80f46a6 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b WHIRLPOOL 0bbe198601dd7b1ce55719936d8670975505b9b31baa68f0663d25c9988026587b8bc1dcfb18d188b598298715f57716c334b875ac6ff5075ff3a79dc121e7f9 -AUX shash.bash-completion 863 SHA256 7ceb200e7da4fcfbc029d85074ac44ffacf96b1dc8173635d7d3649b7898e0d7 SHA512 19fabe9fd102c12e37f46ef126d5e173e3190c1541a0c92007d3398af349bf18b74bd92d2880dc79f5773d2c00ac292b2a62acf1097f8bc92183d0b1a648a264 WHIRLPOOL 111745a70b056873e1d7d4ce507ee8c83115b61d1f6f53453cb37cde1a73e1792a22282a6a6f6c147fa34734b2a468111ec80e5e6a1c55f4e609d96bad0f8332 -DIST shash-0.2.6.tar.gz 105641 SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b WHIRLPOOL 8b809f5fddc98def54907fee8af424937c747f341dd0eaa6fd0c1057858c4dce7d117dfbc729cdd951c53e68a363d3339e9db4e2de1677620bbb9a94a810e8a5 -EBUILD shash-0.2.6-r2.ebuild 943 SHA256 3a04e2485ed06bc41c6bad9e5c1b52e30632d7a33a9be49bc8e57dee4ee4ca8a SHA512 c436bff73c013bc7647c7efb592535ac3686daa9698ad3583b520597b91ebedd600d3e08914db5017376f0f36a747d84c610d039093b51a9c7ee326500da2c10 WHIRLPOOL 1686d95d757c499716d087086b28805100e3cc97b6b802a336071c03b5bd2903c9031fb881235951b44bd8e96403e3a9e3b479518dc04d2087da272f98af4622 -MISC ChangeLog 2282 SHA256 602e76d19c7626bbe13c1147f05a8b7c8cc3d462ea96654c7fe0dfe285989a82 SHA512 f651e0b28c110b55554b1788a31885a141b74639d6d20fd35aa8448b17bd22973b6196fbec41e6080250a31663f66833b6f97c83849744ef24c175a154fcf47b WHIRLPOOL 10472f4f96b4e8091fc7a1834dda31e69f36b111e71505bb93d97233a4ce07b14650f4b1deec956492c59f630f815e324282b6c1e9591c7f3de0b91032a6f728 -MISC ChangeLog-2015 4546 SHA256 56731500ee859978dcb7c11ebbb9b7104beeefdbe3875ad60310bc73542ede1e SHA512 29806eca1add20c6d4fe6e8592c8256c73e08602e8c00a0515a1b2c692b49bc357c827ed439b62494730d6d584445cf60ff35c90aa19986f320cfc9afc3eb70e WHIRLPOOL 4f0e4853585d9ba5c915d9b75bae7b0647cfc75ce01c714956fe1947496c5aae436b6c0860b6f0fe09116cbed7c4aa216a47890ea7fdb55e1fb8c70d7209bc0c -MISC metadata.xml 437 SHA256 7c03f43673bb700e0bc1063720dc80df195304f74a397d8175192ec6e705bb88 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d WHIRLPOOL e086a413a8a5bc1d1fba9a2a4717d83af4137a40f17ff969a5536a26fbd342c8a58b3418933fc42770ffae3c60812ab2bd044951de17a52566441a9210b26282 +DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b diff --git a/app-crypt/shash/files/shash-0.2.6-format-security.patch b/app-crypt/shash/files/shash-0.2.6-format-security.patch new file mode 100644 index 0000000000..4e46639e28 --- /dev/null +++ b/app-crypt/shash/files/shash-0.2.6-format-security.patch @@ -0,0 +1,28 @@ +--- shash-0.2.6/src/errors.c ++++ shash-0.2.6/src/errors.c +@@ -4,7 +4,7 @@ + + void err_quit(char *errmsg) + { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + exit(-1); + } + +@@ -12,7 +12,7 @@ + { + + if (quiet < 1) { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + } + + } +@@ -20,6 +20,6 @@ + void err_crit(char *errmsg) + { + if (quiet <= 2) { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + } + } diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion index ccd15b96ba..15a677dce5 100644 --- a/app-crypt/shash/files/shash.bash-completion +++ b/app-crypt/shash/files/shash.bash-completion @@ -1,6 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # # shash(1) completion. diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml index 3b9877fc08..e93ad590e0 100644 --- a/app-crypt/shash/metadata.xml +++ b/app-crypt/shash/metadata.xml @@ -1,10 +1,9 @@ - + swegener@gentoo.org Sven Wegener - primary maintainer shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files. diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild similarity index 55% rename from app-crypt/shash/shash-0.2.6-r2.ebuild rename to app-crypt/shash/shash-0.2.6-r3.ebuild index 20ce31b908..158e48f3af 100644 --- a/app-crypt/shash/shash-0.2.6-r2.ebuild +++ b/app-crypt/shash/shash-0.2.6-r3.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -inherit bash-completion-r1 eutils +inherit bash-completion-r1 DESCRIPTION="Generate or check digests or MACs of files" HOMEPAGE="http://mcrypt.hellug.gr/shash/" @@ -12,16 +11,18 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="static" -DEPEND=">=app-crypt/mhash-0.8.18-r1" +DEPEND=">=app-crypt/mhash-0.8.18-r1 + static? ( app-crypt/mhash[static-libs(+)] )" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PV}-manpage-fixes.patch - epatch "${FILESDIR}"/${P}-binary-files.patch -} +PATCHES=( + "${FILESDIR}"/${PV}-manpage-fixes.patch + "${FILESDIR}"/${P}-binary-files.patch + "${FILESDIR}"/${P}-format-security.patch +) src_configure() { econf $(use_enable static static-link) From 1a12619805a9fa24422935dcc1fb2e20608e492c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 18:59:12 +0100 Subject: [PATCH 10/18] app-eselect/eselect-lib-bin-symlink: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- app-eselect/eselect-lib-bin-symlink/ChangeLog | 98 ------------------- app-eselect/eselect-lib-bin-symlink/Manifest | 25 +---- .../eselect-lib-bin-symlink-0.1.1-r1.ebuild | 15 +++ .../eselect-lib-bin-symlink-0.1.1.ebuild | 18 ---- .../eselect-lib-bin-symlink-0.1.ebuild | 18 ---- .../eselect-lib-bin-symlink-9999.ebuild | 27 ++--- .../eselect-lib-bin-symlink/metadata.xml | 26 ++--- 7 files changed, 40 insertions(+), 187 deletions(-) delete mode 100644 app-eselect/eselect-lib-bin-symlink/ChangeLog create mode 100644 app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild delete mode 100644 app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild delete mode 100644 app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild diff --git a/app-eselect/eselect-lib-bin-symlink/ChangeLog b/app-eselect/eselect-lib-bin-symlink/ChangeLog deleted file mode 100644 index c80091792b..0000000000 --- a/app-eselect/eselect-lib-bin-symlink/ChangeLog +++ /dev/null @@ -1,98 +0,0 @@ -# ChangeLog for app-eselect/eselect-lib-bin-symlink -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-lib-bin-symlink/ChangeLog,v 1.1 2015/03/31 16:50:19 ulm Exp $ - - 31 Mar 2015; Ulrich Müller - +eselect-lib-bin-symlink-0.1.ebuild, +eselect-lib-bin-symlink-0.1.1.ebuild, - +eselect-lib-bin-symlink-9999.ebuild, +metadata.xml: - Move package from app-admin to app-eselect category. - - 06 Jul 2014; Michał Górny - eselect-lib-bin-symlink-0.1.1.ebuild, eselect-lib-bin-symlink-0.1.ebuild, - eselect-lib-bin-symlink-9999.ebuild: - Replace obsolete mirror://bitbucket with the real URI. - - 20 Jan 2014; Mike Frysinger - eselect-lib-bin-symlink-0.1.1.ebuild, eselect-lib-bin-symlink-0.1.ebuild, - eselect-lib-bin-symlink-9999.ebuild: - Add arm64 love. - - 05 Dec 2013; Michael Haubenwallner - eselect-lib-bin-symlink-0.1.1.ebuild: - add ~ppc-aix keyword - - 14 Oct 2013; Michał Górny - eselect-lib-bin-symlink-9999.ebuild: - Switch to git-r3. - - 21 May 2013; Jeroen Roovers - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for HPPA (bug #466002). - - 01 May 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for sh, wrt bug #466002 - - 22 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for sparc, wrt bug #466002 - - 22 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for s390, wrt bug #466002 - - 22 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for ppc, wrt bug #466002 - - 18 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for ia64, wrt bug #466002 - - 18 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for alpha, wrt bug #466002 - - 16 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for ppc64, wrt bug #466002 - - 16 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for arm, wrt bug #466002 - - 15 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for x86, wrt bug #466002 - - 15 Apr 2013; Agostino Sarubbo - eselect-lib-bin-symlink-0.1.1.ebuild: - Stable for amd64, wrt bug #466002 - - 19 Feb 2013; Zac Medico - eselect-lib-bin-symlink-0.1.1.ebuild, eselect-lib-bin-symlink-9999.ebuild: - Add ~arm-linux keywords. - -*eselect-lib-bin-symlink-0.1.1 (14 Jan 2013) - - 14 Jan 2013; Michał Górny - +eselect-lib-bin-symlink-0.1.1.ebuild: - Version bump. Fix trying to set a symlink after last implementation was - removed. - - 13 Jan 2013; Michał Górny - eselect-lib-bin-symlink-0.1.ebuild, eselect-lib-bin-symlink-9999.ebuild: - Sync KEYWORDS to eselect-pinentry. Add RDEP on eselect. - - 13 Jan 2013; Michał Górny - eselect-lib-bin-symlink-0.1.ebuild, eselect-lib-bin-symlink-9999.ebuild: - Sync KEYWORDS to eselect-sh. - -*eselect-lib-bin-symlink-9999 (13 Jan 2013) -*eselect-lib-bin-symlink-0.1 (13 Jan 2013) - - 13 Jan 2013; Michał Górny - +eselect-lib-bin-symlink-0.1.ebuild, +eselect-lib-bin-symlink-9999.ebuild, - +metadata.xml: - Introduce an eselect library to control executable symlinks (for eselect-sh - and eselect-pinentry). diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest index b14dd1aad9..f83bcef9bd 100644 --- a/app-eselect/eselect-lib-bin-symlink/Manifest +++ b/app-eselect/eselect-lib-bin-symlink/Manifest @@ -1,24 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 SHA256 397ac213f606d3d0534539a9b34f755389294cb1d584b1b656e105a441286b15 SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd WHIRLPOOL e1490e3dc35a8eb96416469fb0f4b310867d1a245abd96fafc2ed0b96561f3cfbcfaff651df79e387338801177898a4b116f2c15242d1a74cb8a3e0375072b87 -DIST eselect-lib-bin-symlink-0.1.tar.bz2 45331 SHA256 eb612453252e06991c0a3840d8cc1bc287dd5dbf84f21c9ce17018156822a14b SHA512 c4e31c81ee778a18335e3a5f45eba28688ca6af8b7f5069897a19f1d51e0a83fc35b80149c29643c01ff959aedd05b80a020bd0fbdb9fc7ecf207405f8c77ed6 WHIRLPOOL 97cf79e2287d347000d72cdfad6592dbb39f36fe4170ccd88719d7661f0578351a7879c73c412167cf931c0d9b53b3ef52298c6e5d900efa5136020a2ab65cd1 -EBUILD eselect-lib-bin-symlink-0.1.1.ebuild 827 SHA256 d9701fed0d844f68c5b2eb3cbfc20891efcc3f01013bbbd418f872b49e13d5c1 SHA512 a79acea0cfb360e2e43c48f7824f62fcf044abd112adb902522b4203559226b2a3fafe4eb514eba15b970a50af29abd820ebcbd7dd246327ade38842f3c45f2f WHIRLPOOL cd6b6674943b59283f5142f333f74ff5132ca8f8e1b7e4561e4e5bae386ef97b9c6b814bcb37cdc4a090ce2b61a08a20233b2044fc26d707a61daddeaf8b0804 -EBUILD eselect-lib-bin-symlink-0.1.ebuild 817 SHA256 e1bdbcbea5122db1ddca5eda122d92ccb245c837b143f72e714ae2b004f5543c SHA512 c90250959654f74fd2107d06c25942ddae998bde32fa6a5c70fb72967d361cb7bbb7ea3ef1f53dbe75b292b581bb331ae68b44eb91103ebacb0686c9e232f279 WHIRLPOOL bac7d743a2048e49d79ccd00ab85ff06e6df6bfeca69bfedfa29bfb292b44a12bcdaeffd054c932b73673356badccbe677f11e2615eb74c86d2bf729466fa5cd -EBUILD eselect-lib-bin-symlink-9999.ebuild 974 SHA256 df5f3630f34f57de4b09e849abf1cd3d1aa29d95b77a7dc59c188b5f00327961 SHA512 639041dbfb0f92b15cdef1e6b0c675c6b041fa8941a9ec68af910f259d96b0cbfe46f9ba14a30351aea4d7bd57246decdf66f64c0bce846be54c9cc667a7b639 WHIRLPOOL 97da90432c36260c0182b45cee7d2adbc71bfcae2759b214bcb8d4518dc4a53c1c676d61a8c29a392c8a9b2f6aaad5d907dfed863c24ee2d8bb70276c9bfb082 -MISC ChangeLog 3534 SHA256 928de26d215d2348bb1975544c775ae49608535cf89221e0667c68ed52240254 SHA512 62056987cbba71ee896d42cb35482437fe446bba06b5106f20b6196c0da0a0c141fbbc636f4508338b3f3833edd0dd9086020ba2f67791aba273fdbbe403b363 WHIRLPOOL de2426b919978dff51e289b0dd7a43d85c6edd9def8035f68422d7693a5df37c29c3f28966a3e44d892042ea773355c544a75e4e98e5f9a1d739562bced6bd30 -MISC metadata.xml 454 SHA256 93bdef210b0e87f5ca6f86ffc3f604339b08b963139bab7f9996c8e048264174 SHA512 83f429dd205098417726fe3781768c0f893a9ea56fea18767922229458d2858c7769f740ec6d5843f817a90c6181b9724cec93a6f1ec8bd2b86f775ecfe9ac29 WHIRLPOOL 5796ec78853cb798e07c9baf44a5c5d0e7ac7b3a39ab027f4c95ffb3dcbf863fd0f3063994fa4e8bb50e52fcfc94a044cc4dd2f0754d386bf68a3f3e274263b3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQGcBAEBCAAGBQJVGtBOAAoJEJQzkH1pP7W4NeYL/RcSh+2d2UhExJdKuVia4eGh -DhHIqXimzQDkIL/eFgCPq6qpCIhXksizP5NkYti4HH10BTz7TDRP/MocpJmX2pdy -f3MkcBhu8aFGiJ1/QkSMP0qRXUb5ZE/V46XrVeaCiMwtVJG8IiS0q0RbFFJdAG8I -7IYR5/XU8LUTW+YvR8IWhODjraafnHE1yfc8kyUx5eFyk9rSatWRo8EFSE8wOrt7 -/x/Z1B64FGVVnWTBOcLsX7XcwHb5YLxLOxN8ixcY+nYnvmEthEoDewYPdOXgJmsI -V0bp3Q43t0iJiSWzK2W9vBdByU6n6MrXzk7iTSxf+H7kqohbJybQhz+OL83didPH -s7T6norBdE+AM6bIycNWMkEBrmAiGOGPVFPNuM/P+X3c97kvIHw9hclnrxrwL8NC -/C5dqmCvgdJQTgRkS4sEkEw4AccHIcTcdWxmQ1kS5RMqmWMqwA3M9ggNvQgYd19O -ndsLympA0BIUF4gb/5HPbb6Tvwer9pCTAs7lJYMd/w== -=sfSc ------END PGP SIGNATURE----- +DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild new file mode 100644 index 0000000000..15b7458170 --- /dev/null +++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="An eselect library to manage executable symlinks" +HOMEPAGE="https://github.com/mgorny/eselect-lib-bin-symlink/" +SRC_URI="https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/${P}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="app-admin/eselect" diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild deleted file mode 100644 index 8bdccf7289..0000000000 --- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild,v 1.1 2015/03/31 16:50:19 ulm Exp $ - -EAPI=5 - -inherit autotools-utils - -DESCRIPTION="An eselect library to manage executable symlinks" -HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/" -SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="app-admin/eselect" diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild deleted file mode 100644 index 3751a9e94b..0000000000 --- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild,v 1.1 2015/03/31 16:50:19 ulm Exp $ - -EAPI=5 - -inherit autotools-utils - -DESCRIPTION="An eselect library to manage executable symlinks" -HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/" -SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="app-admin/eselect" diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild index fc580764bd..208e978f8a 100644 --- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild +++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild @@ -1,29 +1,22 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild,v 1.1 2015/03/31 16:50:19 ulm Exp $ -EAPI=5 +EAPI=7 -#if LIVE -EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git" -AUTOTOOLS_AUTORECONF=1 -inherit git-r3 -#endif - -inherit autotools-utils +inherit autotools git-r3 DESCRIPTION="An eselect library to manage executable symlinks" -HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/" -SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" +HOMEPAGE="https://github.com/mgorny/eselect-lib-bin-symlink/" +EGIT_REPO_URI="https://github.com/mgorny/eselect-lib-bin-symlink.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="" IUSE="" RDEPEND="app-admin/eselect" -#if LIVE -KEYWORDS= -SRC_URI= -#endif +src_prepare() { + default + eautoreconf +} diff --git a/app-eselect/eselect-lib-bin-symlink/metadata.xml b/app-eselect/eselect-lib-bin-symlink/metadata.xml index 02a1ca701e..744f610c82 100644 --- a/app-eselect/eselect-lib-bin-symlink/metadata.xml +++ b/app-eselect/eselect-lib-bin-symlink/metadata.xml @@ -1,15 +1,17 @@ - + - - mgorny@gentoo.org - Michał Górny - - - - mgorny@gentoo.org - Michał Górny - - https://bitbucket.org/mgorny/eselect-lib-bin-symlink/issues/ - + + mgorny@gentoo.org + Michał Górny + + + + mgorny@gentoo.org + Michał Górny + + https://github.com/mgorny/eselect-lib-bin-symlink/issues/ + mgorny/eselect-lib-bin-symlink + + From e8a4996dc4b8b308247f7b2c2a356ec67f91a789 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 19:00:01 +0100 Subject: [PATCH 11/18] net-misc/bridge-utils: Sync with gentoo It's from gentoo commit 36d4c4e69edfc56c9c515bb29af7abd39cb02c7c. --- net-misc/bridge-utils/ChangeLog | 65 ---- net-misc/bridge-utils/ChangeLog-2015 | 288 ------------------ net-misc/bridge-utils/Manifest | 8 +- ...ils-1.5.ebuild => bridge-utils-1.6.ebuild} | 31 +- .../bridge-utils/bridge-utils-1.7.1-r1.ebuild | 56 ++++ .../bridge-utils/bridge-utils-1.7.1.ebuild | 55 ++++ .../files/bridge-utils-1.5-linux-3.8.patch | 18 -- .../files/bridge-utils-1.7.1-musl.patch | 10 + ...ubstitute-AR-variable-from-configure.patch | 40 +++ net-misc/bridge-utils/metadata.xml | 3 +- 10 files changed, 183 insertions(+), 391 deletions(-) delete mode 100644 net-misc/bridge-utils/ChangeLog delete mode 100644 net-misc/bridge-utils/ChangeLog-2015 rename net-misc/bridge-utils/{bridge-utils-1.5.ebuild => bridge-utils-1.6.ebuild} (58%) create mode 100644 net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild create mode 100644 net-misc/bridge-utils/bridge-utils-1.7.1.ebuild delete mode 100644 net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch create mode 100644 net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch create mode 100644 net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog deleted file mode 100644 index f329d5f359..0000000000 --- a/net-misc/bridge-utils/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -# ChangeLog for net-misc/bridge-utils -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*bridge-utils-1.5 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +bridge-utils-1.5.ebuild, - +files/bridge-utils-1.5-linux-3.8.patch, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/net-misc/bridge-utils/ChangeLog-2015 b/net-misc/bridge-utils/ChangeLog-2015 deleted file mode 100644 index 7483d3451d..0000000000 --- a/net-misc/bridge-utils/ChangeLog-2015 +++ /dev/null @@ -1,288 +0,0 @@ -# ChangeLog for net-misc/bridge-utils -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.71 2015/05/16 06:30:55 robbat2 Exp $ - - 16 May 2015; Robin H. Johnson bridge-utils-1.5.ebuild: - Bug #538022: selinux policy rdepend. - - 03 Mar 2015; Yixun Lan bridge-utils-1.5.ebuild: - add arm64 support, tested on A53 board - - 14 Sep 2013; Samuli Suominen -bridge-utils-1.2.ebuild, - -bridge-utils-1.4.ebuild, -files/bridge-utils-1.0.6-allow-without-sysfs.patch, - -files/bridge-utils-1.0.6-dont-error-on-no-ports.patch, -files/bridge.conf, - -files/bridge.rc: - old - - 14 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for ia64, wrt bug #483892 - - 08 Sep 2013; Markus Meier bridge-utils-1.5.ebuild: - arm stable, bug #483892 - - 06 Sep 2013; Jeroen Roovers bridge-utils-1.5.ebuild: - Stable for HPPA (bug #483892). - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for sparc, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for ppc64, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for ppc, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for x86, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for amd64, wrt bug #483892 - - 06 Sep 2013; Robin H. Johnson bridge-utils-1.4.ebuild, - bridge-utils-1.5.ebuild: - Safety workaround for bug #483692 while 1.5 is stabilized. - - 06 Mar 2013; Samuli Suominen bridge-utils-1.5.ebuild, - +files/bridge-utils-1.5-linux-3.8.patch: - Unfortunately linux/if_bridge.h is not self-contained and struct for ip6 is - in netinet/ip6.h (since Linux 3.8+) wrt #460262 by Guillaume Castagnino - - 19 May 2012; Anthony G. Basile bridge-utils-1.5.ebuild: - keyword mips, bug #405835 - -*bridge-utils-1.5 (15 Jun 2011) - - 15 Jun 2011; Jeroen Roovers +bridge-utils-1.5.ebuild: - Version bump. Remove old init script warning. - - 19 Sep 2010; Michael Weber bridge-utils-1.4.ebuild: - Added ~arm keyword - - 12 Feb 2010; Robin H. Johnson - bridge-utils-1.4.ebuild: - Add warning message for lack of CONFIG_BRIDGE, and add ~ppc64 keyword per - request by JoseJX. - - 09 May 2009; Raúl Porcel bridge-utils-1.4.ebuild: - sparc stable wrt #268323 - - 04 Oct 2008; Raúl Porcel bridge-utils-1.4.ebuild: - ia64/x86 stable wrt #239119 - - 02 Oct 2008; Brent Baude bridge-utils-1.4.ebuild: - stable ppc, bug 239119 - - 30 Sep 2008; Jeroen Roovers bridge-utils-1.4.ebuild: - Stable for HPPA (bug #239119). - - 30 Sep 2008; Jeremy Olexa bridge-utils-1.4.ebuild: - amd64 stable, bug #239119 - - 30 Sep 2008; Robin H. Johnson - bridge-utils-1.2.ebuild, bridge-utils-1.4.ebuild: - Bug #238782, spelling fix. - - 28 Sep 2008; Raúl Porcel bridge-utils-1.4.ebuild: - Add ~sparc wrt #238183 - - 05 Jun 2008; Robin H. Johnson - bridge-utils-1.2.ebuild: - Fix syntax. - -*bridge-utils-1.4 (05 Jun 2008) - - 05 Jun 2008; Robin H. Johnson - +bridge-utils-1.4.ebuild: - Version bump per bug #204744. Cross compile should work now. - - 28 Apr 2008; Doug Goldstein - -bridge-utils-1.0.6-r3.ebuild, bridge-utils-1.2.ebuild: - remove USE=sysfs from bridge-utils-1.2 since it's unused (bug #219600) and - remove old version - - 14 Jan 2008; Robin H. Johnson metadata.xml: - Update metadata. - - 11 May 2007; Jeroen Roovers bridge-utils-1.2.ebuild: - Stable for HPPA (bug #173864). - - 22 Apr 2007; Tobias Scherbaum - bridge-utils-1.2.ebuild: - ppc stable, bug #173864 - - 21 Apr 2007; Robin H. Johnson - -bridge-utils-0.9.6-r2.ebuild, -bridge-utils-1.0.4.ebuild, - -bridge-utils-1.0.6.ebuild, -bridge-utils-1.0.6-r2.ebuild: - Remove old ebuilds per bug #174266. - - 09 Apr 2007; Raúl Porcel bridge-utils-1.2.ebuild: - ia64 stable wrt bug 173864 - - 09 Apr 2007; Peter Weller bridge-utils-1.2.ebuild: - Stable on amd64 wrt bug 173864 - - 09 Apr 2007; Raúl Porcel bridge-utils-1.2.ebuild: - x86 stable wrt bug 173864 - - 07 Nov 2006; Joel Martin bridge-utils-1.0.6-r3.ebuild, - bridge-utils-1.2.ebuild: - Use get_libdir instead of just 'lib' - - 04 Nov 2006; Tobias Scherbaum - bridge-utils-1.0.6-r3.ebuild, bridge-utils-1.2.ebuild: - Added ~hppa - -*bridge-utils-1.2 (25 Sep 2006) - - 25 Sep 2006; Robin H. Johnson - +bridge-utils-1.2.ebuild: - Version bump, bug #148084 - upstream no longer uses sysfsutils. - - 04 Jul 2006; Robin H. Johnson - bridge-utils-1.0.6-r3.ebuild: - Bug #138199 - fix for using autoconf-2.60. - - 25 Apr 2006; Luca Barbato - bridge-utils-1.0.6-r3.ebuild: - Marked ppc - - 29 Mar 2006; Aron Griffis - bridge-utils-1.0.6-r3.ebuild: - Mark 1.0.6-r3 stable on ia64 - - 16 Feb 2006; Aron Griffis - bridge-utils-1.0.6-r3.ebuild: - Mark 1.0.6-r3 ~ia64 - - 19 Jan 2006; Marcus D. Hanwell - bridge-utils-1.0.6-r3.ebuild: - Stable on amd64. - - 15 Aug 2005; Robin H. Johnson - bridge-utils-1.0.6-r3.ebuild: - 1.0.6-r3 to stable x86, so that it works for 2.4 users, and also throw in a - bit more error checking (bug #102588). - -*bridge-utils-1.0.6-r3 (05 Aug 2005) - - 05 Aug 2005; Robin H. Johnson - +files/bridge-utils-1.0.6-allow-without-sysfs.patch, - +bridge-utils-1.0.6-r3.ebuild: - Bug #69292: Make it possible to compile without sysfs, so the new versions - work well for 2.4 users. - - 12 Jul 2005; Simon Stelling - bridge-utils-1.0.6-r2.ebuild: - stable on amd64 - -*bridge-utils-1.0.6-r2 (12 Jul 2005) - - 12 Jul 2005; Roy Marples - -bridge-utils-1.0.6-r1.ebuild, +bridge-utils-1.0.6-r2.ebuild: - epatch requires eutils - rev bumped as r1 still compiled - but without the patch! - -*bridge-utils-1.0.6-r1 (12 Jul 2005) - - 12 Jul 2005; Robin H. Johnson - +files/bridge-utils-1.0.6-dont-error-on-no-ports.patch, - +bridge-utils-1.0.6-r1.ebuild: - Bug #98005: Ensure correct behavior when there are no ports on the bridge. - - 04 Jul 2005; Robin H. Johnson - bridge-utils-1.0.6.ebuild: - Stable 1.0.6 on x86. - - 03 Jul 2005; Robin H. Johnson - -bridge-utils-0.9.6.ebuild, -bridge-utils-0.9.6-r1.ebuild: - Remove some old ebuilds. - -*bridge-utils-0.9.6-r2 (03 Jul 2005) - - 03 Jul 2005; Robin H. Johnson - +bridge-utils-0.9.6-r2.ebuild: - Add bridge-utils-0.9.6-r2 that uses the bridge support in the new - baselayout, instead of the old init scripts. - - 02 Jul 2005; Robin H. Johnson - bridge-utils-1.0.6.ebuild: - Add ~amd64 to newest ebuild since it seems to exist on an old one only. - - 06 May 2005; Sven Wegener bridge-utils-1.0.6.ebuild: - Removed * postfix from <, <=, >= and > dependencies. - -*bridge-utils-1.0.6 (29 Apr 2005) - - 29 Apr 2005; Robin H. Johnson - +bridge-utils-1.0.6.ebuild: - Version bump - now uses baselayout's bridge stuff. - - 28 Apr 2005; Robin H. Johnson - bridge-utils-1.0.4.ebuild: - Fix bug #69292, missing dep. - - 01 Jul 2004; Jon Hood bridge-utils-0.9.6-r1.ebuild, - bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild: - change virtual/glibc to virtual/libc, add IUSE - - 18 Jun 2004; David Holm bridge-utils-1.0.4.ebuild: - Added to ~ppc. - - 17 Jun 2004; Jared Hudson bridge-utils-0.9.6-r1.ebuild, - bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild: - Fixed SRC_URI to point to sourceforge's new bridge util location, set 0.9.6 - to x86 and bumped bridge-utils to 1.0.4 (~x86) - - 26 Apr 2004; Aron Griffis - bridge-utils-0.9.6-r1.ebuild, bridge-utils-0.9.6.ebuild: - Add die following econf for bug 48950 - - 02 Apr 2004; Daniel Ahlberg bridge-utils-0.9.6-r1.ebuild: - Adding amd64 keyword, closing #46552. - -*bridge-utils-0.9.6-r1 (18 Mar 2004) - - 18 Mar 2004; Jared Hudson bridge-utils-0.9.6-r1.ebuild, - bridge-utils-0.9.6.ebuild, metadata.xml, files/bridge.conf, files/bridge.rc: - Added an init script to the bridge port thanks to Gustavo Felisberto - and Denis Knauf - - 25 Feb 2004; Patrick Kursawe - bridge-utils-0.9.3-r1.ebuild, bridge-utils-0.9.6.ebuild: - Cleanup - - 25 Feb 2004; Patrick Kursawe - bridge-utils-0.9.6.ebuild: - Added additional check for build success because of bug #42548 - - 24 Apr 2003; Patrick Kursawe bridge-utils-0.9.6.ebuild : - Considered stable for x86 - -*bridge-utils-0.9.6 (02 Apr 2003) - - 02 Apr 2003; Patrick Kursawe bridge-utils-0.9.6.ebuild, - files/digest-bridge-utils-0.9.6 : - New version, moved binaries to /sbin since they can be necessary for - bringing the network up. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*bridge-utils-0.9.3-r1 (3 May 2002) - - 6 Jul 2002; phoen][x : - - Added KEYWORDS. - - 3 May 2002; Donny Davies : - - Added LICENSE, SLOT. - -*bridge-utils-0.9.3 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 780358a34f..08ad577c85 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,6 +1,2 @@ -AUX bridge-utils-1.5-linux-3.8.patch 435 SHA256 ce60b2328784307ad7a408fad96c0e0165b7740d1e4aaadb3cf2d6e6feaef235 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 WHIRLPOOL 056fdf262ac2765a6996d54da8014d1f52d72d646ac215476dfb14bdb983fd0c8283ff61a056d3d909ef9a9cd1f0cb7cc08db112e4f477204d8a94371edf84ea -DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa -EBUILD bridge-utils-1.5.ebuild 1288 SHA256 183f2a6bf021260cccbc0f8ed9cb9cdf658080aa9d9ef7b4f1f970b00ff34875 SHA512 34b71352bd3fd304298f655d96ae78f18957329e58f715f47ba681cee236946e4ce0b9811929a9a30c00f840ca784ec5faf011e6222cec2ed9d04313d70ea31e WHIRLPOOL 5ea4badf8c45cbea39fa12b9ee0031fbd1cb138b58019887ccf10845eeb8ae3b7a9e3ee39997ff645934e04553ffb8d8a24cdafd26d497b43725e233fe409901 -MISC ChangeLog 2479 SHA256 669239dd5eccd538a94a7de8b80e5c55985e32531404fef7a2d4e571d1cd2945 SHA512 e2045ae448a113c560492661c247505ebba96f43c8481e41d01a5f1103e0cbe274de78f4534e2651b2906ea69e1d9aec389741afa8860676a7913cd7ffffd76d WHIRLPOOL b26c965f6a74cd837606cd36a86362fcd42e95e23102bf1c28223def0b02c88ffd8b47ec4e4f74537815de98e558ca74afcfc79aaa3c770de7377d39fc0fd12e -MISC ChangeLog-2015 10269 SHA256 09a7e39e286023aa1bb9adaae16cb4f0eb5bcebfdf269ec259539f4f7d21aad6 SHA512 3993e85d6ad2f3afb9ad741ee56bb90ed468be20e91d50cc96b3fbd3b710984ff4f7f0ebb390dafe93689f7058c05e4c004c6ce0bd3d4a16935d32a998eb4a3b WHIRLPOOL e4b8f8e80174c7b38ae1b116b9b88304206bc0a4ef96bd1305db0c8877d650603d09e23aceb802b71384731e6b0936b9ce05ae26f40ea9bd2af031fef1053a24 -MISC metadata.xml 426 SHA256 b34c0320b4f643677f7b03ecb26c8f0336ab1f9a68c7156f4d0a0ae85eafec60 SHA512 b6d8f31496815fff6ee465b4eff20dba27a478e803c299e1d329ad33dd80493380b746fd0aba19d15a3780e4a4b37365829781cda5aaccfca2f044506b15c38e WHIRLPOOL 177367f59aae104c6aa481ca706e54aaf8f204843c647856595e30dc736d6f593d1dc36c93049eccc047f50faf364a6cbb35247a652b8531fba1129da317ab72 +DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 +DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild similarity index 58% rename from net-misc/bridge-utils/bridge-utils-1.5.ebuild rename to net-misc/bridge-utils/bridge-utils-1.6.ebuild index dda7236589..273624c416 100644 --- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +inherit autotools linux-info toolchain-funcs DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" HOMEPAGE="http://bridge.sourceforge.net/" -SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" +#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="selinux" DEPEND="virtual/os-headers" @@ -29,22 +29,27 @@ get_headers() { } src_prepare() { - epatch "${FILESDIR}"/${P}-linux-3.8.patch + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) + default eautoreconf } src_configure() { # use santitized headers and not headers from /usr/src - econf \ - --prefix=/ \ - --libdir=/usr/$(get_libdir) \ - --includedir=/usr/include \ + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" } -src_install () { +src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} - [ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary" + [ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary" } diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild new file mode 100644 index 0000000000..85a58f61fc --- /dev/null +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +CONFIG_CHECK="~BRIDGE" +WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" + +get_headers() { + CTARGET=${CTARGET:-${CHOST}} + dir=/usr/include + tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include + echo "${dir}" +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + "${FILESDIR}"/${P}-musl.patch #828902 + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild new file mode 100644 index 0000000000..b3ea6ff1a7 --- /dev/null +++ b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +CONFIG_CHECK="~BRIDGE" +WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" + +get_headers() { + CTARGET=${CTARGET:-${CHOST}} + dir=/usr/include + tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include + echo "${dir}" +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch deleted file mode 100644 index 49ebb4e9da..0000000000 --- a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -unfortunately if_bridge.h from Linux 3.8+ is not self-contained and the struct -for ip6 is missing - -http://bugs.gentoo.org/460262 - -this is not unheard of with Linux headers, for example, needs - to get INT_MAX - ---- libbridge/libbridge.h -+++ libbridge/libbridge.h -@@ -20,6 +20,7 @@ - #define _LIBBRIDGE_H - - #include -+#include - #include - #include - diff --git a/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch new file mode 100644 index 0000000000..618811e80b --- /dev/null +++ b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch @@ -0,0 +1,10 @@ +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch new file mode 100644 index 0000000000..0676d0cc9c --- /dev/null +++ b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch @@ -0,0 +1,40 @@ +From 4dc12feb7b5a0f8f4d27c737513853896e77feea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 21 Apr 2020 13:17:33 -0400 +Subject: [PATCH] libbridge: substitute AR variable from configure + +Bug: https://bugs.gentoo.org/717700 +Signed-off-by: Mike Gilbert +--- + configure.ac | 1 + + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b2e2ea..e66f334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 7932bfe..bd55e9b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ +-- +2.26.1 + diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml index 995aec8204..2dd80ab197 100644 --- a/net-misc/bridge-utils/metadata.xml +++ b/net-misc/bridge-utils/metadata.xml @@ -1,5 +1,5 @@ - + robbat2@gentoo.org @@ -9,6 +9,7 @@ Gentoo Base System + cpe:/a:kernel:bridge-utils bridge From 94e7265e733665f21363c571318dfe8158c94759 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 13:45:59 +0100 Subject: [PATCH 12/18] eclass/elisp-common: Sync with gentoo It's from gentoo commit 53742c90d80c7a6b7713ccf87597b88c7ff71a1f. --- eclass/elisp-common.eclass | 177 ++++++++++++++++++++++++++----------- 1 file changed, 125 insertions(+), 52 deletions(-) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 05b03f4939..1127d53669 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp-common.eclass @@ -10,6 +10,7 @@ # Mamoru Komachi # Christian Faulhammer # Ulrich Müller +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Emacs-related installation utilities # @DESCRIPTION: # @@ -23,29 +24,27 @@ # When relying on the emacs USE flag, you need to add # # @CODE -# emacs? ( virtual/emacs ) +# emacs? ( >=app-editors/emacs-23.1:* ) # @CODE # # to your DEPEND/RDEPEND line and use the functions provided here to # bring the files to the correct locations. # -# If your package requires a minimum Emacs version, e.g. Emacs 24, then -# the dependency should be on >=virtual/emacs-24 instead. Because the -# user can select the Emacs executable with eselect, you should also -# make sure that the active Emacs version is sufficient. This can be -# tested with function elisp-need-emacs(), which would typically be -# called from pkg_setup(), as in the following example: +# If your package requires a minimum Emacs version, e.g. Emacs 26.1, +# then the dependency should be on >=app-editors/emacs-26.1:* instead. +# Because the user can select the Emacs executable with eselect, you +# should also make sure that the active Emacs version is sufficient. +# The eclass will automatically ensure this if you assign variable +# NEED_EMACS with the Emacs version, as in the following example: # # @CODE -# elisp-need-emacs 24 || die "Emacs version too low" +# NEED_EMACS=26.1 # @CODE # -# Please note that such tests should be limited to packages that are -# known to fail with lower Emacs versions; the standard case is to -# depend on virtual/emacs without version. +# Please note that this should be done only for packages that are known +# to fail with lower Emacs versions. # -# @ROFF .SS -# src_compile() usage: +# @SUBSECTION src_compile() usage: # # An elisp file is compiled by the elisp-compile() function defined # here and simply takes the source files as arguments. The case of @@ -65,8 +64,7 @@ # comments. See the Emacs Lisp Reference Manual (node "Autoload") for # a detailed explanation. # -# @ROFF .SS -# src_install() usage: +# @SUBSECTION src_install() usage: # # The resulting compiled files (.elc) should be put in a subdirectory of # /usr/share/emacs/site-lisp/ which is named after the first argument @@ -133,8 +131,23 @@ # "50${PN}-gentoo.el". If your subdirectory is not named ${PN}, give # the differing name as second argument. # -# @ROFF .SS -# pkg_postinst() / pkg_postrm() usage: +# @SUBSECTION pkg_setup() usage: +# +# If your ebuild uses the elisp-compile eclass function to compile +# its elisp files (see above), then you don't need a pkg_setup phase, +# because elisp-compile and elisp-make-autoload-file do their own sanity +# checks. On the other hand, if the elisp files are compiled by the +# package's build system, then there is often no check for the Emacs +# version. In this case, you can add an explicit check in pkg_setup: +# +# @CODE +# elisp-check-emacs-version +# @CODE +# +# When having optional Emacs support, you should prepend "use emacs &&" +# to above call of elisp-check-emacs-version(). +# +# @SUBSECTION pkg_postinst() / pkg_postrm() usage: # # After that you need to recreate the start-up file of Emacs after # emerging and unmerging by using @@ -149,12 +162,14 @@ # } # @CODE # -# When having optional Emacs support, you should prepend "use emacs &&" +# Again, with optional Emacs support, you should prepend "use emacs &&" # to above calls of elisp-site-regen(). -# Don't use "has_version virtual/emacs"! When unmerging the state of -# the emacs USE flag is taken from the package database and not from the -# environment, so it is no problem when you unset USE=emacs between -# merge and unmerge of a package. + +case ${EAPI:-0} in + 5|6) inherit eapi7-ver ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac # @ECLASS-VARIABLE: SITELISP # @DESCRIPTION: @@ -166,6 +181,12 @@ SITELISP=/usr/share/emacs/site-lisp # Directory where packages install miscellaneous (not Lisp) files. SITEETC=/usr/share/emacs/etc +# @ECLASS-VARIABLE: EMACSMODULES +# @DESCRIPTION: +# Directory where packages install dynamically loaded modules. +# May contain a @libdir@ token which will be replaced by $(get_libdir). +EMACSMODULES=/usr/@libdir@/emacs/modules + # @ECLASS-VARIABLE: EMACS # @DESCRIPTION: # Path of Emacs executable. @@ -182,13 +203,26 @@ EMACSFLAGS="-batch -q --no-site-file" # Emacs flags used for byte-compilation in elisp-compile(). BYTECOMPFLAGS="-L ." +# @ECLASS-VARIABLE: NEED_EMACS +# @DESCRIPTION: +# The minimum Emacs version required for the package. +: ${NEED_EMACS:=23.1} + +# @ECLASS-VARIABLE: _ELISP_EMACS_VERSION +# @INTERNAL +# @DESCRIPTION: +# Cached value of Emacs version detected in elisp-check-emacs-version(). +_ELISP_EMACS_VERSION="" + # @FUNCTION: elisp-emacs-version # @RETURN: exit status of Emacs # @DESCRIPTION: # Output version of currently active Emacs. elisp-emacs-version() { - local version ret + local version ret tmout="timeout -k 5 55" + # Run without timeout if the command is not available + ${tmout} true &>/dev/null || tmout="" # The following will work for at least versions 18-24. echo "(princ emacs-version)" >"${T}"/emacs-version.el version=$( @@ -197,12 +231,14 @@ elisp-emacs-version() { # Redirecting stdin and unsetting TERM and DISPLAY will cause # most of them to exit with an error. unset TERM DISPLAY - ${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el /dev/null) == */emacs* ]] \ + || eerror "This package needs GNU Emacs" return ${ret} fi if [[ -z ${version} ]]; then @@ -212,27 +248,33 @@ elisp-emacs-version() { echo "${version}" } -# @FUNCTION: elisp-need-emacs -# @USAGE: -# @RETURN: 0 if true, 1 if false, 2 if trouble +# @FUNCTION: elisp-check-emacs-version +# @USAGE: [version] # @DESCRIPTION: -# Test if the eselected Emacs version is at least the major version -# of GNU Emacs specified as argument. - -elisp-need-emacs() { - local need_emacs=$1 have_emacs - have_emacs=$(elisp-emacs-version) || return 2 - einfo "Emacs version: ${have_emacs}" - if [[ ${have_emacs} =~ XEmacs|Lucid ]]; then - eerror "This package needs GNU Emacs." - return 1 +# Test if the eselected Emacs version is at least the version of +# GNU Emacs specified in the NEED_EMACS variable, or die otherwise. + +elisp-check-emacs-version() { + if [[ -z ${_ELISP_EMACS_VERSION} ]]; then + local have_emacs + have_emacs=$(elisp-emacs-version) \ + || die "Could not determine Emacs version" + einfo "Emacs version: ${have_emacs}" + if [[ ${have_emacs} =~ XEmacs|Lucid ]]; then + die "XEmacs detected. This package needs GNU Emacs." + fi + # GNU Emacs versions have only numeric components. + if ! [[ ${have_emacs} =~ ^[0-9]+(\.[0-9]+)*$ ]]; then + die "Malformed version string: ${have_emacs}" + fi + _ELISP_EMACS_VERSION=${have_emacs} fi - if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then - eerror "This package needs at least Emacs ${need_emacs%%.*}." + + if ! ver_test "${_ELISP_EMACS_VERSION}" -ge "${NEED_EMACS}"; then + eerror "This package needs at least Emacs ${NEED_EMACS}." eerror "Use \"eselect emacs\" to select the active version." - return 1 + die "Emacs version too low" fi - return 0 } # @FUNCTION: elisp-compile @@ -249,6 +291,8 @@ elisp-need-emacs() { # in case they require or load one another. elisp-compile() { + elisp-check-emacs-version + ebegin "Compiling GNU Emacs Elisp files" ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" eend $? "elisp-compile: batch-byte-compile failed" || die @@ -262,6 +306,8 @@ elisp-compile() { elisp-make-autoload-file() { local f="${1:-${PN}-autoloads.el}" null="" page=$'\f' shift + elisp-check-emacs-version + ebegin "Generating autoload file for GNU Emacs" cat >"${f}" <<-EOF @@ -306,17 +352,37 @@ elisp-install() { eend $? "elisp-install: doins failed" || die } +# @FUNCTION: elisp-modules-install +# @USAGE: +# @DESCRIPTION: +# Install dynamic modules in EMACSMODULES directory. + +elisp-modules-install() { + local subdir="$1" + shift + # Don't bother inheriting multilib.eclass for get_libdir(), but + # error out in old EAPIs that don't support it natively. + [[ ${EAPI} == 5 ]] \ + && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" + ebegin "Installing dynamic modules for GNU Emacs support" + ( # subshell to avoid pollution of calling environment + exeinto "${EMACSMODULES//@libdir@/$(get_libdir)}/${subdir}" + doexe "$@" + ) + eend $? "elisp-modules-install: doins failed" || die +} + # @FUNCTION: elisp-site-file-install # @USAGE: [subdirectory] # @DESCRIPTION: # Install Emacs site-init file in SITELISP directory. Automatically -# inserts a standard comment header with the name of the package (unless -# it is already present). Tokens @SITELISP@ and @SITEETC@ are replaced -# by the path to the package's subdirectory in SITELISP and SITEETC, -# respectively. +# inserts a standard comment header with the name of the package +# (unless it is already present). Tokens @SITELISP@, @SITEETC@, +# and @EMACSMODULES@ are replaced by the path to the package's +# subdirectory in SITELISP, SITEETC, and EMACSMODULES, respectively. elisp-site-file-install() { - local sf="${1##*/}" my_pn="${2:-${PN}}" ret + local sf="${1##*/}" my_pn="${2:-${PN}}" modules ret local header=";;; ${PN} site-lisp configuration" [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \ @@ -324,10 +390,17 @@ elisp-site-file-install() { [[ ${sf%-gentoo*.el} != "${sf}" ]] && sf="${sf%-gentoo*.el}-gentoo.el" sf="${T}/${sf}" ebegin "Installing site initialisation file for GNU Emacs" - [[ $1 = "${sf}" ]] || cp "$1" "${sf}" + [[ $1 == "${sf}" ]] || cp "$1" "${sf}" + if [[ ${EAPI} == 5 ]]; then + grep -q "@EMACSMODULES@" "${sf}" \ + && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" + else + modules=${EMACSMODULES//@libdir@/$(get_libdir)} + fi sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \ - -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g;\$q" "${sf}" + -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \ + -e "s:@EMACSMODULES@:${EPREFIX}${modules}/${my_pn}:g;\$q" "${sf}" ( # subshell to avoid pollution of calling environment insinto "${SITELISP}/site-gentoo.d" doins "${sf}" @@ -348,7 +421,7 @@ elisp-site-regen() { local sf i ret=0 null="" page=$'\f' local -a sflist - if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then + if [[ ${EBUILD_PHASE} == *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase." return 0 fi @@ -397,13 +470,13 @@ elisp-site-regen() { # was actually no change. # A case is a remerge where we have doubled output. rm -f "${T}"/site-gentoo.el - eend + eend 0 einfo "... no changes." else mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die case ${#sflist[@]} in - 0) [[ ${PN} = emacs-common-gentoo ]] \ + 0) [[ ${PN} == emacs-common ]] \ || ewarn "... Huh? No site initialisation files found." ;; 1) einfo "... ${#sflist[@]} site initialisation file included." ;; *) einfo "... ${#sflist[@]} site initialisation files included." ;; From 6b88ecbb4dec6bd5a806f0a232af9b3da9d68eb9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 13:48:16 +0100 Subject: [PATCH 13/18] eclass: Drop unused eclasses --- eclass/ant-tasks.eclass | 162 ---------- eclass/dotnet.eclass | 143 --------- eclass/font.eclass | 254 ---------------- eclass/games-mods.eclass | 320 -------------------- eclass/games.eclass | 396 ------------------------ eclass/golang-build.eclass | 85 ------ eclass/java-ant-2.eclass | 426 -------------------------- eclass/java-osgi.eclass | 277 ----------------- eclass/java-pkg-2.eclass | 155 ---------- eclass/java-pkg-simple.eclass | 161 ---------- eclass/java-virtuals-2.eclass | 54 ---- eclass/leechcraft.eclass | 56 ---- eclass/mozextension.eclass | 125 -------- eclass/myspell.eclass | 256 ---------------- eclass/php-ext-source-r2.eclass | 378 ----------------------- eclass/s6.eclass | 119 -------- eclass/toolchain-binutils.eclass | 502 ------------------------------- eclass/vala.eclass | 171 ----------- 18 files changed, 4040 deletions(-) delete mode 100644 eclass/ant-tasks.eclass delete mode 100644 eclass/dotnet.eclass delete mode 100644 eclass/font.eclass delete mode 100644 eclass/games-mods.eclass delete mode 100644 eclass/games.eclass delete mode 100644 eclass/golang-build.eclass delete mode 100644 eclass/java-ant-2.eclass delete mode 100644 eclass/java-osgi.eclass delete mode 100644 eclass/java-pkg-2.eclass delete mode 100644 eclass/java-pkg-simple.eclass delete mode 100644 eclass/java-virtuals-2.eclass delete mode 100644 eclass/leechcraft.eclass delete mode 100644 eclass/mozextension.eclass delete mode 100644 eclass/myspell.eclass delete mode 100644 eclass/php-ext-source-r2.eclass delete mode 100644 eclass/s6.eclass delete mode 100644 eclass/toolchain-binutils.eclass delete mode 100644 eclass/vala.eclass diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass deleted file mode 100644 index 84e6576579..0000000000 --- a/eclass/ant-tasks.eclass +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -# @ECLASS: ant-tasks.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Vlastimil Babka -# @BLURB: Eclass for building dev-java/ant-* packages -# @DESCRIPTION: -# This eclass provides functionality and default ebuild variables for building -# dev-java/ant-* packages easily. - -case "${EAPI:-0}" in - 0|1|2|3|4|5) - die "ant-tasks.eclass: EAPI ${EAPI} is too old." - ;; - 6|7) - ;; - *) - die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet." - ;; -esac - -# we set ant-core dep ourselves, restricted -JAVA_ANT_DISABLE_ANT_CORE_DEP=true -# rewriting build.xml for are the testcases has no reason atm -JAVA_PKG_BSFIX_ALL=no -inherit java-pkg-2 java-ant-2 -[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver - -EXPORT_FUNCTIONS src_unpack src_compile src_install - -# @ECLASS-VARIABLE: ANT_TASK_JDKVER -# @DESCRIPTION: -# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can -# be overridden from ebuild BEFORE inheriting this eclass. -ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8} - -# @ECLASS-VARIABLE: ANT_TASK_JREVER -# @DESCRIPTION: -# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can -# be overridden from ebuild BEFORE inheriting this eclass. -ANT_TASK_JREVER=${ANT_TASK_JREVER-1.8} - -# @ECLASS-VARIABLE: ANT_TASK_NAME -# @DESCRIPTION: -# The name of this ant task as recognized by ant's build.xml, derived from $PN -# by removing the ant- prefix. Read-only. -ANT_TASK_NAME="${PN#ant-}" - -# @ECLASS-VARIABLE: ANT_TASK_DEPNAME -# @DESCRIPTION: -# Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package -# that this one depends on. Defaults to the name of ant task, ebuild can -# override it before inheriting this eclass. -ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} - -# @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS -# @DEFAULT_UNSET -# @DESCRIPTION: -# If set, no JDK/JRE deps are added. - -# @VARIABLE: ANT_TASK_PV -# @INTERNAL -# Version of ant-core this task is intended to register and thus load with. -ANT_TASK_PV="${PV}" - -# default for final releases -MY_PV=${PV} - -UPSTREAM_PREFIX="mirror://apache/ant/source" -GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles" - -# source/workdir name -MY_P="apache-ant-${MY_PV}" - -# Default values for standard ebuild variables, can be overridden from ebuild. -DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}" -HOMEPAGE="http://ant.apache.org/" -SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 - ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND="~dev-java/ant-core-${PV}:0" -DEPEND="${RDEPEND}" - -if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then - RDEPEND+=" >=virtual/jre-${ANT_TASK_JREVER}" - DEPEND+=" >=virtual/jdk-${ANT_TASK_JDKVER}" -fi - -# Would run the full ant test suite for every ant task -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -# @FUNCTION: ant-tasks_src_unpack -# @USAGE: [ base ] [ jar-dep ] [ all ] -# @DESCRIPTION: -# The function Is split into two parts, defaults to both of them ('all'). -# -# base: performs the unpack, build.xml replacement and symlinks ant.jar from -# ant-core -# -# jar-dep: symlinks the jar file(s) from dependency package -ant-tasks_src_unpack() { - [[ -z "${1}" ]] && ant-tasks_src_unpack all - - while [[ -n "${1}" ]]; do - case ${1} in - base) - unpack ${A} - cd "${S}" - - # replace build.xml with our modified for split building - if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then - eapply "${WORKDIR}"/${PV}-build.patch - else - mv -f "${WORKDIR}"/build.xml . - fi - - cd lib - # remove bundled xerces - rm -f *.jar - - # ant.jar to build against - java-pkg_jar-from --build-only ant-core ant.jar;; - jar-dep) - # get jar from the dependency package - if [[ -n "${ANT_TASK_DEPNAME}" ]]; then - java-pkg_jar-from ${ANT_TASK_DEPNAME} - fi;; - all) - ant-tasks_src_unpack base jar-dep;; - esac - shift - done - -} - -# @FUNCTION: ant-tasks_src_compile -# @DESCRIPTION: -# Compiles the jar with installed ant-core. -ant-tasks_src_compile() { - ANT_TASKS="none" eant -Dbuild.dep=${ANT_TASK_NAME} jar-dep -} - -# @FUNCTION: ant-tasks_src_install -# @DESCRIPTION: -# Installs the jar and registers its presence for the ant launcher script. -# Version param ensures it won't get loaded (thus break) when ant-core is -# updated to newer version. -ant-tasks_src_install() { - java-pkg_dojar build/lib/${PN}.jar - java-pkg_register-ant-task --version "${ANT_TASK_PV}" - - # create the compatibility symlink - dodir /usr/share/ant/lib - dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar -} diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass deleted file mode 100644 index 3e834835b9..0000000000 --- a/eclass/dotnet.eclass +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: dotnet.eclass -# @MAINTAINER: dotnet@gentoo.org -# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 -# @BLURB: common settings and functions for mono and dotnet related packages -# @DESCRIPTION: -# The dotnet eclass contains common environment settings that are useful for -# dotnet packages. Currently, it provides no functions, just exports -# MONO_SHARED_DIR and sets LC_ALL in order to prevent errors during compilation -# of dotnet packages. - -case ${EAPI:-0} in - 0) die "this eclass doesn't support EAPI 0" ;; - 1|2|3) ;; - *) ;; #if [[ ${USE_DOTNET} ]]; then REQUIRED_USE="|| (${USE_DOTNET})"; fi;; -esac - -inherit eutils versionator mono-env - -# @ECLASS-VARIABLE: USE_DOTNET -# @DESCRIPTION: -# Use flags added to IUSE - -DEPEND+=" dev-lang/mono" - -# SET default use flags according on DOTNET_TARGETS -for x in ${USE_DOTNET}; do - case ${x} in - net45) if [[ ${DOTNET_TARGETS} == *net45* ]]; then IUSE+=" +net45"; else IUSE+=" net45"; fi;; - net40) if [[ ${DOTNET_TARGETS} == *net40* ]]; then IUSE+=" +net40"; else IUSE+=" net40"; fi;; - net35) if [[ ${DOTNET_TARGETS} == *net35* ]]; then IUSE+=" +net35"; else IUSE+=" net35"; fi;; - net20) if [[ ${DOTNET_TARGETS} == *net20* ]]; then IUSE+=" +net20"; else IUSE+=" net20"; fi;; - esac -done - -# @FUNCTION: dotnet_pkg_setup -# @DESCRIPTION: -# This function set FRAMEWORK. -dotnet_pkg_setup() { - for x in ${USE_DOTNET} ; do - case ${x} in - net45) if use net45; then F="4.5"; fi;; - net40) if use net40; then F="4.0"; fi;; - net35) if use net35; then F="3.5"; fi;; - net20) if use net20; then F="2.0"; fi;; - esac - if [[ -z ${FRAMEWORK} ]]; then - if [[ ${F} ]]; then - FRAMEWORK="${F}"; - fi - else - version_is_at_least "${F}" "${FRAMEWORK}" || FRAMEWORK="${F}" - fi - done - if [[ -z ${FRAMEWORK} ]]; then - FRAMEWORK="4.0" - fi - einfo " -- USING .NET ${FRAMEWORK} FRAMEWORK -- " -} - -# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the -# shared dir to ${T} so that ${T}/.wapi can be used during the install process. -export MONO_SHARED_DIR="${T}" - -# Building mono, nant and many other dotnet packages is known to fail if LC_ALL -# variable is not set to C. To prevent this all mono related packages will be -# build with LC_ALL=C (see bugs #146424, #149817) -export LC_ALL=C - -# Monodevelop-using applications need this to be set or they will try to create config -# files in the user's ~ dir. - -export XDG_CONFIG_HOME="${T}" - -# Fix bug 83020: -# "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE" - -unset MONO_AOT_CACHE - -# @FUNCTION: exbuild -# @DESCRIPTION: -# Run xbuild with Release configuration and configurated FRAMEWORK. -exbuild() { - elog "xbuild ""$@"" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v""${FRAMEWORK}"" || die" - xbuild "$@" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" || die -} - -# @FUNCTION: egacinstall -# @DESCRIPTION: -# Install package to GAC. -egacinstall() { - use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" - gacutil -i "${1}" \ - -root "${ED}"/usr/$(get_libdir) \ - -gacdir /usr/$(get_libdir) \ - -package ${2:-${GACPN:-${PN}}} \ - || die "installing ${1} into the Global Assembly Cache failed" -} - -# @FUNCTION: dotnet_multilib_comply -# @DESCRIPTION: -# multilib comply -dotnet_multilib_comply() { - use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" - local dir finddirs=() mv_command=${mv_command:-mv} - if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]] - then - if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]] - then - mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)" - fi - ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed" - rm -rf "${ED}"/usr/lib - for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig - do - - if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]] - then - pushd "${dir}" &> /dev/null - sed -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \ - *.pc \ - || die "Sedding some sense into pkgconfig files failed." - popd "${dir}" &> /dev/null - fi - done - if [[ -d "${ED}/usr/bin" ]] - then - for exe in "${ED}/usr/bin"/* - do - if [[ "$(file "${exe}")" == *"shell script text"* ]] - then - sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \ - "${exe}" || die "Sedding some sense into ${exe} failed" - fi - done - fi - - fi -} - -EXPORT_FUNCTIONS pkg_setup diff --git a/eclass/font.eclass b/eclass/font.eclass deleted file mode 100644 index 58ec9e3ea3..0000000000 --- a/eclass/font.eclass +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: font.eclass -# @MAINTAINER: -# fonts@gentoo.org -# @BLURB: Eclass to make font installation uniform - -case ${EAPI:-0} in - 0|1|2|3|4|5|6) ;; - *) die "EAPI ${EAPI} is not supported by font.eclass." ;; -esac - -inherit eutils - -EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm - -# @ECLASS-VARIABLE: FONT_SUFFIX -# @DEFAULT_UNSET -# @REQUIRED -# @DESCRIPTION: -# Space delimited list of font suffixes to install. -FONT_SUFFIX=${FONT_SUFFIX:-} - -# @ECLASS-VARIABLE: FONT_S -# @REQUIRED -# @DESCRIPTION: -# Space delimited list of directories containing the fonts. -FONT_S=${FONT_S:-${S}} - -# @ECLASS-VARIABLE: FONT_PN -# @DESCRIPTION: -# Font name (ie. last part of FONTDIR). -FONT_PN=${FONT_PN:-${PN}} - -# @ECLASS-VARIABLE: FONTDIR -# @DESCRIPTION: -# Full path to installation directory. -FONTDIR=${FONTDIR:-/usr/share/fonts/${FONT_PN}} - -# @ECLASS-VARIABLE: FONT_CONF -# @DEFAULT_UNSET -# @DESCRIPTION: -# Array containing fontconfig conf files to install. -FONT_CONF=( "" ) - -# @ECLASS-VARIABLE: DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Space delimited list of docs to install. -# We always install these: -# COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt -DOCS=${DOCS:-} - -IUSE="X" - -DEPEND="X? ( - || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) - media-fonts/encodings - )" -RDEPEND="" - -# @FUNCTION: font_xfont_config -# @DESCRIPTION: -# Generate Xorg font files (mkfontscale/mkfontdir). -font_xfont_config() { - local dir_name - if has X ${IUSE//+} && use X ; then - dir_name="${1:-${FONT_PN}}" - ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}" - rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} - mkfontscale "${ED}${FONTDIR}/${1//${S}/}" - mkfontdir \ - -e ${EPREFIX}/usr/share/fonts/encodings \ - -e ${EPREFIX}/usr/share/fonts/encodings/large \ - "${ED}${FONTDIR}/${1//${S}/}" - eend $? - if [[ -e fonts.alias ]] ; then - doins fonts.alias - fi - fi -} - -# @FUNCTION: font_fontconfig -# @DESCRIPTION: -# Install fontconfig conf files given in FONT_CONF. -font_fontconfig() { - local conffile - if [[ -n ${FONT_CONF[@]} ]]; then - insinto /etc/fonts/conf.avail/ - for conffile in "${FONT_CONF[@]}"; do - [[ -e ${conffile} ]] && doins ${conffile} - done - fi -} - -# @FUNCTION: font_cleanup_dirs -# @DESCRIPTION: -# Remove font directories containing only generated files. -font_cleanup_dirs() { - local genfiles="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale" - # fonts.alias isn't generated but it's a special case (see below). - local d f g generated candidate otherfile - - ebegin "Cleaning up font directories" - find -L "${EROOT}"usr/share/fonts/ -type d -print0 | while read -d $'\0' d; do - candidate=false - otherfile=false - for f in "${d}"/*; do - generated=false - # make sure this is a file and not a subdir - [[ -e ${f} || -L ${f} ]] || continue - for g in ${genfiles}; do - if [[ ${f##*/} == ${g} ]]; then - # this is a generated file - generated=true - break - fi - done - # if the file is a generated file then we know this is a font dir (as - # opposed to something like encodings or util) and a candidate for - # removal. if it's not generated then it's an "otherfile". - ${generated} && candidate=true || otherfile=true - # if the directory is both a candidate for removal and contains at - # least one "otherfile" then don't remove it. - [[ ${candidate} == ${otherfile} ]] && break - done - # if in the end we only have generated files, purge the directory. - if [[ ${candidate} == true && ${otherfile} == false ]]; then - # we don't want to remove fonts.alias files that were installed by - # media-fonts/font-alias. any other fonts.alias files will have - # already been unmerged with their packages. - for g in ${genfiles}; do - [[ ${g} != fonts.alias && ( -e ${d}/${g} || -L ${d}/${g} ) ]] \ - && rm "${d}"/${g} - done - # if there's nothing left remove the directory - find "${d}" -maxdepth 0 -type d -empty -exec rmdir '{}' \; - fi - done - eend 0 -} - -# @FUNCTION: font_pkg_setup -# @DESCRIPTION: -# The font pkg_setup function. -# Collision protection and Prefix compat for eapi < 3. -font_pkg_setup() { - # Prefix compat - case ${EAPI:-0} in - 0|1|2) - if ! use prefix; then - EPREFIX= - ED=${D} - EROOT=${ROOT} - [[ ${EROOT} = */ ]] || EROOT+="/" - fi - ;; - esac - - # make sure we get no collisions - # setup is not the nicest place, but preinst doesn't cut it - [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] && rm -f "${EROOT}/${FONTDIR}/fonts.cache-1" -} - -# @FUNCTION: font_src_install -# @DESCRIPTION: -# The font src_install function. -font_src_install() { - local dir suffix commondoc - - set -- ${FONT_S:-${S}} - if [[ $# -gt 1 ]]; then - # if we have multiple FONT_S elements then we want to recreate the dir - # structure - for dir in ${FONT_S}; do - pushd "${dir}" > /dev/null - insinto "${FONTDIR}/${dir//${S}/}" - for suffix in ${FONT_SUFFIX}; do - doins *.${suffix} - done - font_xfont_config "${dir}" - popd > /dev/null - done - else - pushd "${FONT_S}" > /dev/null - insinto "${FONTDIR}" - for suffix in ${FONT_SUFFIX}; do - doins *.${suffix} - done - font_xfont_config - popd > /dev/null - fi - - font_fontconfig - - [[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ; } - - # install common docs - for commondoc in COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt; do - [[ -s ${commondoc} ]] && dodoc ${commondoc} - done -} - -# @FUNCTION: font_pkg_postinst -# @DESCRIPTION: -# The font pkg_postinst function. -font_pkg_postinst() { - # unreadable font files = fontconfig segfaults - find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ - | xargs -0 chmod -v 0644 2>/dev/null - - if [[ -n ${FONT_CONF[@]} ]]; then - local conffile - echo - elog "The following fontconfig configuration files have been installed:" - elog - for conffile in "${FONT_CONF[@]}"; do - if [[ -e ${EROOT}etc/fonts/conf.avail/$(basename ${conffile}) ]]; then - elog " $(basename ${conffile})" - fi - done - elog - elog "Use \`eselect fontconfig\` to enable/disable them." - echo - fi - - if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then - ebegin "Updating global fontcache" - fc-cache -fs - eend $? - else - einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)" - fi -} - -# @FUNCTION: font_pkg_postrm -# @DESCRIPTION: -# The font pkg_postrm function. -font_pkg_postrm() { - font_cleanup_dirs - - # unreadable font files = fontconfig segfaults - find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ - | xargs -0 chmod -v 0644 2>/dev/null - - if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then - ebegin "Updating global fontcache" - fc-cache -fs - eend $? - else - einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)" - fi -} diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass deleted file mode 100644 index f2e4a25841..0000000000 --- a/eclass/games-mods.eclass +++ /dev/null @@ -1,320 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Variables to specify in an ebuild which uses this eclass: -# GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-" -# MOD_DESC - Description for the mod -# MOD_NAME - Creates a command-line wrapper and desktop icon for the mod -# MOD_DIR - Subdirectory name for the mod, if applicable -# MOD_ICON - Custom icon for the mod, instead of the default - -inherit eutils games - -EXPORT_FUNCTIONS src_install pkg_postinst - -[[ -z ${GAME} ]] && GAME=${PN%%-*} - -case ${GAME} in - doom3) - GAME_PKGS="games-fps/doom3" - GAME_DIRS=( "${GAMES_PREFIX_OPT}"/doom3 ) - GAME_NAME="Doom 3" - GAME_BIN="doom3" - GAME_ICON="doom3" - DED_PKGS="" - DED_BIN="doom3-ded" - DED_OPTS="+set dedicated 1 +exec server.cfg" - DED_CFG_DIR=".doom3" - SELECT_MOD="+set fs_game " - ;; - enemy-territory) - GAME_PKGS="games-fps/enemy-territory" - GAME_DIRS=( "${GAMES_PREFIX_OPT}"/enemy-territory ) - GAME_NAME="Enemy Territory" - GAME_BIN="et" - GAME_ICON="ET" - DED_PKGS="" - DED_BIN="et-ded" - DED_OPTS="+set dedicated 1 +exec server.cfg" - DED_CFG_DIR=".etwolf" - SELECT_MOD="+set fs_game " - ;; - quake3) - GAME_PKGS="games-fps/quake3 games-fps/quake3-bin" - GAME_DIRS=( "${GAMES_DATADIR}"/quake3 "${GAMES_PREFIX_OPT}"/quake3 ) - GAME_NAME="Quake III" - GAME_BIN="quake3" - GAME_ICON="quake3" - DED_PKGS="" - DED_BIN="quake3-ded" - DED_OPTS="+set dedicated 1 +exec server.cfg" - DED_CFG_DIR=".q3a" - SELECT_MOD="+set fs_game " - ;; - quake4) - GAME_PKGS="games-fps/quake4-bin" - GAME_DIRS=( "${GAMES_PREFIX_OPT}"/quake4 ) - GAME_NAME="Quake 4" - GAME_BIN="quake4" - GAME_ICON="/usr/share/pixmaps/quake4.bmp" - DED_PKGS="" - DED_BIN="quake4-ded" - DED_OPTS="+set dedicated 1 +exec server.cfg" - DED_CFG_DIR=".quake4" - SELECT_MOD="+set fs_game " - ;; - ut2003) - GAME_PKGS="games-fps/ut2003" - GAME_DIRS=( "${GAMES_PREFIX_OPT}"/ut2003 ) - GAME_NAME="UT2003" - GAME_BIN="ut2003" - GAME_ICON="ut2003" - DED_PKGS="" - DED_BIN="ucc" - DED_OPTS="" - DED_CFG_DIR="" - SELECT_MOD="-mod=" - ;; - ut2004) - GAME_PKGS="games-fps/ut2004" - GAME_DIRS=( "${GAMES_PREFIX_OPT}"/{ut2004,ut2004-ded} ) - GAME_NAME="UT2004" - GAME_BIN="ut2004" - GAME_ICON="ut2004" - DED_PKGS="games-server/ut2004-ded" - DED_BIN="ut2004-ded" - DED_OPTS="" - DED_CFG_DIR="" - SELECT_MOD="-mod=" - ;; - *) - eerror "This game is either not supported or you must set the GAME" - eerror "variable to the proper game." - die "games-mods.eclass: unsupported GAME" - ;; -esac - -MOD_BIN="${GAME_BIN}-${PN/${GAME}-}" -MOD_DED_BIN="${MOD_BIN}-ded" - -games-mods_get_rdepend() { - local pkgs - - if [[ ${1} == "--ded" ]] ; then - pkgs=( ${DED_PKGS} ${GAME_PKGS} ) - else - pkgs=( ${GAME_PKGS} ) - fi - - [[ ${#pkgs[@]} -gt 1 ]] && echo -n "|| ( " - - case ${EAPI:-0} in - 0|1) echo -n "${pkgs[@]}" ;; - [23456]) - local p - if [[ ${1} == "--ded" ]] ; then - echo -n "${DED_PKGS}" - for p in ${GAME_PKGS} ; do - echo -n " ${p}[dedicated]" - done - else - for p in ${GAME_PKGS} ; do - echo -n " || ( ${p}[opengl] ${p}[-dedicated] )" - done - fi - ;; - *) die "EAPI ${EAPI} not supported" - esac - - [[ ${#pkgs[@]} -gt 1 ]] && echo -n " )" -} - -DESCRIPTION="${GAME_NAME} ${MOD_NAME} - ${MOD_DESC}" - -SLOT="0" -IUSE="dedicated opengl" -RESTRICT="mirror strip" - -DEPEND="app-arch/unzip" -RDEPEND="dedicated? ( $(games-mods_get_rdepend --ded) ) - opengl? ( $(games-mods_get_rdepend) ) - !dedicated? ( !opengl? ( $(games-mods_get_rdepend) ) )" - -S=${WORKDIR} - -INS_DIR=${GAMES_DATADIR}/${GAME} - -games-mods_use_opengl() { - [[ -z ${MOD_DIR} ]] && return 1 - - if use opengl || ! use dedicated ; then - # Use opengl by default - return 0 - fi - - return 1 -} - -games-mods_use_dedicated() { - [[ -z ${MOD_DIR} ]] && return 1 - - use dedicated && return 0 || return 1 -} - -games-mods_dosyms() { - # We are installing everything for these mods into ${INS_DIR}, - # ${GAMES_DATADIR}/${GAME} in most cases, and symlinking it - # into ${GAMES_PREFIX_OPT}/${GAME} for each game. This should - # allow us to support both binary and source-based games easily. - local dir - for dir in "${GAME_DIRS[@]}" ; do - [[ -z ${dir} || ${INS_DIR} == ${dir} ]] && continue - pushd "${D}/${INS_DIR}" > /dev/null || die "pushd failed" - local i - for i in * ; do - if [[ -d ${i} ]] ; then - if [[ ${i} == ${MOD_DIR} ]] ; then - dosym "${INS_DIR}/${i}" "${dir}/${i}" \ - || die "dosym ${i} failed" - else - local f - while read f ; do - dosym "${INS_DIR}/${f}" "${dir}/${f}" \ - || die "dosym ${f} failed" - done < <(find "${i}" -type f) - fi - elif [[ -f ${i} ]] ; then - dosym "${INS_DIR}/${i}" "${dir}/${i}" \ - || die "dosym ${i} failed" - else - die "${i} shouldn't be there" - fi - done - popd > /dev/null || die "popd failed" - done -} - -games-mods_make_initd() { - cat < "${T}"/${MOD_DED_BIN} -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Generated by games-mods.eclass - -depend() { - need net -} - -start() { - ebegin "Starting ${MOD_DED_BIN}" - start-stop-daemon --start --quiet --background --make-pidfile \\ - --pidfile /var/run/${MOD_DED_BIN}.pid \\ - --chuid \${${MOD_DED_BIN//-/_}_user}:\${${MOD_DED_BIN//-/_}_group} \\ - --env HOME="\${${MOD_DED_BIN//-/_}_home}" \\ - --exec "${GAMES_BINDIR}/${MOD_DED_BIN}" \\ - -- \${${MOD_DED_BIN//-/_}_opts} - eend \$? -} - -stop() { - ebegin "Stopping ${MOD_DED_BIN}" - start-stop-daemon --stop \\ - --pidfile /var/run/${MOD_DED_BIN}.pid - eend \$? -} -EOF - - doinitd "${T}"/${MOD_DED_BIN} || die "doinitd failed" -} - -games-mods_make_confd() { - cat <<-EOF > "${T}"/${MOD_DED_BIN} - # User and group the server should run as - ${MOD_DED_BIN//-/_}_user="${GAMES_USER_DED}" - ${MOD_DED_BIN//-/_}_group="${GAMES_GROUP}" - - # Directory to use for HOME - ${MOD_DED_BIN//-/_}_home="${GAMES_PREFIX}" - - # Any extra options you want to pass to the dedicated server - ${MOD_DED_BIN//-/_}_opts="" - EOF - - doconfd "${T}"/${MOD_DED_BIN} || die "doconfd failed" -} - -games-mods_src_install() { - if games-mods_use_opengl ; then - if [[ -n ${MOD_ICON} ]] ; then - # Install custom icon - local ext=${MOD_ICON##*.} - if [[ -f ${MOD_ICON} ]] ; then - newicon "${MOD_ICON}" ${PN}.${ext} || die "newicon failed" - else - newicon ${MOD_DIR}/"${MOD_ICON}" ${PN}.${ext} \ - || die "newicon failed" - fi - case ${ext} in - bmp|ico) - MOD_ICON=/usr/share/pixmaps/${PN}.${ext} - ;; - *) - MOD_ICON=${PN} - ;; - esac - else - # Use the game's standard icon - MOD_ICON=${GAME_ICON} - fi - - games_make_wrapper ${MOD_BIN} "${GAME_BIN} ${SELECT_MOD}${MOD_DIR}" - make_desktop_entry ${MOD_BIN} "${GAME_NAME} - ${MOD_NAME}" "${MOD_ICON}" - # Since only quake3 has both a binary and a source-based install, - # we only look for quake3 here. - case ${GAME} in - quake3) - if has_version games-fps/quake3-bin ; then - games_make_wrapper ${GAME_BIN}-bin-${PN/${GAME}-} \ - "${GAME_BIN}-bin ${SELECT_MOD}${MOD_DIR}" - fi - make_desktop_entry ${GAME_BIN}-bin-${PN/${GAME}-} \ - "${GAME_NAME} - ${MOD_NAME} (binary)" "${MOD_ICON}" - ;; - esac - fi - - # We expect anything not wanted to have been deleted by the ebuild - insinto "${INS_DIR}" - doins -r * || die "doins -r failed" - games-mods_dosyms - - if games-mods_use_dedicated ; then - if [[ -f ${FILESDIR}/server.cfg ]] ; then - insinto "${GAMES_SYSCONFDIR}"/${GAME}/${MOD_DIR} - doins "${FILESDIR}"/server.cfg || die "doins server.cfg failed" - dosym "${GAMES_SYSCONFDIR}"/${GAME}/${MOD_DIR}/server.cfg \ - "${GAMES_PREFIX}"/${DED_CFG_DIR}/${MOD_DIR}/server.cfg \ - || die "dosym server.cfg failed" - fi - games_make_wrapper ${MOD_DED_BIN} \ - "\"${GAMES_BINDIR}/${DED_BIN}\" ${SELECT_MOD}${MOD_DIR} ${DED_OPTS}" - games-mods_make_initd - games-mods_make_confd - fi - - prepgamesdirs -} - -games-mods_pkg_postinst() { - games_pkg_postinst - if games-mods_use_opengl ; then - elog "To play this mod run:" - elog " ${MOD_BIN}" - fi - if games-mods_use_dedicated ; then - elog "To launch a dedicated server run:" - elog " ${MOD_DED_BIN}" - elog "To launch the server at startup run:" - elog " rc-update add ${MOD_DED_BIN} default" - fi -} diff --git a/eclass/games.eclass b/eclass/games.eclass deleted file mode 100644 index d651dc7d86..0000000000 --- a/eclass/games.eclass +++ /dev/null @@ -1,396 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: games.eclass -# @MAINTAINER: -# Games team -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 -# @BLURB: Standardizing the install of games. -# @DESCRIPTION: -# This eclass makes sure that games are consistently handled in gentoo. -# It installs game files by default in FHS-compatible directories -# like /usr/share/games and sets more restrictive permissions in order -# to avoid some security bugs. -# -# The installation directories as well as the user and group files are -# installed as can be controlled by the user. See the variables like -# GAMES_BINDIR, GAMES_USER etc. below. These are NOT supposed to be set -# by ebuilds! -# -# For a general guide on writing games ebuilds, see: -# https://wiki.gentoo.org/wiki/Project:Games/Ebuild_howto -# -# WARNING: This eclass is DEPRECATED and must not be used by new games -# ebuilds, bug #574082. When writing game ebuilds, no specific eclass -# is needed. For more details, see the QA team policies page: -# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games - - -if [[ -z ${_GAMES_ECLASS} ]]; then -_GAMES_ECLASS=1 - -inherit base multilib toolchain-funcs eutils user - -case ${EAPI:-0} in - 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; - 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; - *) die "games.eclass is banned in EAPI=${EAPI}, see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games" ;; -esac - -if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then - # environment file - RDEPEND="games-misc/games-envd" -fi - -# @ECLASS-VARIABLE: GAMES_PREFIX -# @DESCRIPTION: -# Prefix where to install games, mostly used by GAMES_BINDIR. Games data should -# still go into GAMES_DATADIR. May be set by the user. -GAMES_PREFIX=${GAMES_PREFIX:-/usr/games} - -# @ECLASS-VARIABLE: GAMES_PREFIX_OPT -# @DESCRIPTION: -# Prefix where to install precompiled/blob games, usually followed by -# package name. May be set by the user. -GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt} - -# @ECLASS-VARIABLE: GAMES_DATADIR -# @DESCRIPTION: -# Base directory where to install game data files, usually followed by -# package name. May be set by the user. -GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games} - -# @ECLASS-VARIABLE: GAMES_DATADIR_BASE -# @DESCRIPTION: -# Similar to GAMES_DATADIR, but only used when a package auto appends 'games' -# to the path. May be set by the user. -GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share} - -# @ECLASS-VARIABLE: GAMES_SYSCONFDIR -# @DESCRIPTION: -# Where to install global games configuration files, usually followed by -# package name. May be set by the user. -GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games} - -# @ECLASS-VARIABLE: GAMES_STATEDIR -# @DESCRIPTION: -# Where to install/store global variable game data, usually followed by -# package name. May be set by the user. -GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games} - -# @ECLASS-VARIABLE: GAMES_LOGDIR -# @DESCRIPTION: -# Where to store global game log files, usually followed by -# package name. May be set by the user. -GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games} - -# @ECLASS-VARIABLE: GAMES_BINDIR -# @DESCRIPTION: -# Where to install the game binaries. May be set by the user. This is in PATH. -GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin} - -# @ECLASS-VARIABLE: GAMES_ENVD -# @INTERNAL -# @DESCRIPTION: -# The games environment file name which sets games specific LDPATH and PATH. -GAMES_ENVD="90games" - -# @ECLASS-VARIABLE: GAMES_USER -# @DESCRIPTION: -# The USER who owns all game files and usually has write permissions. -# May be set by the user. -GAMES_USER=${GAMES_USER:-root} - -# @ECLASS-VARIABLE: GAMES_USER_DED -# @DESCRIPTION: -# The USER who owns all game files related to the dedicated server part -# of a package. May be set by the user. -GAMES_USER_DED=${GAMES_USER_DED:-games} - -# @ECLASS-VARIABLE: GAMES_GROUP -# @DESCRIPTION: -# The GROUP that owns all game files and usually does not have -# write permissions. May be set by the user. -# If you want games world-executable, then you can at least set this variable -# to 'users' which is almost the same. -GAMES_GROUP=${GAMES_GROUP:-games} - -# @FUNCTION: games_get_libdir -# @DESCRIPTION: -# Gets the directory where to install games libraries. This is in LDPATH. -games_get_libdir() { - echo ${GAMES_PREFIX}/$(get_libdir) -} - -# @FUNCTION: egamesconf -# @USAGE: [...] -# @DESCRIPTION: -# Games equivalent to 'econf' for autotools based build systems. It passes -# the necessary games specific directories automatically. -egamesconf() { - # handle verbose build log pre-EAPI5 - local _gamesconf - if has "${EAPI:-0}" 0 1 2 3 4 ; then - if grep -q -s disable-silent-rules "${ECONF_SOURCE:-.}"/configure ; then - _gamesconf="--disable-silent-rules" - fi - fi - - # bug 493954 - if grep -q -s datarootdir "${ECONF_SOURCE:-.}"/configure ; then - _gamesconf="${_gamesconf} --datarootdir=/usr/share" - fi - - econf \ - --prefix="${GAMES_PREFIX}" \ - --libdir="$(games_get_libdir)" \ - --datadir="${GAMES_DATADIR}" \ - --sysconfdir="${GAMES_SYSCONFDIR}" \ - --localstatedir="${GAMES_STATEDIR}" \ - ${_gamesconf} \ - "$@" -} - -# @FUNCTION: gameswrapper -# @USAGE: [...] -# @INTERNAL -# @DESCRIPTION: -# Wraps an install command like dobin, dolib etc, so that -# it has GAMES_PREFIX as prefix. -gameswrapper() { - # dont want to pollute calling env - ( - into "${GAMES_PREFIX}" - cmd=$1 - shift - ${cmd} "$@" - ) -} - -# @FUNCTION: dogamesbin -# @USAGE: ... -# @DESCRIPTION: -# Install one or more games binaries. -dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: dogamessbin -# @USAGE: ... -# @DESCRIPTION: -# Install one or more games system binaries. -dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: dogameslib -# @USAGE: ... -# @DESCRIPTION: -# Install one or more games libraries. -dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: dogameslib.a -# @USAGE: ... -# @DESCRIPTION: -# Install one or more static games libraries. -dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: dogameslib.so -# @USAGE: ... -# @DESCRIPTION: -# Install one or more shared games libraries. -dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: newgamesbin -# @USAGE: -# @DESCRIPTION: -# Install one games binary with a new name. -newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: newgamessbin -# @USAGE: -# @DESCRIPTION: -# Install one system games binary with a new name. -newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; } - -# @FUNCTION: games_make_wrapper -# @USAGE: [chdir] [libpaths] [installpath] -# @DESCRIPTION: -# Create a shell wrapper script named wrapper in installpath -# (defaults to the games bindir) to execute target (default of wrapper) by -# first optionally setting LD_LIBRARY_PATH to the colon-delimited -# libpaths followed by optionally changing directory to chdir. -games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; } - -# @FUNCTION: gamesowners -# @USAGE: [...] ... -# @DESCRIPTION: -# Run 'chown' with the given args on the given files. Owner and -# group are GAMES_USER and GAMES_GROUP and must not be passed -# as args. -gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; } - -# @FUNCTION: gamesperms -# @USAGE: ... -# @DESCRIPTION: -# Run 'chmod' with games specific permissions on the given files. -gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; } - -# @FUNCTION: prepgamesdirs -# @DESCRIPTION: -# Fix all permissions/owners of files in games related directories, -# usually called at the end of src_install(). -prepgamesdirs() { - local dir f mode - for dir in \ - "${GAMES_PREFIX}" "${GAMES_PREFIX_OPT}" "${GAMES_DATADIR}" \ - "${GAMES_SYSCONFDIR}" "${GAMES_STATEDIR}" "$(games_get_libdir)" \ - "${GAMES_BINDIR}" "$@" - do - [[ ! -d ${D}/${dir} ]] && continue - ( - gamesowners -R "${D}/${dir}" - find "${D}/${dir}" -type d -print0 | xargs -0 chmod 750 - mode=o-rwx,g+r,g-w - [[ ${dir} = ${GAMES_STATEDIR} ]] && mode=o-rwx,g+r - find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode - - # common trees should not be games owned #264872 #537580 - fowners root:0 "${dir}" - fperms 755 "${dir}" - if [[ ${dir} == "${GAMES_PREFIX}" \ - || ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then - for d in $(get_libdir) bin ; do - # check if dirs exist to avoid "nonfatal" option - if [[ -e ${D}/${dir}/${d} ]] ; then - fowners root:0 "${dir}/${d}" - fperms 755 "${dir}/${d}" - fi - done - fi - ) &>/dev/null - - f=$(find "${D}/${dir}" -perm +4000 -a -uid 0 2>/dev/null) - if [[ -n ${f} ]] ; then - eerror "A game was detected that is setuid root!" - eerror "${f}" - die "refusing to merge a setuid root game" - fi - done - [[ -d ${D}/${GAMES_BINDIR} ]] || return 0 - find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \; -} - -# @FUNCTION: games_pkg_setup -# @DESCRIPTION: -# Export some toolchain specific variables and create games related groups -# and users. This function is exported as pkg_setup(). -games_pkg_setup() { - tc-export CC CXX LD AR RANLIB - - enewgroup "${GAMES_GROUP}" 35 - [[ ${GAMES_USER} != "root" ]] \ - && enewuser "${GAMES_USER}" 35 -1 "${GAMES_PREFIX}" "${GAMES_GROUP}" - [[ ${GAMES_USER_DED} != "root" ]] \ - && enewuser "${GAMES_USER_DED}" 36 /bin/bash "${GAMES_PREFIX}" "${GAMES_GROUP}" - - # Dear portage team, we are so sorry. Lots of love, games team. - # See Bug #61680 - [[ ${USERLAND} != "GNU" ]] && return 0 - [[ $(egetshell "${GAMES_USER_DED}") == "/bin/false" ]] \ - && usermod -s /bin/bash "${GAMES_USER_DED}" -} - -# @FUNCTION: games_src_configure -# @DESCRIPTION: -# Runs egamesconf if there is a configure file. -# This function is exported as src_configure(). -games_src_configure() { - [[ -x "${ECONF_SOURCE:-.}"/configure ]] && egamesconf -} - -# @FUNCTION: games_src_compile -# @DESCRIPTION: -# Runs base_src_make(). This function is exported as src_compile(). -games_src_compile() { - case ${EAPI:-0} in - 0|1) games_src_configure ;; - esac - base_src_make -} - -# @FUNCTION: games_pkg_preinst -# @DESCRIPTION: -# Synchronizes GAMES_STATEDIR of the ebuild image with the live filesystem. -games_pkg_preinst() { - local f - - while read f ; do - if [[ -e ${ROOT}/${GAMES_STATEDIR}/${f} ]] ; then - cp -p \ - "${ROOT}/${GAMES_STATEDIR}/${f}" \ - "${D}/${GAMES_STATEDIR}/${f}" \ - || die "cp failed" - # make the date match the rest of the install - touch "${D}/${GAMES_STATEDIR}/${f}" - fi - done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null) -} - -# @FUNCTION: games_pkg_postinst -# @DESCRIPTION: -# Prints some warnings and infos, also related to games groups. -games_pkg_postinst() { - if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then - ewarn "Remember, in order to play games, you have to" - ewarn "be in the '${GAMES_GROUP}' group." - echo - case ${CHOST} in - *-darwin*) ewarn "Just run 'niutil -appendprop / /groups/games users '";; - *-freebsd*|*-dragonfly*) ewarn "Just run 'pw groupmod ${GAMES_GROUP} -m '";; - *) ewarn "Just run 'gpasswd -a ${GAMES_GROUP}', then have re-login.";; - esac - echo - einfo "For more info about Gentoo gaming in general, see our website:" - einfo " https://games.gentoo.org/" - echo - fi -} - -# @FUNCTION: games_ut_unpack -# @USAGE: -# @DESCRIPTION: -# Unpack .uz2 files for UT2003/UT2004. -games_ut_unpack() { - local ut_unpack="$1" - local f= - - if [[ -z ${ut_unpack} ]] ; then - die "You must provide an argument to games_ut_unpack" - fi - if [[ -f ${ut_unpack} ]] ; then - uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" \ - || die "uncompressing file ${ut_unpack}" - fi - if [[ -d ${ut_unpack} ]] ; then - while read f ; do - uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \ - || die "uncompressing file ${f}" - rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}" - done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null) - fi -} - -# @FUNCTION: games_umod_unpack -# @USAGE: -# @DESCRIPTION: -# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004. -# Don't forget to set 'dir' and 'Ddir'. -games_umod_unpack() { - local umod=$1 - mkdir -p "${Ddir}"/System - cp "${dir}"/System/{ucc-bin,{Manifest,Def{ault,User}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System - cd "${Ddir}"/System - UT_DATA_PATH=${Ddir}/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \ - || die "uncompressing file ${umod}" - rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \ - || die "Removing temporary files" -} - -fi diff --git a/eclass/golang-build.eclass b/eclass/golang-build.eclass deleted file mode 100644 index c76a1865a4..0000000000 --- a/eclass/golang-build.eclass +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: golang-build.eclass -# @MAINTAINER: -# William Hubbs -# @SUPPORTED_EAPIS: 5 6 7 -# @BLURB: Eclass for compiling go packages. -# @DESCRIPTION: -# This eclass provides default src_compile, src_test and src_install -# functions for software written in the Go programming language. - -inherit golang-base - -case "${EAPI:-0}" in - 5|6|7) - ;; - *) - die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" - ;; -esac - -EXPORT_FUNCTIONS src_compile src_install src_test - -if [[ -z ${_GOLANG_BUILD} ]]; then - -_GOLANG_BUILD=1 - -# @ECLASS-VARIABLE: EGO_BUILD_FLAGS -# @DEFAULT_UNSET -# @DESCRIPTION: -# This allows you to pass build flags to the Go compiler. These flags -# are common to the "go build" and "go install" commands used below. -# Please emerge dev-lang/go and run "go help build" for the -# documentation for these flags. -# -# Example: -# @CODE -# EGO_BUILD_FLAGS="-ldflags \"-X main.version ${PV}\"" -# @CODE - -# @ECLASS-VARIABLE: EGO_PN -# @REQUIRED -# @DESCRIPTION: -# This is the import path for the go package(s) to build. Please emerge -# dev-lang/go and read "go help importpath" for syntax. -# -# Example: -# @CODE -# EGO_PN=github.com/user/package -# @CODE - -golang-build_src_compile() { - debug-print-function ${FUNCNAME} "$@" - - ego_pn_check - set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - GOCACHE="${T}/go-cache" \ - go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - echo "$@" - "$@" || die -} - -golang-build_src_install() { - debug-print-function ${FUNCNAME} "$@" - - ego_pn_check - set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - echo "$@" - "$@" || die - golang_install_pkgs -} - -golang-build_src_test() { - debug-print-function ${FUNCNAME} "$@" - - ego_pn_check - set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go test -v -work -x "${EGO_PN}" - echo "$@" - "$@" || die -} - -fi diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass deleted file mode 100644 index 1fd4feb391..0000000000 --- a/eclass/java-ant-2.eclass +++ /dev/null @@ -1,426 +0,0 @@ -# Copyright 2004-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: java-ant-2.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# kiorky (kiorky@cryptelium.net), Petteri Räty (betelgeuse@gentoo.org) -# @BLURB: eclass for ant based Java packages -# @DESCRIPTION: -# Eclass for Ant-based Java packages. Provides support for both automatic and -# manual manipulation of build.xml files. Should be inherited after java-pkg-2 -# or java-pkg-opt-2 eclass. - -inherit java-utils-2 multilib - -# This eclass provides functionality for Java packages which use -# ant to build. In particular, it will attempt to fix build.xml files, so that -# they use the appropriate 'target' and 'source' attributes. - -# @ECLASS-VARIABLE: WANT_ANT_TASKS -# @DEFAULT_UNSET -# @DESCRIPTION: -# An $IFS separated list of ant tasks. -# Ebuild can specify this variable before inheriting java-ant-2 eclass to -# determine ANT_TASKS it needs. They will be automatically translated to -# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override -# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching. -# Ebuilds that need to depend conditionally on certain tasks and specify them -# differently for different eant calls can't use this simplified approach. -# You also cannot specify version or anything else than ant-*. -# -# @CODE -# WANT_ANT_TASKS="ant-junit ant-trax" -# @CODE - -#The implementation of dependencies is handled by java-utils-2.eclass -#WANT_ANT_TASKS - -# @ECLASS-VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP -# @DEFAULT_UNSET -# @DESCRIPTION: -# Setting this variable non-empty before inheriting java-ant-2 disables adding -# dev-java/ant-core into DEPEND. -if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2" - [[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0" -fi - -# add ant tasks specified in WANT_ANT_TASKS to DEPEND -local ANT_TASKS_DEPEND; -ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)" -# check that java-pkg_ant-tasks-depend didn't fail -if [[ $? != 0 ]]; then - eerror "${ANT_TASKS_DEPEND}" - die "java-pkg_ant-tasks-depend() failed" -fi - -# We need some tools from javatoolkit. We also need ant dependencies -# constructed above. -JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} - ${ANT_TASKS_DEPEND} - >=dev-java/javatoolkit-0.3.0-r2" - -# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 -# if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag -if has java-pkg-opt-2 ${INHERITED}; then - JAVA_ANT_E_DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_ANT_E_DEPEND} )" -elif ! has java-pkg-2 ${INHERITED}; then - eerror "java-ant-2 eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" -fi - -DEPEND="${JAVA_ANT_E_DEPEND}" - -# @ECLASS-VARIABLE: JAVA_PKG_BSFIX -# @DESCRIPTION: -# Should we attempt to 'fix' ant build files to include the source/target -# attributes when calling javac? -JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"} - -# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_ALL -# @DESCRIPTION: -# If we're fixing build files, should we try to fix all the ones we can find? -JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"} - -# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_NAME -# @DESCRIPTION: -# Filename of build files to fix/search for -JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"} - -# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_TARGET_TAGS -# @DESCRIPTION: -# Targets to fix the 'source' attribute in -JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"} - -# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_SOURCE_TAGS -# @DESCRIPTION: -# Targets to fix the 'target' attribute in -JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"} - -# @ECLASS-VARIABLE: JAVA_ANT_CLASSPATH_TAGS -# @DESCRIPTION: -# Targets to add the classpath attribute to -JAVA_ANT_CLASSPATH_TAGS="javac xjavac" - -# @ECLASS-VARIABLE: JAVA_ANT_IGNORE_SYSTEM_CLASSES -# @DEFAULT_UNSET -# @DESCRIPTION: -# When set, Ant tasks are rewritten to ignore Ant's runtime classpath. - -case "${EAPI:-0}" in - 0|1) : ;; - *) EXPORT_FUNCTIONS src_configure ;; -esac - -# @FUNCTION: java-ant-2_src_configure -# @DESCRIPTION: -# src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1. -java-ant-2_src_configure() { - # if java support is optional, don't perform this when the USE flag is off - if has java-pkg-opt-2 ${INHERITED}; then - use ${JAVA_PKG_OPT_USE} || return - fi - - # eant will call us unless called by Portage - [[ -e "${T}/java-ant-2_src_configure-run" ]] && return - - [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" ]] \ - && java-ant_ignore-system-classes "${S}/build.xml" - - java-ant_bsfix - touch "${T}/java-ant-2_src_configure-run" -} - -# @FUNCTION: java-ant_bsfix -# @INTERNAL -# @DESCRIPTION: -# Attempts to fix build files. -# -# @CODE -# Affected by variables: -# JAVA_PKG_BSFIX -# JAVA_PKG_BSFIX_ALL -# JAVA_PKG_BSFIX_NAME, -# @CODE -java-ant_bsfix() { - debug-print-function ${FUNCNAME} $* - - [[ "${JAVA_PKG_BSFIX}" != "on" ]] && return - if ! java-pkg_needs-vm; then - echo "QA Notice: Package is using java-ant, but doesn't depend on a Java VM" - fi - - pushd "${S}" >/dev/null || die - - local find_args="" - [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1" - - find_args="${find_args} -type f ( -name ${JAVA_PKG_BSFIX_NAME// / -o -name } )" - - local bsfix_these=() line - while IFS= read -r -d $'\0' line; do - bsfix_these+=( "${line}" ) - done < <(find . ${find_args} -print0) - - [[ "${bsfix_these[@]}" ]] && java-ant_bsfix_files "${bsfix_these[@]}" - - popd > /dev/null || die -} - -# @FUNCTION: java-ant_bsfix_files -# @USAGE: [path/to/second.build.xml ...] -# @DESCRIPTION: -# Attempts to fix named build files. -# -# @CODE -# Affected by variables: -# JAVA_PKG_BSFIX_SOURCE_TAGS -# JAVA_PKG_BSFIX_TARGET_TAGS -# JAVA_ANT_REWRITE_CLASSPATH -# JAVA_ANT_JAVADOC_INPUT_DIRS: Where we can find java sources for javadoc -# input. Can be a space separated list of -# directories -# JAVA_ANT_BSFIX_EXTRA_ARGS: You can use this to pass extra variables to the -# rewriter if you know what you are doing. -# @CODE -# -# If JAVA_ANT_JAVADOC_INPUT_DIRS is set, we will turn on the adding of a basic -# javadoc target to the ant's build.xml with the javadoc xml-rewriter feature. -# Then we will set EANT DOC TARGET to the added javadoc target -# NOTE: the variable JAVA_ANT_JAVADOC_OUTPUT_DIR points where we will -# generate the javadocs. This is a read-only variable, dont change it. - -# When changing this function, make sure that it works with paths with spaces in -# them. -java-ant_bsfix_files() { - debug-print-function ${FUNCNAME} $* - - [[ ${#} = 0 ]] && die "${FUNCNAME} called without arguments" - - local want_source="$(java-pkg_get-source)" - local want_target="$(java-pkg_get-target)" - - debug-print "${FUNCNAME}: target: ${want_target} source: ${want_source}" - - if [ -z "${want_source}" -o -z "${want_target}" ]; then - eerror "Could not find valid -source/-target values" - eerror "Please file a bug about this on bugs.gentoo.org" - die "Could not find valid -source/-target values" - else - local files=() - - for file in "${@}"; do - debug-print "${FUNCNAME}: ${file}" - - if [[ -n "${JAVA_PKG_DEBUG}" ]]; then - cp "${file}" "${file}.orig" || die "failed to copy ${file}" - fi - - if [[ ! -w "${file}" ]]; then - chmod u+w "${file}" || die "chmod u+w ${file} failed" - fi - - files+=( -f "${file}" ) - done - - local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" - local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" - - if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then - [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" - [[ ${JAVA_ANT_ENCODING} ]] && local enc="-e ${JAVA_ANT_ENCODING}" - echo "cElementTree rewriter" - debug-print "${rewriter4} extra args: ${gcp} ${enc}" - ${rewriter4} ${gcp} ${enc} \ - -c "${JAVA_PKG_BSFIX_SOURCE_TAGS}" source ${want_source} \ - -c "${JAVA_PKG_BSFIX_TARGET_TAGS}" target ${want_target} \ - "${@}" || die "build-xml-rewrite failed" - else - debug-print "Using third generation rewriter" - echo "Rewriting attributes" - local bsfix_extra_args=() - # WARNING KEEP THE ORDER, ESPECIALLY FOR CHANGED ATTRIBUTES! - if [[ -n ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then - local cp_tags="${JAVA_ANT_CLASSPATH_TAGS// / -e }" - bsfix_extra_args+=( -g -e ${cp_tags} ) - bsfix_extra_args+=( -a classpath -v '${gentoo.classpath}' ) - fi - if [[ -n ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]]; then - if [[ -n ${JAVA_ANT_JAVADOC_OUTPUT_DIR} ]]; then - die "Do not define JAVA_ANT_JAVADOC_OUTPUT_DIR!" - fi - # Where will our generated javadoc go. - readonly JAVA_ANT_JAVADOC_OUTPUT_DIR="${WORKDIR}/gentoo_javadoc" - mkdir -p "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" || die - - if has doc ${IUSE}; then - if use doc; then - if [[ -z ${EANT_DOC_TARGET} ]]; then - EANT_DOC_TARGET="gentoojavadoc" - else - die "You can't use javadoc adding and set EANT_DOC_TARGET too." - fi - - for dir in ${JAVA_ANT_JAVADOC_INPUT_DIRS};do - if [[ ! -d ${dir} ]]; then - eerror "This dir: ${dir} doesnt' exists" - die "You must specify directories for javadoc input/output dirs." - fi - done - bsfix_extra_args+=( --javadoc --source-directory ) - # filter third/double spaces - JAVA_ANT_JAVADOC_INPUT_DIRS=${JAVA_ANT_JAVADOC_INPUT_DIRS// /} - JAVA_ANT_JAVADOC_INPUT_DIRS=${JAVA_ANT_JAVADOC_INPUT_DIRS// /} - bsfix_extra_args+=( ${JAVA_ANT_JAVADOC_INPUT_DIRS// / --source-directory } ) - bsfix_extra_args+=( --output-directory "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" ) - fi - else - die "You need to have doc in IUSE when using JAVA_ANT_JAVADOC_INPUT_DIRS" - fi - fi - - [[ -n ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ - && bsfix_extra_args+=( ${JAVA_ANT_BSFIX_EXTRA_ARGS} ) - - debug-print "bsfix_extra_args: ${bsfix_extra_args[*]}" - - ${rewriter3} "${files[@]}" \ - -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source-element } \ - --source-attribute source --source-value ${want_source} \ - --target-element ${JAVA_PKG_BSFIX_TARGET_TAGS// / --target-element } \ - --target-attribute target --target-value ${want_target} \ - --target-attribute nowarn --target-value yes \ - "${bsfix_extra_args[@]}" \ - || die "xml-rewrite-3 failed: ${file}" - fi - - if [[ -n "${JAVA_PKG_DEBUG}" ]]; then - for file in "${@}"; do - diff -NurbB "${file}.orig" "${file}" - done - fi - fi - return 0 # so that the 1 for diff doesn't get reported -} - - -# @FUNCTION: java-ant_bsfix_one -# @USAGE: -# @DESCRIPTION: -# Attempts to fix named build file. -# -# @CODE -# Affected by variables: -# JAVA_PKG_BSFIX_SOURCE_TAGS -# JAVA_PKG_BSFIX_TARGET_TAGS -# @CODE -java-ant_bsfix_one() { - debug-print-function ${FUNCNAME} $* - - if [ -z "${1}" ]; then - eerror "${FUNCNAME} needs one argument" - die "${FUNCNAME} needs one argument" - fi - - java-ant_bsfix_files "${1}" -} - -# @FUNCTION: java-ant_rewrite-classpath -# @USAGE: [path/to/build.xml] -# @DESCRIPTION: -# Adds 'classpath="${gentoo.classpath}"' to specified build file. -# -# Affected by: -# JAVA_ANT_CLASSPATH_TAGS -# -# Parameter defaults to build.xml when not specified -java-ant_rewrite-classpath() { - debug-print-function ${FUNCNAME} $* - - local file="${1}" - [[ -z "${1}" ]] && file=build.xml - [[ ${#} -gt 1 ]] && die "${FUNCNAME} currently can only rewrite one file." - - echo "Adding gentoo.classpath to ${file}" - debug-print "java-ant_rewrite-classpath: ${file}" - - cp "${file}" "${file}.orig" || die "failed to copy ${file}" - - chmod u+w "${file}" - - java-ant_xml-rewrite -f "${file}" --change \ - -e ${JAVA_ANT_CLASSPATH_TAGS// / -e } -a classpath -v '${gentoo.classpath}' - - if [[ -n "${JAVA_PKG_DEBUG}" ]]; then - diff -NurbB "${file}.orig" "${file}" - fi -} - -# @FUNCTION: java-ant_ignore-system-classes -# @USAGE: [path/to/build.xml] -# @DESCRIPTION: -# Makes the available task ignore classes in the system classpath -# Parameter defaults to build.xml when not specified -java-ant_ignore-system-classes() { - debug-print-function ${FUNCNAME} $* - local file=${1:-build.xml} - echo "Changing ignoresystemclasses to true for available tasks in ${file}" - java-ant_xml-rewrite -f "${file}" --change \ - -e available -a ignoresystemclasses -v "true" -} - -# @FUNCTION: java-ant_xml-rewrite -# @USAGE: -# @DESCRIPTION: -# Run the right xml-rewrite binary with the given arguments -java-ant_xml-rewrite() { - local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" - local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" - # gen1 is deprecated - if [[ -x "${gen2}" ]]; then - ${gen2} "${@}" || die "${gen2} failed" - elif [[ -x "${gen2_1}" ]]; then - ${gen2_1} "${@}" || die "${gen2_1} failed" - else - eerror "No binary for rewriting found." - eerror "Do you have dev-java/javatoolkit installed?" - die "xml-rewrite not found" - fi -} - -# @FUNCTION: java-ant_rewrite-bootclasspath -# @USAGE: [path/to/build.xml] [prepend] [append] -# @DESCRIPTION: -# Adds bootclasspath to javac-like tasks in build.xml filled with jars of a -# bootclasspath package of given version. -# -# @CODE -# Affected by: -# JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks -# -# Parameters: -# $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath -# of the current JDK -# $2 - path to desired build.xml file, defaults to 'build.xml' -# $3 - (optional) what to prepend the bootclasspath with (to override) -# $4 - (optional) what to append to the bootclasspath -# @CODE -java-ant_rewrite-bootclasspath() { - local version="${1}" - local file="${2-build.xml}" - local extra_before="${3}" - local extra_after="${4}" - - local bcp="$(java-pkg_get-bootclasspath "${version}")" - - if [[ -n "${extra_before}" ]]; then - bcp="${extra_before}:${bcp}" - fi - if [[ -n "${extra_after}" ]]; then - bcp="${bcp}:${extra_after}" - fi - - java-ant_xml-rewrite -f "${file}" -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \ - -a bootclasspath -v "${bcp}" -} diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass deleted file mode 100644 index bb8c1d8575..0000000000 --- a/eclass/java-osgi.eclass +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 2007-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: java-osgi.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Java maintainers (java@gentoo.org) -# @BLURB: Java OSGi eclass -# @DESCRIPTION: -# This eclass provides functionality which is used by packages that need to be -# OSGi compliant. This means that the generated jars will have special headers -# in their manifests. Currently this is used only by Eclipse-3.3 - later we -# could extend this so that Gentoo Java system would be fully OSGi compliant. - -inherit java-utils-2 - -# @ECLASS-VARIABLE: _OSGI_T -# @INTERNAL -# @DESCRIPTION: -# We define _OSGI_T so that it does not contain a slash at the end. -# According to Paludis guys, there is currently a proposal for EAPIs that -# would require all variables to end with a slash. -_OSGI_T="${T/%\//}" - -# must get Diego to commit something like this to portability.eclass -_canonicalise() { - if type -p realpath > /dev/null; then - realpath "${@}" - elif type -p readlink > /dev/null; then - readlink -f "${@}" - else - # can't die, subshell - eerror "No readlink nor realpath found, cannot canonicalise" - fi -} - -# @FUNCTION: _java-osgi_plugin -# @USAGE: -# @INTERNAL -# @DESCRIPTION: -# This is an internal function, not to be called directly. -# -# @CODE -# _java-osgi_plugin "JSch" -# @CODE -# -# @param $1 - bundle name -_java-osgi_plugin() { - # We hardcode Gentoo as the vendor name - - cat > "${_OSGI_T}/tmp_jar/plugin.properties" <<-EOF - bundleName="${1}" - vendorName="Gentoo" - EOF -} - -# @FUNCTION: _java-osgi_makejar -# @USAGE:
-# @INTERNAL -# @DESCRIPTION: -# This is an internal function, not to be called directly. -# -# @CODE -# _java-osgi_makejar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" -# @CODE -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 - bundle symbolic name -# @param $3 - bundle name -# @param $4 - export-package header -_java-osgi_makejar() { - debug-print-function ${FUNCNAME} "$@" - - (( ${#} < 4 )) && die "Four arguments are needed for _java-osgi_makejar()" - - local absoluteJarPath="$(_canonicalise ${1})" - local jarName="$(basename ${1})" - - mkdir "${_OSGI_T}/tmp_jar" || die "Unable to create directory ${_OSGI_T}/tmp_jar" - [[ -d "${_OSGI_T}/osgi" ]] || mkdir "${_OSGI_T}/osgi" || die "Unable to create directory ${_OSGI_T}/osgi" - - cd "${_OSGI_T}/tmp_jar" && jar xf "${absoluteJarPath}" && cd - > /dev/null \ - || die "Unable to uncompress correctly the original jar" - - cat > "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" <<-EOF - Manifest-Version: 1.0 - Bundle-ManifestVersion: 2 - Bundle-Name: %bundleName - Bundle-Vendor: %vendorName - Bundle-Localization: plugin - Bundle-SymbolicName: ${2} - Bundle-Version: ${PV} - Export-Package: ${4} - EOF - - _java-osgi_plugin "${3}" - - jar cfm "${_OSGI_T}/osgi/${jarName}" "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" \ - -C "${_OSGI_T}/tmp_jar/" . > /dev/null || die "Unable to recreate the OSGi compliant jar" - rm -rf "${_OSGI_T}/tmp_jar" -} - -# @FUNCTION: @java-osgi_dojar -# @USAGE:
-# @DESCRIPTION: -# Rewrites a jar, and produce an OSGi compliant jar from arguments given on the command line. -# The arguments given correspond to the minimal set of headers -# that must be present on a Manifest file of an OSGi package. -# If you need more headers, you should use the *-fromfile functions below, -# that create the Manifest from a file. -# It will call java-pkg_dojar at the end. -# -# @CODE -# java-osgi_dojar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" -# @CODE -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 - bundle symbolic name -# @param $3 - bundle name -# @param $4 - export-package-header -java-osgi_dojar() { - debug-print-function ${FUNCNAME} "$@" - local jarName="$(basename ${1})" - _java-osgi_makejar "$@" - java-pkg_dojar "${_OSGI_T}/osgi/${jarName}" -} - -# @FUNCTION: java-osgi_newjar -# @USAGE:
-# @DESCRIPTION: -# Rewrites a jar, and produce an OSGi compliant jar. -# The arguments given correspond to the minimal set of headers -# that must be present on a Manifest file of an OSGi package. -# If you need more headers, you should use the *-fromfile functions below, -# that create the Manifest from a file. -# It will call java-pkg_newjar at the end. -# -# @CODE -# java-osgi_newjar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" -# @CODE -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 (optional) - name of the target jar. It will default to package name if not specified. -# @param $3 - bundle symbolic name -# @param $4 - bundle name -# @param $5 - export-package header -java-osgi_newjar() { - debug-print-function ${FUNCNAME} "$@" - local jarName="$(basename $1)" - - if (( ${#} > 4 )); then - _java-osgi_makejar "${1}" "${3}" "${4}" "${5}" - java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" "${2}" - else - _java-osgi_makejar "$@" - java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" - fi -} - -# @FUNCTION:_java-osgi_makejar-fromfile -# @USAGE: -# @INTERNAL -# @DESCRIPTION: -# This is an internal function, not to be called directly. -# -# @CODE -# _java-osgi_makejar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "JSch" 1 -# @CODE -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 - path to the Manifest file -# @param $3 - bundle name -# @param $4 - automatic version rewriting (0 or 1) -_java-osgi_makejar-fromfile() { - debug-print-function ${FUNCNAME} "$@" - - ((${#} < 4)) && die "Four arguments are needed for _java-osgi_makejar-fromfile()" - - local absoluteJarPath="$(_canonicalise ${1})" - local jarName="$(basename ${1})" - - mkdir "${_OSGI_T}/tmp_jar" || die "Unable to create directory ${_OSGI_T}/tmp_jar" - [[ -d "${_OSGI_T}/osgi" ]] || mkdir "${_OSGI_T}/osgi" || die "Unable to create directory ${_OSGI_T}/osgi" - - cd "${_OSGI_T}/tmp_jar" && jar xf "${absoluteJarPath}" && cd - > /dev/null \ - || die "Unable to uncompress correctly the original jar" - - [[ -e "${2}" ]] || die "Manifest file ${2} not found" - - # We automatically change the version if automatic version rewriting is on - - if (( ${4} )); then - cat "${2}" | sed "s/Bundle-Version:.*/Bundle-Version: ${PV}/" > \ - "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" - else - cat "${2}" > "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" - fi - - _java-osgi_plugin "${3}" - - jar cfm "${_OSGI_T}/osgi/${jarName}" "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" \ - -C "${_OSGI_T}/tmp_jar/" . > /dev/null || die "Unable to recreate the OSGi compliant jar" - rm -rf "${_OSGI_T}/tmp_jar" -} - -# @FUNCTION: java-osgi_newjar-fromfile -# @USAGE: -# @DESCRIPTION: -# This function produces an OSGi compliant jar from a given manifest file. -# The Manifest Bundle-Version header will be replaced by the current version -# of the package, unless the --no-auto-version option is given. -# It will call java-pkg_newjar at the end. -# -# @CODE -# java-osgi_newjar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0" -# @CODE -# -# @param $opt -# --no-auto-version - This option disables automatic rewriting of the -# version in the Manifest file -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 (optional) - name of the target jar. It will default to package name if not specified. -# @param $3 - path to the Manifest file -# @param $4 - bundle name -java-osgi_newjar-fromfile() { - debug-print-function ${FUNCNAME} "$@" - local versionRewriting=1 - - if [[ "${1}" == "--no-auto-version" ]]; then - versionRewriting=0 - shift - fi - local jarName="$(basename ${1})" - - if (( ${#} > 3 )); then - _java-osgi_makejar-fromfile "${1}" "${3}" "${4}" "${versionRewriting}" - java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" "${2}" - else - _java-osgi_makejar-fromfile "$@" "${versionRewriting}" - java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" - fi -} - -# @FUNCTION: java-osgi_dojar-fromfile -# @USAGE: -# @DESCRIPTION: -# This function produces an OSGi compliant jar from a given manifestfile. -# The Manifest Bundle-Version header will be replaced by the current version -# of the package, unless the --no-auto-version option is given. -# It will call java-pkg_dojar at the end. -# -# @CODE -# java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0" -# @CODE -# -# @param $opt -# --no-auto-version - This option disables automatic rewriting of the -# version in the Manifest file -# -# @param $1 - name of jar to repackage with OSGi -# @param $2 - path to the Manifest file -# @param $3 - bundle name -java-osgi_dojar-fromfile() { - debug-print-function ${FUNCNAME} "$@" - local versionRewriting=1 - - if [[ "${1}" == "--no-auto-version" ]]; then - versionRewriting=0 - shift - fi - local jarName="$(basename ${1})" - - _java-osgi_makejar-fromfile "$@" "${versionRewriting}" - java-pkg_dojar "${_OSGI_T}/osgi/${jarName}" -} diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass deleted file mode 100644 index bd5e92da6a..0000000000 --- a/eclass/java-pkg-2.eclass +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 2004-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: java-pkg-2.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Thomas Matthijs -# @BLURB: Eclass for Java Packages -# @DESCRIPTION: -# This eclass should be inherited for pure Java packages, or by packages which -# need to use Java. - -inherit java-utils-2 - -# @ECLASS-VARIABLE: JAVA_PKG_IUSE -# @DEFAULT_UNSET -# @DESCRIPTION: -# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that -# the eclass can automatically add the needed dependencies for the java-pkg_do* -# functions. -IUSE="${JAVA_PKG_IUSE}" - -# Java packages need java-config, and a fairly new release of Portage. -# JAVA_PKG_E_DEPEND is defined in java-utils.eclass. -DEPEND="${JAVA_PKG_E_DEPEND}" - -# Nothing special for RDEPEND... just the same as DEPEND. -RDEPEND="${DEPEND}" - -# Commons packages follow the same rules so do it here -if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then - HOMEPAGE="http://commons.apache.org/${PN#commons-}/" - SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" -fi - -case "${EAPI:-0}" in - 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst ;; - *) EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst ;; -esac - -# @FUNCTION: java-pkg-2_pkg_setup -# @DESCRIPTION: -# pkg_setup initializes the Java environment - -java-pkg-2_pkg_setup() { - java-pkg_init -} - - -# @FUNCTION: java-pkg-2_src_prepare -# @DESCRIPTION: -# wrapper for java-utils-2_src_prepare - -java-pkg-2_src_prepare() { - java-utils-2_src_prepare -} - - -# @FUNCTION: java-pkg-2_src_compile -# @DESCRIPTION: -# Default src_compile for java packages -# -# @CODE -# Variables: -# EANT_BUILD_XML - controls the location of the build.xml (default: ./build.xml) -# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value -# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar) -# EANT_DOC_TARGET - the target to build extra docs under the doc use flag -# (default: javadoc; declare empty to disable completely) -# EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass -# EANT_EXTRA_ARGS - extra arguments to pass to eant -# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment -# @CODE - -java-pkg-2_src_compile() { - if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then - # auto generate classpath - java-pkg_gen-cp EANT_GENTOO_CLASSPATH - - [[ "${EANT_FILTER_COMPILER}" ]] && \ - java-pkg_filter-compiler ${EANT_FILTER_COMPILER} - local antflags="${EANT_BUILD_TARGET:=jar}" - if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then - antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" - fi - local tasks - [[ ${EANT_ANT_TASKS} ]] && tasks="${ANT_TASKS} ${EANT_ANT_TASKS}" - ANT_TASKS="${tasks:-${ANT_TASKS}}" \ - eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" - else - echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do." - fi -} - -# @FUNCTION: java-pkg-2_src_test -# @DESCRIPTION: -# src_test, not exported. - -java-pkg-2_src_test() { - [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return - - if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "]*\bname=[\"']test[\"']"; then - local opts task_re junit_re pkg - - if [[ ${EANT_TEST_JUNIT_INTO} ]]; then - java-pkg_jar-from --into "${EANT_TEST_JUNIT_INTO}" junit - fi - - if [[ ${EANT_TEST_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH="${EANT_TEST_GENTOO_CLASSPATH}" - fi - - ANT_TASKS=${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}} - - task_re="\bdev-java/ant-junit(4)?(-[^:]+)?(:\S+)\b" - junit_re="\bdev-java/junit(-[^:]+)?(:\S+)\b" - - if [[ ${DEPEND} =~ ${task_re} ]]; then - pkg="ant-junit${BASH_REMATCH[1]}${BASH_REMATCH[3]}" - pkg="${pkg%:0}" - - if [[ ${ANT_TASKS} && "${ANT_TASKS}" != none ]]; then - ANT_TASKS="${ANT_TASKS} ${pkg}" - else - ANT_TASKS="${pkg}" - fi - elif [[ ${DEPEND} =~ ${junit_re} ]]; then - pkg="junit${BASH_REMATCH[2]}" - pkg="${pkg%:0}" - - opts="-Djunit.jar=\"$(java-pkg_getjar ${pkg} junit.jar)\"" - - if [[ ${EANT_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH+=",${pkg}" - else - EANT_GENTOO_CLASSPATH="${pkg}" - fi - fi - - eant ${opts} -f "${EANT_BUILD_XML}" \ - ${EANT_EXTRA_ARGS} ${EANT_TEST_EXTRA_ARGS} ${EANT_TEST_TARGET:-test} - - else - echo "${FUNCNAME}: No test target in ${EANT_BUILD_XML}" - fi -} - -# @FUNCTION: java-pkg-2_pkg_preinst -# @DESCRIPTION: -# wrapper for java-utils-2_pkg_preinst - -java-pkg-2_pkg_preinst() { - java-utils-2_pkg_preinst -} diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass deleted file mode 100644 index 0b16cd5d40..0000000000 --- a/eclass/java-pkg-simple.eclass +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 2004-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: java-pkg-simple.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Java maintainers (java@gentoo.org) -# @BLURB: Eclass for packaging Java software with ease. -# @DESCRIPTION: -# This class is intended to build pure Java packages from Java sources -# without the use of any build instructions shipped with the sources. -# There is no support for resources besides the generated class files, -# or for generating source files, or for controlling the META-INF of -# the resulting jar, although these issues may be addressed by an -# ebuild by putting corresponding files into the target directory -# before calling the src_compile function of this eclass. - -inherit java-utils-2 - -if ! has java-pkg-2 ${INHERITED}; then - eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" -fi - -EXPORT_FUNCTIONS src_compile src_install - -# We are only interested in finding all java source files, wherever they may be. -S="${WORKDIR}" - -# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH -# @DEFAULT_UNSET -# @DESCRIPTION: -# Comma or space separated list of java packages to include in the -# class path. The packages will also be registered as runtime -# dependencies of this new package. Dependencies will be calculated -# transitively. See "java-config -l" for appropriate package names. -# -# @CODE -# JAVA_GENTOO_CLASSPATH="foo,bar-2" -# @CODE - -# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA -# @DEFAULT_UNSET -# @DESCRIPTION: -# Extra list of colon separated path elements to be put on the -# classpath when compiling sources. - -# @ECLASS-VARIABLE: JAVA_SRC_DIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# Directories relative to ${S} which contain the sources of the -# application. The default of "" will be treated mostly as ${S} -# itself. For the generated source package (if source is listed in -# ${JAVA_PKG_IUSE}), it is important that these directories are -# actually the roots of the corresponding source trees. -# -# @CODE -# JAVA_SRC_DIR="src/java/org/gentoo" -# @CODE - -# @ECLASS-VARIABLE: JAVA_ENCODING -# @DESCRIPTION: -# The character encoding used in the source files. -: ${JAVA_ENCODING:=UTF-8} - -# @ECLASS-VARIABLE: JAVAC_ARGS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Additional arguments to be passed to javac. - -# @ECLASS-VARIABLE: JAVADOC_ARGS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Additional arguments to be passed to javadoc. - -# @ECLASS-VARIABLE: JAVA_JAR_FILENAME -# @DESCRIPTION: -# The name of the jar file to create and install. -: ${JAVA_JAR_FILENAME:=${PN}.jar} - -# @FUNCTION: java-pkg-simple_src_compile -# @DESCRIPTION: -# src_compile for simple bare source java packages. Finds all *.java -# sources in ${JAVA_SRC_DIR}, compiles them with the classpath -# calculated from ${JAVA_GENTOO_CLASSPATH}, and packages the resulting -# classes to ${JAVA_JAR_FILENAME}. -java-pkg-simple_src_compile() { - local sources=sources.lst classes=target/classes apidoc=target/api - - # auto generate classpath - java-pkg_gen-cp JAVA_GENTOO_CLASSPATH - - # gather sources - find ${JAVA_SRC_DIR:-*} -name \*.java > ${sources} - mkdir -p ${classes} || die "Could not create target directory" - - # compile - local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency - for dependency in ${JAVA_GENTOO_CLASSPATH}; do - classpath="${classpath}:$(java-pkg_getjars ${dependency})" \ - || die "getjars failed for ${dependency}" - done - while [[ $classpath = *::* ]]; do classpath="${classpath//::/:}"; done - classpath=${classpath%:} - classpath=${classpath#:} - debug-print "CLASSPATH=${classpath}" - ejavac -d ${classes} -encoding ${JAVA_ENCODING} \ - ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} \ - @${sources} - - # javadoc - if has doc ${JAVA_PKG_IUSE} && use doc; then - mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" - fi - - # package - local jar_args="cf ${JAVA_JAR_FILENAME}" - if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then - jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" - fi - jar ${jar_args} -C ${classes} . || die "jar failed" -} - -# @FUNCTION: java-pkg-simple_src_install -# @DESCRIPTION: -# src_install for simple single jar java packages. Simply packages the -# contents from the target directory and installs it as -# ${JAVA_JAR_FILENAME}. If the file target/META-INF/MANIFEST.MF exists, -# it is used as the manifest of the created jar. -java-pkg-simple_src_install() { - local sources=sources.lst classes=target/classes apidoc=target/api - - # main jar - java-pkg_dojar ${JAVA_JAR_FILENAME} - - # javadoc - if has doc ${JAVA_PKG_IUSE} && use doc; then - java-pkg_dojavadoc ${apidoc} - fi - - # dosrc - if has source ${JAVA_PKG_IUSE} && use source; then - local srcdirs="" - if [[ ${JAVA_SRC_DIR} ]]; then - local parent child - for parent in ${JAVA_SRC_DIR}; do - for child in ${parent}/*; do - srcdirs="${srcdirs} ${child}" - done - done - else - # take all directories actually containing any sources - srcdirs="$(cut -d/ -f1 ${sources} | sort -u)" - fi - java-pkg_dosrc ${srcdirs} - fi -} diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass deleted file mode 100644 index 987ff44836..0000000000 --- a/eclass/java-virtuals-2.eclass +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: java-virtuals-2.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Original Author: Alistair John Bush -# @BLURB: Java virtuals eclass -# @DESCRIPTION: -# To provide a default (and only) src_install function for ebuilds in the -# java-virtuals category. - -inherit java-utils-2 - -DEPEND=">=dev-java/java-config-2.2.0-r3" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -EXPORT_FUNCTIONS src_install - -# @FUNCTION: java-virtuals-2_src_install -# @DESCRIPTION: -# default src_install - -java-virtuals-2_src_install() { - java-virtuals-2_do_write -} - -# @FUNCTION: java-pkg_do_virtuals_write -# @INTERNAL -# @DESCRIPTION: -# Writes the virtual env file out to disk. - -java-virtuals-2_do_write() { - java-pkg_init_paths_ - - dodir "${JAVA_PKG_VIRTUALS_PATH}" - { - if [[ -n "${JAVA_VIRTUAL_PROVIDES}" ]]; then - echo "PROVIDERS=\"${JAVA_VIRTUAL_PROVIDES}\"" - fi - - if [[ -n "${JAVA_VIRTUAL_VM}" ]]; then - echo "VM=\"${JAVA_VIRTUAL_VM}\"" - fi - - if [[ -n "${JAVA_VIRTUAL_VM_CLASSPATH}" ]]; then - echo "VM_CLASSPATH=\"${JAVA_VIRTUAL_VM_CLASSPATH}\"" - fi - echo "MULTI_PROVIDER=\"${JAVA_VIRTUAL_MULTI=FALSE}\"" - } > "${JAVA_PKG_VIRTUAL_PROVIDER}" -} diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass deleted file mode 100644 index 16b4f8d4c9..0000000000 --- a/eclass/leechcraft.eclass +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# @ECLASS: leechcraft.eclass -# @MAINTAINER: -# 0xd34df00d@gmail.com -# @AUTHOR: -# 0xd34df00d@gmail.com -# NightNord@niifaq.ru -# @SUPPORTED_EAPIS: 6 7 -# @BLURB: Common functions and setup utilities for the LeechCraft app -# @DESCRIPTION: -# The leechcraft eclass contains a common set of functions and steps -# needed to build LeechCraft core or its plugins. -# -# Though this eclass seems to be small at the moment, it seems like a -# good idea to make all plugins inherit from it, since all plugins -# have mostly the same configuring/build process. -# -# Thanks for original eclass to Andrian Nord . -# -# Only EAPI >=6 is supported - -case ${EAPI:-0} in - 6|7) ;; - *) die "EAPI not supported, bug ebuild mantainer" ;; -esac - -inherit cmake-utils - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/0xd34df00d/leechcraft.git" - - inherit git-r3 -else - DEPEND="app-arch/xz-utils" - SRC_URI="https://dist.leechcraft.org/LeechCraft/${PV}/leechcraft-${PV}.tar.xz" - S="${WORKDIR}/leechcraft-${PV}" -fi - -HOMEPAGE="https://leechcraft.org/" -LICENSE="Boost-1.0" - -# @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY -# @DEFAULT_UNSET -# @DESCRIPTION: -# Set this to the category of the plugin, if any. -: ${LEECHCRAFT_PLUGIN_CATEGORY:=} - -if [[ "${LEECHCRAFT_PLUGIN_CATEGORY}" ]]; then - CMAKE_USE_DIR="${S}"/src/plugins/${LEECHCRAFT_PLUGIN_CATEGORY}/${PN#lc-} -elif [[ ${PN} != lc-core ]]; then - CMAKE_USE_DIR="${S}"/src/plugins/${PN#lc-} -else - CMAKE_USE_DIR="${S}"/src -fi diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass deleted file mode 100644 index 68f401ee86..0000000000 --- a/eclass/mozextension.eclass +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# @ECLASS: mozextension.eclass -# @MAINTAINER: -# Mozilla team -# @BLURB: Install extensions for use in mozilla products. -# -if [[ ! ${_MOZEXTENSION} ]]; then - -# @ECLASS-VARIABLE: MOZEXTENSION_TARGET -# @DESCRIPTION: -# This variable allows the installation path for xpi_install -# to be overridden from the default app-global extensions path. -# Default is empty, which installs to predetermined hard-coded -# paths specified in the eclass. -: ${MOZEXTENSION_TARGET:=""} - -inherit eutils - -DEPEND="app-arch/unzip" - -mozversion_extension_location() { - case ${PN} in - firefox|firefox-bin|palemoon) - if [[ $(get_version_component_range 1) -ge 21 ]] ; then - return 0 - fi - ;; - esac - - return 1 -} - -xpi_unpack() { - local xpi xpiname srcdir - - # Not gonna use ${A} as we are looking for a specific option being passed to function - # You must specify which xpi to use - [[ -z "$*" ]] && die "Nothing passed to the $FUNCNAME command. please pass which xpi to unpack" - - for xpi in "$@"; do - einfo "Unpacking ${xpi} to ${PWD}" - xpiname=$(basename ${xpi%.*}) - - if [[ "${xpi:0:2}" != "./" ]] && [[ "${xpi:0:1}" != "/" ]] ; then - srcdir="${DISTDIR}/" - fi - - [[ -s "${srcdir}${xpi}" ]] || die "${xpi} does not exist" - - case "${xpi##*.}" in - ZIP|zip|jar|xpi) - mkdir "${WORKDIR}/${xpiname}" && \ - unzip -qo "${srcdir}${xpi}" -d "${WORKDIR}/${xpiname}" || die "failed to unpack ${xpi}" - ;; - *) - einfo "unpack ${xpi}: file format not recognized. Ignoring." - ;; - esac - done -} - - -xpi_install() { - local emid - - # You must tell xpi_install which xpi to use - [[ ${#} -ne 1 ]] && die "$FUNCNAME takes exactly one argument, please specify an xpi to unpack" - - x="${1}" - #cd ${x} - # determine id for extension - if [[ -f "${x}"/install.rdf ]]; then - emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ - || die "failed to determine extension id from install.rdf" - elif [[ -f "${x}"/manifest.json ]]; then - emid="$( sed -n 's/.*"id": "\(.*\)",/\1/p' "${x}"/manifest.json )" \ - || die "failed to determine extension id from manifest.json" - else - die "failed to determine extension id" - fi - - if [[ -n ${MOZEXTENSION_TARGET} ]]; then - insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/}/${emid} - elif $(mozversion_extension_location) ; then - insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} - else - insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} - fi - doins -r "${x}"/* || die "failed to copy extension" -} - -xpi_copy() { - local emid - - # You must tell xpi_install which xpi to use - [[ ${#} -ne 1 ]] && die "$FUNCNAME takes exactly one argument, please specify an xpi to unpack" - - x="${1}" - #cd ${x} - # determine id for extension - if [[ -f "${x}"/install.rdf ]]; then - emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ - || die "failed to determine extension id from install.rdf" - elif [[ -f "${x}"/manifest.json ]]; then - emid="$( sed -n 's/.*"id": "\([^"]*\)",.*/\1/p' "${x}"/manifest.json )" \ - || die "failed to determine extension id from manifest.json" - else - die "failed to determine extension id" - fi - - if [[ -n ${MOZEXTENSION_TARGET} ]]; then - insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/} - elif $(mozversion_extension_location) ; then - insinto "${MOZILLA_FIVE_HOME}"/browser/extensions - else - insinto "${MOZILLA_FIVE_HOME}"/extensions - fi - - newins "${DISTDIR%/}"/${x##*/}.xpi ${emid}.xpi -} - -_MOZEXTENSION=1 -fi diff --git a/eclass/myspell.eclass b/eclass/myspell.eclass deleted file mode 100644 index 5283842129..0000000000 --- a/eclass/myspell.eclass +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Author: Kevin F. Quinn -# Packages: app-dicts/myspell-* -# Maintainer: maintainer-needed@gentoo.org - -inherit multilib - -EXPORT_FUNCTIONS src_install pkg_preinst pkg_postinst - -IUSE="" - -SLOT="0" - -# tar, gzip, bzip2 are included in the base profile, but not unzip -DEPEND="app-arch/unzip" - -# Dictionaries don't have any runtime dependencies -# Myspell dictionaries can be used by hunspell, openoffice and others -RDEPEND="" - -# The destination directory for myspell dictionaries -MYSPELL_DICTBASE="/usr/share/myspell" - -# Legacy variable for dictionaries installed before eselect-oodict existed -# so has to remain for binpkg support. This variable is unmaintained - -# if you have a problem with it, emerge app-eselect/eselect-oodict. -# The location for openoffice softlinks -MYSPELL_OOOBASE="/usr/lib/openoffice/share/dict/ooo" - - -# set array "fields" to the elements of $1, separated by $2. -# This saves having to muck about with IFS all over the place. -set_fields() { - local old_IFS - old_IFS="${IFS}" - IFS=$2 - fields=($1) - IFS="${old_IFS}" -} - -# language is the second element of the ebuild name -# myspell-- -get_myspell_lang() { - local fields - set_fields "${P}" "-" - echo ${fields[1]} -} - -get_myspell_suffixes() { - case $1 in - DICT) echo ".aff .dic" ;; - HYPH) echo ".dic" ;; - THES) echo ".dat .idx" ;; - esac -} - -# OOo dictionary files are held on the mirrors, rather than -# being fetched direct from the OOo site as upstream doesn't -# change the name when they rebuild the dictionaries. -# -.zip becomes myspell---version.zip -get_myspell_ooo_uri() { - local files fields newfile filestem srcfile dict uris - files=() - uris="" - for dict in \ - "${MYSPELL_SPELLING_DICTIONARIES[@]}" \ - "${MYSPELL_HYPHENATION_DICTIONARIES[@]}" \ - "${MYSPELL_THESAURUS_DICTIONARIES[@]}"; do - set_fields "${dict}" "," - newfile=${fields[4]// } - for file in "${files[@]}"; do - [[ ${file} == ${newfile} ]] && continue 2 - done - filestem=${newfile/.zip} - files=("${files[@]}" "${newfile}") - srcfile="myspell-${filestem}-${PV}.zip" - [[ -z ${uris} ]] && - uris="mirror://gentoo/${srcfile}" || - uris="${uris} mirror://gentoo/${srcfile}" - done - echo "${uris}" -} - - -[[ -z ${SRC_URI} ]] && SRC_URI=$(get_myspell_ooo_uri) - -# Format of dictionary.lst files (from OOo standard -# dictionary.lst file): -# -# List of All Dictionaries to be Loaded by OpenOffice -# --------------------------------------------------- -# Each Entry in the list have the following space delimited fields -# -# Field 0: Entry Type "DICT" - spellchecking dictionary -# "HYPH" - hyphenation dictionary -# "THES" - thesaurus files -# -# Field 1: Language code from Locale "en" or "de" or "pt" ... -# -# Field 2: Country Code from Locale "US" or "GB" or "PT" -# -# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US" -# (do not add extensions to the name) - -# Format of MYSPELL_[SPELLING|HYPHENATION|THESAURUS]_DICTIONARIES: -# -# Field 0: Language code -# Field 1: Country code -# Field 2: Root name of dictionary files -# Field 3: Description -# Field 4: Archive filename -# -# This format is from the available.lst, hyphavail.lst and -# thesavail.lst files on the openoffice.org repository. - -myspell_src_install() { - local filen fields entry dictlst - cd "${WORKDIR}" - # Install the dictionary, hyphenation and thesaurus files. - # Create dictionary.lst. file containing the parts of - # OOo's dictionary.lst file for this language, indicating - # which dictionaries are relevant for each country variant - # of the language. - insinto ${MYSPELL_DICTBASE} - dictlst="dictionary.lst.$(get_myspell_lang)" - echo "# Autogenerated by ${CATEGORY}/${P}" > ${dictlst} - for entry in "${MYSPELL_SPELLING_DICTIONARIES[@]}"; do - set_fields "${entry}" "," - echo "DICT ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} - doins ${fields[2]}.aff || die "Missing ${fields[2]}.aff" - doins ${fields[2]}.dic || die "Missing ${fields[2]}.dic" - done - for entry in "${MYSPELL_HYPHENATION_DICTIONARIES[@]}"; do - set_fields "${entry}" "," - echo "HYPH ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} - doins ${fields[2]}.dic || die "Missing ${fields[2]}.dic" - done - for entry in "${MYSPELL_THESAURUS_DICTIONARIES[@]}"; do - set_fields "${entry}" "," - echo "THES ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} - doins ${fields[2]}.dat || die "Missing ${fields[2]}.dat" - doins ${fields[2]}.idx || die "Missing ${fields[2]}.idx" - done - doins ${dictlst} || die "Failed to install ${dictlst}" - # Install any txt files (usually README.txt) as documentation - for filen in *.txt; do - [[ -s ${filen} ]] && dodoc ${filen} - done -} - - -# Add entries in dictionary.lst. to OOo dictionary.lst -# and create softlinks indicated by dictionary.lst. -myspell_pkg_postinst() { - # Update for known applications - if has_version ">=app-eselect/eselect-oodict-20060706"; then - if has_version app-office/openoffice; then - eselect oodict set myspell-$(get_myspell_lang) - fi - if has_version app-office/openoffice-bin; then - # On AMD64, openoffice-bin is 32-bit so force ABI - has_multilib_profile && ABI=x86 - eselect oodict set myspell-$(get_myspell_lang) --libdir $(get_libdir) - fi - return - fi - if has_version app-eselect/eselect-oodict; then - eselect oodict set myspell-$(get_myspell_lang) - return - fi - - # Legacy code for dictionaries installed before eselect-oodict existed - # so has to remain for binpkg support. This code is unmaintained - - # if you have a problem with it, emerge app-eselect/eselect-oodict. - [[ -d ${MYSPELL_OOOBASE} ]] || return - # This stuff is here, not in src_install, as the softlinks are - # deliberately _not_ listed in the package database. - local dictlst entry fields prefix suffix suffixes filen - # Note; can only reach this point if ${MYSPELL_DICTBASE}/${dictlst} - # was successfully installed - dictlst="dictionary.lst.$(get_myspell_lang)" - while read entry; do - fields=(${entry}) - [[ ${fields[0]:0:1} == "#" ]] && continue - [[ -f ${MYSPELL_OOOBASE}/dictionary.lst ]] || \ - touch ${MYSPELL_OOOBASE}/dictionary.lst - grep "^${fields[0]} ${fields[1]} ${fields[2]} " \ - ${MYSPELL_OOOBASE}/dictionary.lst > /dev/null 2>&1 || - echo "${entry}" >> ${MYSPELL_OOOBASE}/dictionary.lst - for suffix in $(get_myspell_suffixes ${fields[0]}); do - filen="${fields[3]}${suffix}" - [[ -h ${MYSPELL_OOOBASE}/${filen} ]] && - rm -f ${MYSPELL_OOOBASE}/${filen} - [[ ! -f ${MYSPELL_OOOBASE}/${filen} ]] && - ln -s ${MYSPELL_DICTBASE}/${filen} \ - ${MYSPELL_OOOBASE}/${filen} - done - done < ${MYSPELL_DICTBASE}/${dictlst} -} - - -# Remove softlinks and entries in dictionary.lst - uses -# dictionary..lst from /usr/share/myspell -# Done in preinst (prerm happens after postinst, which overwrites -# the dictionary..lst file) -myspell_pkg_preinst() { - # Update for known applications - if has_version ">=app-eselect/eselect-oodict-20060706"; then - if has_version app-office/openoffice; then - # When building from source, the default library path is correct - eselect oodict unset myspell-$(get_myspell_lang) - fi - if has_version app-office/openoffice-bin; then - # On AMD64, openoffice-bin is 32-bit, so get 32-bit library directory - has_multilib_profile && ABI=x86 - eselect oodict unset myspell-$(get_myspell_lang) --libdir $(get_libdir) - fi - eselect oodict unset myspell-$(get_myspell_lang) --libdir $(get_libdir) - return - fi - # Previous versions of eselect-oodict didn't cater for -bin on amd64 - if has_version app-eselect/eselect-oodict; then - eselect oodict unset myspell-$(get_myspell_lang) - return - fi - - # Legacy code for dictionaries installed before eselect-oodict existed - # Don't delete this; needed for uninstalls and binpkg support. - # This code is unmaintained - if you have a problem with it, - # emerge app-eselect/eselect-oodict. - local filen dictlst entry fields removeentry suffix - dictlst="dictionary.lst.$(get_myspell_lang)" - [[ -d ${MYSPELL_OOOBASE} ]] || return - [[ -f ${MYSPELL_DICTBASE}/${dictlst} ]] || return - while read entry; do - fields=(${entry}) - [[ ${fields[0]:0:1} == "#" ]] && continue - [[ ${fields[3]} == "" ]] && continue - # Remove entry from dictionary.lst - sed -i -e "/^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$/ { d }" \ - ${MYSPELL_OOOBASE}/dictionary.lst - # See if any other entries in dictionary.lst match the current - # dictionary type and filename - grep "^${fields[0]} .* ${fields[3]}$" ${MYSPELL_OOOBASE}/dictionary.lst \ - 2>&1 > /dev/null && continue - # If no other entries match, remove relevant symlinks - for suffix in $(get_myspell_suffixes ${fields[0]}); do - filen="${fields[3]}${suffix}" - ewarn "Removing entry ${MYSPELL_OOOBASE}/${filen}" - [[ -h ${MYSPELL_OOOBASE}/${filen} ]] && - rm -f ${MYSPELL_OOOBASE}/${filen} - done - done < ${MYSPELL_DICTBASE}/${dictlst} -} diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass deleted file mode 100644 index 931297da59..0000000000 --- a/eclass/php-ext-source-r2.eclass +++ /dev/null @@ -1,378 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: php-ext-source-r2.eclass -# @MAINTAINER: -# Gentoo PHP team -# @AUTHOR: -# Author: Tal Peer -# Author: Stuart Herbert -# Author: Luca Longinotti -# Author: Jakub Moc (documentation) -# Author: Ole Markus With -# @SUPPORTED_EAPIS: 4 5 -# @BLURB: A unified interface for compiling and installing standalone PHP extensions. -# @DESCRIPTION: -# This eclass provides a unified interface for compiling and installing standalone -# PHP extensions (modules). - -inherit autotools multilib - -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install - -DEPEND=">=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" -RDEPEND="" - -# Because of USE deps, we require at least EAPI 2 -case ${EAPI} in - 4|5) ;; - *) - die "php-ext-source-r2 is not compatible with EAPI=${EAPI}" -esac - -# @ECLASS-VARIABLE: PHP_EXT_NAME -# @REQUIRED -# @DESCRIPTION: -# The extension name. This must be set, otherwise the eclass dies. -# Only automagically set by php-ext-pecl-r2.eclass, so unless your ebuild -# inherits that eclass, you must set this manually before inherit. -[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass" - -# @ECLASS-VARIABLE: PHP_EXT_INI -# @DESCRIPTION: -# Controls whether or not to add a line to php.ini for the extension. -# Defaults to "yes" and should not be changed in most cases. -[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes" - -# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT -# @DESCRIPTION: -# Controls whether the extension is a ZendEngine extension or not. -# Defaults to "no" and if you don't know what is it, you don't need it. -[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no" - -# @ECLASS-VARIABLE: USE_PHP -# @REQUIRED -# @DESCRIPTION: -# Lists the PHP slots compatibile the extension is compatibile with -# Example: -# @CODE -# USE_PHP="php5-5 php5-6" -# @CODE -[[ -z "${USE_PHP}" ]] && die "USE_PHP is not set for the php-ext-source-r2 eclass" - -# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE -# @DESCRIPTION: -# If set, this is the USE flag that the PHP dependencies are behind -# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind -# USE=php. - -# @ECLASS-VARIABLE: PHP_EXT_S -# @DESCRIPTION: -# The relative location of the temporary build directory for the PHP extension within -# the source package. This is useful for packages that bundle the PHP extension. -# Defaults to ${S} -[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}" - -#Make sure at least one target is installed. -REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " -for target in ${USE_PHP}; do - IUSE="${IUSE} php_targets_${target}" - target=${target/+} - REQUIRED_USE+="php_targets_${target} " - slot=${target/php} - slot=${slot/-/.} - PHPDEPEND="${PHPDEPEND} - php_targets_${target}? ( dev-lang/php:${slot} )" -done -REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" - -RDEPEND="${RDEPEND} - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } - ${PHPDEPEND} - ${PHP_EXT_OPTIONAL_USE:+ )}" - -DEPEND="${DEPEND} - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } - ${PHPDEPEND} - ${PHP_EXT_OPTIONAL_USE:+ )} -" - -# @FUNCTION: php-ext-source-r2_src_unpack -# @DESCRIPTION: -# runs standard src_unpack + _phpize - -# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE -# @DESCRIPTION: -# phpize will be run by default for all ebuilds that use -# php-ext-source-r2_src_unpack -# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize. - -php-ext-source-r2_src_unpack() { - unpack ${A} - local slot orig_s="${PHP_EXT_S}" - for slot in $(php_get_slots); do - cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory" - done -} - -php-ext-source-r2_src_prepare() { - local slot orig_s="${PHP_EXT_S}" - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - php-ext-source-r2_phpize - done -} - -# @FUNCTION: php-ext-source-r2_phpize -# @DESCRIPTION: -# Runs phpize and autotools in addition to the standard src_unpack -php-ext-source-r2_phpize() { - if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then - # Create configure out of config.m4. We use autotools_run_tool - # to avoid some warnings about WANT_AUTOCONF and - # WANT_AUTOMAKE (see bugs #329071 and #549268). - autotools_run_tool ${PHPIZE} - # force run of libtoolize and regeneration of related autotools - # files (bug 220519) - rm aclocal.m4 - eautoreconf - fi -} - -# @FUNCTION: php-ext-source-r2_src_configure -# @DESCRIPTION: -# Takes care of standard configure for PHP extensions (modules). - -# @ECLASS-VARIABLE: my_conf -# @DESCRIPTION: -# Set this in the ebuild to pass configure options to econf. - -php-ext-source-r2_src_configure() { - # net-snmp creates this file #385403 - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - # Set the correct config options - econf --with-php-config=${PHPCONFIG} ${my_conf} || die "Unable to configure code to compile" - done -} - -# @FUNCTION: php-ext-source-r2_src_compile -# @DESCRIPTION: -# Takes care of standard compile for PHP extensions (modules). -php-ext-source-r2_src_compile() { - # net-snmp creates this file #324739 - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - # shm extension createss a semaphore file #173574 - addpredict /session_mm_cli0.sem - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - emake || die "Unable to make code" - - done -} - -# @FUNCTION: php-ext-source-r2_src_install -# @DESCRIPTION: -# Takes care of standard install for PHP extensions (modules). - -# @ECLASS-VARIABLE: DOCS -# @DESCRIPTION: -# Set in ebuild if you wish to install additional, package-specific documentation. -php-ext-source-r2_src_install() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - - # Let's put the default module away. Strip $EPREFIX from - # $EXT_DIR before calling newins (which handles EPREFIX itself). - insinto "${EXT_DIR#$EPREFIX}" - newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" - - local doc - for doc in ${DOCS} ; do - [[ -s ${doc} ]] && dodoc ${doc} - done - - INSTALL_ROOT="${D}" emake install-headers - done - php-ext-source-r2_createinifiles -} - - -php_get_slots() { - local s slot - for slot in ${USE_PHP}; do - use php_targets_${slot} && s+=" ${slot/-/.}" - done - echo $s -} - -php_init_slot_env() { - libdir=$(get_libdir) - - PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize" - PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config" - PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php" - PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi" - PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" - PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}" - EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" - PHP_CURRENTSLOT=${1:3} - - PHP_EXT_S="${WORKDIR}/${1}" - cd "${PHP_EXT_S}" -} - -php-ext-source-r2_buildinilist() { - # Work out the list of .ini files to edit/add to - if [[ -z "${PHPSAPILIST}" ]] ; then - PHPSAPILIST="apache2 cli cgi fpm embed phpdbg" - fi - - PHPINIFILELIST="" - local x - for x in ${PHPSAPILIST} ; do - if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then - PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini" - fi - done - PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}" -} - -# @FUNCTION: php-ext-source-r2_createinifiles -# @DESCRIPTION: -# Builds ini files for every enabled slot and SAPI -php-ext-source-r2_createinifiles() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - # Pull in the PHP settings - - # Build the list of .ini files to edit/add to - php-ext-source-r2_buildinilist ${slot} - - - # Add the needed lines to the .ini files - local file - if [[ "${PHP_EXT_INI}" = "yes" ]] ; then - for file in ${PHPINIFILELIST}; do - php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}" - done - fi - - # Symlink the .ini files from ext/ to ext-active/ - local inifile - for inifile in ${PHPINIFILELIST} ; do - if [[ -n "${PHP_EXT_INIFILE}" ]]; then - cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${ED}/${inifile}" - einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}" - fi - inidir="${inifile/${PHP_EXT_NAME}.ini/}" - inidir="${inidir/ext/ext-active}" - dodir "/${inidir}" - dosym "/${inifile}" "/${inifile/ext/ext-active}" - done - - # Add support for installing PHP files into a version dependant directory - PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}" - done -} - -php-ext-source-r2_addextension() { - if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then - # We need the full path for ZendEngine extensions - # and we need to check for debugging enabled! - if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then - if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then - ext_type="zend_extension_debug_ts" - else - ext_type="zend_extension_ts" - fi - ext_file="${EXT_DIR}/${1}" - else - if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then - ext_type="zend_extension_debug" - else - ext_type="zend_extension" - fi - ext_file="${EXT_DIR}/${1}" - fi - - # php-5.3 unifies zend_extension loading and just requires the - # zend_extension keyword with no suffix - # TODO: drop previous code and this check once =dev-lang/php-5.3' ; then - ext_type="zend_extension" - fi - else - # We don't need the full path for normal extensions! - ext_type="extension" - ext_file="${1}" - fi - - php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added" -} - -# $1 - Setting name -# $2 - Setting value -# $3 - File to add to -# $4 - Sanitized text to output -php-ext-source-r2_addtoinifile() { - local inifile="${WORKDIR}/${3}" - if [[ ! -d $(dirname ${inifile}) ]] ; then - mkdir -p $(dirname ${inifile}) - fi - - # Are we adding the name of a section? - if [[ ${1:0:1} == "[" ]] ; then - echo "${1}" >> "${inifile}" - my_added="${1}" - else - echo "${1}=${2}" >> "${inifile}" - my_added="${1}=${2}" - fi - - if [[ -z "${4}" ]] ; then - einfo "Added '${my_added}' to /${3}" - else - einfo "${4} to /${3}" - fi - - insinto /$(dirname ${3}) - doins "${inifile}" -} - -# @FUNCTION: php-ext-source-r2_addtoinifiles -# @USAGE: [message to output]; or just [section name] -# @DESCRIPTION: -# Add value settings to php.ini file installed by the extension (module). -# You can also add a [section], see examples below. -# -# @CODE -# Add some settings for the extension: -# -# php-ext-source-r2_addtoinifiles "zend_optimizer.optimization_level" "15" -# php-ext-source-r2_addtoinifiles "zend_optimizer.enable_loader" "0" -# php-ext-source-r2_addtoinifiles "zend_optimizer.disable_licensing" "0" -# -# Adding values to a section in php.ini file installed by the extension: -# -# php-ext-source-r2_addtoinifiles "[Debugger]" -# php-ext-source-r2_addtoinifiles "debugger.enabled" "on" -# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on" -# @CODE -php-ext-source-r2_addtoinifiles() { - local x - for x in ${PHPFULLINIFILELIST} ; do - php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}" - done -} diff --git a/eclass/s6.eclass b/eclass/s6.eclass deleted file mode 100644 index 3252151549..0000000000 --- a/eclass/s6.eclass +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: s6.eclass -# @MAINTAINER: -# William Hubbs -# @SUPPORTED_EAPIS: 5 6 -# @BLURB: helper functions to install s6 services -# @DESCRIPTION: -# This eclass provides helpers to install s6 services. -# @EXAMPLE: -# -# @CODE -# inherit s6 -# -# src_install() { -# ... -# s6_install_service myservice "${FILESDIR}"/run-s6 "${FILESDIR}"/finish-s6 -# ... -# If you want a service to be logged, install the log service as -# shown here. -# s6_install_service myservice/log "${FILESDIR}"/log-run-s6 \ -# "${FILESDIR}"/log-finish-s6 -# ... -# } -# @CODE - -case ${EAPI:-0} in - 5|6) ;; - *) die "${ECLASS}.eclass: API in EAPI ${EAPI} not yet established" ;; -esac - -# @FUNCTION: _s6_get_servicedir -# @INTERNAL -# @DESCRIPTION: -# Get unprefixed servicedir. -_s6_get_servicedir() { - echo /var/svc.d -} - -# @FUNCTION: s6_get_servicedir -# @DESCRIPTION: -# Output the path for the s6 service directory (not including ${D}). -s6_get_servicedir() { - debug-print-function ${FUNCNAME} "${@}" - - echo "${EPREFIX}$(_s6_get_servicedir)" -} - -# @FUNCTION: s6_install_service -# @USAGE: servicename run finish -# @DESCRIPTION: -# Install an s6 service. -# servicename is the name of the service. -# run is the run script for the service. -# finish is the optional finish script for the service. -s6_install_service() { - debug-print-function ${FUNCNAME} "${@}" - - local name="$1" - local run="$2" - local finish="$3" - - [[ $name ]] || - die "${ECLASS}.eclass: you must specify the s6 service name" - [[ $run ]] || - die "${ECLASS}.eclass: you must specify the s6 service run script" - - ( - local servicepath="$(_s6_get_servicedir)/$name" - exeinto "$servicepath" - newexe "$run" run - [[ $finish ]] && newexe "$finish" finish - ) -} - -# @FUNCTION: s6_service_down -# @USAGE: servicename -# @DESCRIPTION: -# Install the "down" flag so this service will not be started by -# default. -# servicename is the name of the service. -s6_service_down() { - debug-print-function ${FUNCNAME} "${@}" - - local name="$1" - - [[ $name ]] || - die "${ECLASS}.eclass: you must specify the s6 service name" - - ( - touch "$T"/down || die - local servicepath="$(_s6_get_servicedir)/$name" - insinto "$servicepath" - doins "$T"/down - ) -} - -# @FUNCTION: s6_service_nosetsid -# @USAGE: servicename -# @DESCRIPTION: -# Install the "nosetsid" flag so this service will not be made a session -# leader. -# servicename is the name of the service. -s6_service_nosetsid() { - debug-print-function ${FUNCNAME} "${@}" - - local name="$1" - - [[ $name ]] || - die "${ECLASS}.eclass: you must specify the s6 service name" - - ( - touch "$T"/nosetsid || die - local servicepath="$(_s6_get_servicedir)/$name" - insinto "$servicepath" - doins "$T"/nosetsid - ) -} diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass deleted file mode 100644 index 0b691d8227..0000000000 --- a/eclass/toolchain-binutils.eclass +++ /dev/null @@ -1,502 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# Maintainer: Toolchain Ninjas -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 -# -# We install binutils into CTARGET-VERSION specific directories. This lets -# us easily merge multiple versions for multiple targets (if we wish) and -# then switch the versions on the fly (with `binutils-config`). -# -# binutils-9999 -> live git -# binutils-9999_preYYMMDD -> nightly snapshot date YYMMDD -# binutils-# -> normal release - -if [[ -n ${BINUTILS_TYPE} ]] ; then - BTYPE=${BINUTILS_TYPE} -else - case ${PV} in - 9999_pre*) BTYPE="snap";; - *.*.90) BTYPE="snap";; - *.*.*.*.*) BTYPE="hjlu";; - *) BTYPE="rel";; - esac -fi - -case ${BTYPE} in -snap) - BVER=${PV/9999_pre} - ;; -*) - BVER=${BINUTILS_VER:-${PV}} - ;; -esac - -inherit eutils libtool flag-o-matic gnuconfig multilib versionator unpacker -case ${EAPI:-0} in -0|1) - EXPORT_FUNCTIONS src_unpack src_compile src_test src_install pkg_postinst pkg_postrm ;; -2|3|4|5) - EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm ;; -*) die "unsupported EAPI ${EAPI}" ;; -esac - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -DESCRIPTION="Tools necessary to build programs" -HOMEPAGE="https://sourceware.org/binutils/" - -case ${BTYPE} in - snap) - SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2 - ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;; - hjlu) - SRC_URI="https://www.kernel.org/pub/linux/devel/binutils/binutils-${BVER}.tar." - version_is_at_least 2.21.51.0.5 && SRC_URI+="xz" || SRC_URI+="bz2" ;; - rel) SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.bz2" ;; -esac -add_src_uri() { - [[ -z $2 ]] && return - local a=$1 - if version_is_at_least 2.22.52.0.2 ; then - a+=".xz" - else - a+=".bz2" - fi - set -- mirror://gentoo https://dev.gentoo.org/~vapier/dist https://dev.gentoo.org/~tamiko/distfiles https://dev.gentoo.org/~dilfridge/distfiles - SRC_URI="${SRC_URI} ${@/%//${a}}" -} -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}} -add_src_uri binutils-${PATCH_BINUTILS_VER}-patches-${PATCHVER}.tar ${PATCHVER} -add_src_uri binutils-${PATCH_BINUTILS_VER}-uclibc-patches-${UCLIBC_PATCHVER}.tar ${UCLIBC_PATCHVER} -add_src_uri elf2flt-${ELF2FLT_VER}.tar ${ELF2FLT_VER} - -if version_is_at_least 2.18 ; then - LICENSE="|| ( GPL-3 LGPL-3 )" -else - LICENSE="|| ( GPL-2 LGPL-2 )" -fi -IUSE="cxx multitarget nls static-libs test vanilla" -if version_is_at_least 2.19 && ! version_is_at_least 2.26 ; then - IUSE+=" zlib" -fi -SLOT="${BVER}" - -RDEPEND=">=sys-devel/binutils-config-3" -if in_iuse zlib ; then - RDEPEND+=" zlib? ( sys-libs/zlib )" -elif version_is_at_least 2.26 ; then - RDEPEND+=" sys-libs/zlib" -fi -DEPEND="${RDEPEND} - test? ( dev-util/dejagnu ) - nls? ( sys-devel/gettext ) - sys-devel/flex - virtual/yacc" -if is_cross ; then - # The build assumes the host has libiberty and such when cross-compiling - # its build tools. We should probably make binutils itself build a local - # copy to use, but until then, be lazy. - DEPEND+=" >=sys-libs/binutils-libs-${PV}" -fi - -S=${WORKDIR}/binutils-${BVER} - -LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} -INCPATH=${LIBPATH}/include -DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} -MY_BUILDDIR=${WORKDIR}/build -if is_cross ; then - BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER} -else - BINPATH=/usr/${CTARGET}/binutils-bin/${BVER} -fi - -tc-binutils_unpack() { - unpacker ${A} - mkdir -p "${MY_BUILDDIR}" - [[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip -} - -# In case the ebuild wants to add a few of their own. -PATCHES=() - -tc-binutils_apply_patches() { - cd "${S}" - - if ! use vanilla ; then - if [[ -n ${PATCHVER} ]] ; then - EPATCH_SOURCE=${WORKDIR}/patch - if [[ ${CTARGET} == mips* ]] ; then - # remove gnu-hash for mips (bug #233233) - EPATCH_EXCLUDE+=" 77_all_generate-gnu-hash.patch" - fi - [[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \ - && EPATCH_SUFFIX="patch.bz2" \ - || EPATCH_SUFFIX="patch" - epatch - fi - if [[ -n ${UCLIBC_PATCHVER} ]] ; then - EPATCH_SOURCE=${WORKDIR}/uclibc-patches - [[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \ - && EPATCH_SUFFIX="patch.bz2" \ - || EPATCH_SUFFIX="patch" - EPATCH_MULTI_MSG="Applying uClibc fixes ..." \ - epatch - elif [[ ${CTARGET} == *-uclibc* ]] ; then - # starting with binutils-2.17.50.0.17, we no longer need - # uClibc patchsets :D - if grep -qs 'linux-gnu' "${S}"/ltconfig ; then - die "sorry, but this binutils doesn't yet support uClibc :(" - fi - fi - [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" - - # Make sure our explicit libdir paths don't get clobbered. #562460 - sed -i \ - -e 's:@bfdlibdir@:@libdir@:g' \ - -e 's:@bfdincludedir@:@includedir@:g' \ - {bfd,opcodes}/Makefile.in || die - - epatch_user - fi - - # fix locale issues if possible #122216 - if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then - einfo "Fixing misc issues in configure files" - for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do - ebegin " Updating ${f/${S}\/}" - patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ - || eerror "Please file a bug about this" - eend $? - done - fi - # fix conflicts with newer glibc #272594 - if [[ -e libiberty/testsuite/test-demangle.c ]] ; then - sed -i 's:\:get_line:g' libiberty/testsuite/test-demangle.c - fi - - # Fix po Makefile generators - sed -i \ - -e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \ - -e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \ - */po/Make-in || die "sed po's failed" - - # Run misc portage update scripts - gnuconfig_update - elibtoolize --portage --no-uclibc -} - -toolchain-binutils_src_unpack() { - tc-binutils_unpack - case ${EAPI:-0} in - 0|1) toolchain-binutils_src_prepare ;; - esac -} - -toolchain-binutils_src_prepare() { - tc-binutils_apply_patches -} - -_eprefix_init() { - has "${EAPI:-0}" 0 1 2 && ED=${D} EPREFIX= EROOT=${ROOT} -} - -# Intended for ebuilds to override to set their own versioning information. -toolchain-binutils_bugurl() { - printf "https://bugs.gentoo.org/" -} -toolchain-binutils_pkgversion() { - printf "Gentoo ${BVER}" - [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" -} - -toolchain-binutils_src_configure() { - _eprefix_init - - # make sure we filter $LINGUAS so that only ones that - # actually work make it through #42033 - strip-linguas -u */po - - # keep things sane - strip-flags - - local x - echo - for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do - einfo "$(printf '%10s' ${x}:) ${!x}" - done - echo - - cd "${MY_BUILDDIR}" - local myconf=() - - # enable gold if available (installed as ld.gold) - if use cxx ; then - if grep -q 'enable-gold=default' "${S}"/configure ; then - myconf+=( --enable-gold ) - # old ways - remove when 2.21 is stable - elif grep -q 'enable-gold=both/ld' "${S}"/configure ; then - myconf+=( --enable-gold=both/ld ) - elif grep -q 'enable-gold=both/bfd' "${S}"/configure ; then - myconf+=( --enable-gold=both/bfd ) - fi - if grep -q -e '--enable-plugins' "${S}"/ld/configure ; then - myconf+=( --enable-plugins ) - fi - fi - - use nls \ - && myconf+=( --without-included-gettext ) \ - || myconf+=( --disable-nls ) - - if in_iuse zlib ; then - # older versions did not have an explicit configure flag - export ac_cv_search_zlibVersion=$(usex zlib -lz no) - myconf+=( $(use_with zlib) ) - elif version_is_at_least 2.26 ; then - myconf+=( --with-system-zlib ) - fi - - # For bi-arch systems, enable a 64bit bfd. This matches - # the bi-arch logic in toolchain.eclass. #446946 - # We used to do it for everyone, but it's slow on 32bit arches. #438522 - case $(tc-arch) in - ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; - esac - - use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) - [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) - is_cross && myconf+=( - --with-sysroot="${EPREFIX}"/usr/${CTARGET} - --enable-poison-system-directories - ) - - # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ - # on everyone in alpha (for now), we'll just enable it when possible - has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) - has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) - - myconf+=( - --prefix="${EPREFIX}"/usr - --host=${CHOST} - --target=${CTARGET} - --datadir="${EPREFIX}"${DATAPATH} - --infodir="${EPREFIX}"${DATAPATH}/info - --mandir="${EPREFIX}"${DATAPATH}/man - --bindir="${EPREFIX}"${BINPATH} - --libdir="${EPREFIX}"${LIBPATH} - --libexecdir="${EPREFIX}"${LIBPATH} - --includedir="${EPREFIX}"${INCPATH} - --enable-obsolete - --enable-shared - --enable-threads - # Newer versions (>=2.27) offer a configure flag now. - --enable-relro - # Newer versions (>=2.24) make this an explicit option. #497268 - --enable-install-libiberty - --disable-werror - --with-bugurl="$(toolchain-binutils_bugurl)" - --with-pkgversion="$(toolchain-binutils_pkgversion)" - $(use_enable static-libs static) - ${EXTRA_ECONF} - # Disable modules that are in a combined binutils/gdb tree. #490566 - --disable-{gdb,libdecnumber,readline,sim} - # Strip out broken static link flags. - # https://gcc.gnu.org/PR56750 - --without-stage1-ldflags - ) - echo ./configure "${myconf[@]}" - "${S}"/configure "${myconf[@]}" || die - - # Prevent makeinfo from running in releases. It may not always be - # installed, and older binutils may fail with newer texinfo. - # Besides, we never patch the doc files anyways, so regenerating - # in the first place is useless. #193364 - # For older versions, it means we don't get any info pages at all. - # Oh well, tough luck. #294617 - if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then - sed -i \ - -e '/^MAKEINFO/s:=.*:= true:' \ - Makefile || die - fi -} - -toolchain-binutils_src_compile() { - _eprefix_init - case ${EAPI:-0} in - 0|1) toolchain-binutils_src_configure ;; - esac - - cd "${MY_BUILDDIR}" - emake all || die "emake failed" - - # only build info pages if we user wants them, and if - # we have makeinfo (may not exist when we bootstrap) - if type -p makeinfo > /dev/null ; then - emake info || die "make info failed" - fi - # we nuke the manpages when we're left with junk - # (like when we bootstrap, no perl -> no manpages) - find . -name '*.1' -a -size 0 -delete - - # elf2flt only works on some arches / targets - if [[ -n ${ELF2FLT_VER} ]] && [[ ${CTARGET} == *linux* || ${CTARGET} == *-elf* ]] ; then - cd "${WORKDIR}"/elf2flt-${ELF2FLT_VER} - - local x supported_arches=$(sed -n '/defined(TARGET_/{s:^.*TARGET_::;s:)::;p}' elf2flt.c | sort -u) - for x in ${supported_arches} UNSUPPORTED ; do - [[ ${CTARGET} == ${x}* ]] && break - done - - if [[ ${x} != "UNSUPPORTED" ]] ; then - append-flags -I"${S}"/include - myconf+=( - --with-bfd-include-dir=${MY_BUILDDIR}/bfd - --with-libbfd=${MY_BUILDDIR}/bfd/libbfd.a - --with-libiberty=${MY_BUILDDIR}/libiberty/libiberty.a - --with-binutils-ldscript-dir="${EPREFIX}"${LIBPATH}/ldscripts - ) - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die - emake || die "make elf2flt failed" - fi - fi -} - -toolchain-binutils_src_test() { - cd "${MY_BUILDDIR}" - emake -k check || die "check failed :(" -} - -toolchain-binutils_src_install() { - _eprefix_init - local x d - - cd "${MY_BUILDDIR}" - emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install || die - rm -rf "${ED}"/${LIBPATH}/bin - use static-libs || find "${ED}" -name '*.la' -delete - - # Newer versions of binutils get fancy with ${LIBPATH} #171905 - cd "${ED}"/${LIBPATH} - for d in ../* ; do - [[ ${d} == ../${BVER} ]] && continue - mv ${d}/* . || die - rmdir ${d} || die - done - - # Now we collect everything intp the proper SLOT-ed dirs - # When something is built to cross-compile, it installs into - # /usr/$CHOST/ by default ... we have to 'fix' that :) - if is_cross ; then - cd "${ED}"/${BINPATH} - for x in * ; do - mv ${x} ${x/${CTARGET}-} - done - - if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then - mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} - mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ - rm -r "${ED}"/usr/${CHOST}/{include,lib} - fi - fi - insinto ${INCPATH} - local libiberty_headers=( - # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. - demangle.h - dyn-string.h - fibheap.h - hashtab.h - libiberty.h - objalloc.h - splay-tree.h - ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die - if [[ -d ${ED}/${LIBPATH}/lib ]] ; then - mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ - rm -r "${ED}"/${LIBPATH}/lib - fi - - # Insert elf2flt where appropriate - if [[ -x ${WORKDIR}/elf2flt-${ELF2FLT_VER}/elf2flt ]] ; then - cd "${WORKDIR}"/elf2flt-${ELF2FLT_VER} - insinto ${LIBPATH}/ldscripts - doins elf2flt.ld || die "doins elf2flt.ld failed" - exeinto ${BINPATH} - doexe elf2flt flthdr || die "doexe elf2flt flthdr failed" - mv "${ED}"/${BINPATH}/{ld,ld.real} || die - newexe ld-elf2flt ld || die "doexe ld-elf2flt failed" - newdoc README README.elf2flt - fi - - # Generate an env.d entry for this binutils - insinto /etc/env.d/binutils - cat <<-EOF > "${T}"/env.d - TARGET="${CTARGET}" - VER="${BVER}" - LIBPATH="${EPREFIX}${LIBPATH}" - EOF - newins "${T}"/env.d ${CTARGET}-${BVER} - - # Handle documentation - if ! is_cross ; then - cd "${S}" - dodoc README - docinto bfd - dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO - docinto binutils - dodoc binutils/ChangeLog binutils/NEWS binutils/README - docinto gas - dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* - docinto gprof - dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl - docinto ld - dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO - docinto libiberty - dodoc libiberty/ChangeLog* libiberty/README - docinto opcodes - dodoc opcodes/ChangeLog* - fi - # Remove shared info pages - rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} - # Trim all empty dirs - find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null -} - -toolchain-binutils_pkg_postinst() { - _eprefix_init - # Make sure this ${CTARGET} has a binutils version selected - [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 - binutils-config ${CTARGET}-${BVER} -} - -toolchain-binutils_pkg_postrm() { - _eprefix_init - local current_profile=$(binutils-config -c ${CTARGET}) - - # If no other versions exist, then uninstall for this - # target ... otherwise, switch to the newest version - # Note: only do this if this version is unmerged. We - # rerun binutils-config if this is a remerge, as - # we want the mtimes on the symlinks updated (if - # it is the same as the current selected profile) - if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then - local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') - choice=${choice//$'\n'/ } - choice=${choice/* } - if [[ -z ${choice} ]] ; then - binutils-config -u ${CTARGET} - else - binutils-config ${choice} - fi - elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then - binutils-config ${CTARGET}-${BVER} - fi -} diff --git a/eclass/vala.eclass b/eclass/vala.eclass deleted file mode 100644 index f5a6debf37..0000000000 --- a/eclass/vala.eclass +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: vala.eclass -# @MAINTAINER: -# gnome@gentoo.org -# @AUTHOR: -# Alexandre Rostovtsev -# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 -# @BLURB: Sets up the environment for using a specific version of vala. -# @DESCRIPTION: -# This eclass sets up commonly used environment variables for using a specific -# version of dev-lang/vala to configure and build a package. It is needed for -# packages whose build systems assume the existence of certain unversioned vala -# executables, pkgconfig files, etc., which Gentoo does not provide. -# -# This eclass provides one phase function: src_prepare. - -inherit eutils multilib - -case "${EAPI:-0}" in - 0) die "EAPI=0 is not supported" ;; - 1) ;; - *) EXPORT_FUNCTIONS src_prepare ;; -esac - -# @ECLASS-VARIABLE: VALA_MIN_API_VERSION -# @DESCRIPTION: -# Minimum vala API version (e.g. 0.36). -VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.36} - -# @ECLASS-VARIABLE: VALA_MAX_API_VERSION -# @DESCRIPTION: -# Maximum vala API version (e.g. 0.36). -VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.44} - -# @ECLASS-VARIABLE: VALA_USE_DEPEND -# @DEFAULT_UNSET -# @DESCRIPTION: -# USE dependencies that vala must be built with (e.g. vapigen). - -# @FUNCTION: vala_api_versions -# @DESCRIPTION: -# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to -# VALA_MIN_API_VERSION. -vala_api_versions() { - [[ ${VALA_MIN_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MIN_API_VERSION" - [[ ${VALA_MAX_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MAX_API_VERSION" - - local minimal_supported_minor_version minor_version - - # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}. - minimal_supported_minor_version="36" - - for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do - # 0.38 was never in main tree; remove the special case once minimal_supported_minor_version >= 40 - if ((minor_version >= minimal_supported_minor_version)) && ((minor_version != 38)); then - echo "0.${minor_version}" - fi - done -} - -# Outputs VALA_USE_DEPEND as a a USE-dependency string -_vala_use_depend() { - local u="" vala_use - - if [[ -n ${VALA_USE_DEPEND} ]]; then - for vala_use in ${VALA_USE_DEPEND}; do - case ${vala_use} in - vapigen) u="${u},${vala_use}(+)" ;; - valadoc) u="${u},${vala_use}(-)" ;; - esac - done - u="[${u#,}]" - fi - - echo -n "${u}" -} - -# @FUNCTION: vala_depend -# @DESCRIPTION: -# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to -# VALA_MIN_API_VERSION -vala_depend() { - local u v - u=$(_vala_use_depend) - - echo -n "|| (" - for v in $(vala_api_versions); do - echo -n " dev-lang/vala:${v}${u}" - done - echo " )" -} - -# @FUNCTION: vala_best_api_version -# @DESCRIPTION: -# Returns the highest installed vala API version satisfying -# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND. -vala_best_api_version() { - local u v - u=$(_vala_use_depend) - - for v in $(vala_api_versions); do - has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return - done -} - -# @FUNCTION: vala_src_prepare -# @USAGE: [--ignore-use] [--vala-api-version api_version] -# @DESCRIPTION: -# Sets up the environment variables and pkgconfig files for the -# specified API version, or, if no version is specified, for the -# highest installed vala API version satisfying -# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND. -# Is a no-op if called without --ignore-use when USE=-vala. -# Dies if the USE check is passed (or ignored) and a suitable vala -# version is not available. -vala_src_prepare() { - local p d valafoo version ignore_use - - while [[ $1 ]]; do - case $1 in - "--ignore-use" ) - ignore_use=1 ;; - "--vala-api-version" ) - shift - version=$1 - [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter." - esac - shift - done - - if [[ -z ${ignore_use} ]]; then - in_iuse vala && ! use vala && return 0 - fi - - if [[ ${version} ]]; then - has_version "dev-lang/vala:${version}" || die "No installed vala:${version}" - else - version=$(vala_best_api_version) - [[ ${version} ]] || die "No installed vala in $(vala_depend)" - fi - - export VALAC=$(type -P valac-${version}) - - valafoo=$(type -P vala-gen-introspect-${version}) - [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT="${valafoo}" - - valafoo=$(type -P vapigen-${version}) - [[ ${valafoo} ]] && export VAPIGEN="${valafoo}" - - valafoo=$(type -P valadoc-${version}) - [[ ${valafoo} ]] && has valadoc ${VALA_USE_DEPEND} && export VALADOC="${valafoo}" - - valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen" - [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}" - - export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi" - - mkdir -p "${T}/pkgconfig" || die "mkdir failed" - for p in libvala vapigen; do - for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do - if [[ -e ${d}/${p}-${version}.pc ]]; then - ln -s "${d}/${p}-${version}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed" - break - fi - done - done - : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"} - export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}" -} From 77d46b6a52e9daff3a3634d1f5121e8b303ca9c3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 14:02:22 +0100 Subject: [PATCH 14/18] eclass/golang-vcs: Sync with gentoo It's from gentoo commit 7f8297d319da8a7fe6680217ad8362b46ac1c95a. --- eclass/golang-vcs.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass index 561d1a0c4d..6492fe4378 100644 --- a/eclass/golang-vcs.eclass +++ b/eclass/golang-vcs.eclass @@ -1,16 +1,18 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-vcs.eclass # @MAINTAINER: # William Hubbs # @SUPPORTED_EAPIS: 5 6 7 +# @PROVIDES: golang-base # @BLURB: Eclass for fetching and unpacking go repositories. +# @DEPRECATED: go-module.eclass # @DESCRIPTION: # This eclass is written to ease the maintenance of live ebuilds # of software written in the Go programming language. -inherit eutils golang-base +inherit estack eutils golang-base case "${EAPI:-0}" in 5|6|7) @@ -26,6 +28,8 @@ if [[ -z ${_GOLANG_VCS} ]]; then _GOLANG_VCS=1 +PROPERTIES+=" live" + # @ECLASS-VARIABLE: EGO_PN # @REQUIRED # @DESCRIPTION: @@ -39,6 +43,7 @@ _GOLANG_VCS=1 # @CODE # @ECLASS-VARIABLE: EGO_STORE_DIR +# @USER_VARIABLE # @DESCRIPTION: # Storage directory for Go sources. # From faf48a24aa765ab7613b2a3fa18a735460f0a77a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 14:05:13 +0100 Subject: [PATCH 15/18] eclass/java-pkg-opt-2: Sync with gentoo It's from gentoo commit 52a0505f9cb31b0181a633dcbacf0b1c8b262cb3. --- eclass/java-pkg-opt-2.eclass | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index fa72421a0d..92f2cb5314 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2015 Gentoo Foundation +# Copyright 2004-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-opt-2.eclass @@ -6,11 +6,21 @@ # java@gentoo.org # @AUTHOR: # Thomas Matthijs +# @SUPPORTED_EAPIS: 5 6 7 8 +# @PROVIDES: java-utils-2 # @BLURB: Eclass for package with optional Java support # @DESCRIPTION: # Inherit this eclass instead of java-pkg-2 if you only need optional Java # support. +case ${EAPI:-0} in + [5678]) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + +if [[ -z ${_JAVA_PKG_OPT_2_ECLASS} ]] ; then +_JAVA_PKG_OPT_2_ECLASS=1 + inherit java-utils-2 # @ECLASS-VARIABLE: JAVA_PKG_OPT_USE @@ -24,11 +34,6 @@ RDEPEND="${DEPEND}" # See java-pkg-2.eclass for JAVA_PKG_IUSE documentation IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}" -case "${EAPI:-0}" in - 0|1) EXPORT_FUNCTIONS pkg_setup pkg_preinst ;; - *) EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst ;; -esac - # @FUNCTION: java-pkg-opt-2_pkg_setup # @DESCRIPTION: # default pkg_setup, wrapper for java-utils-2_pkg_init @@ -58,3 +63,7 @@ java-pkg-opt-2_src_prepare() { java-pkg-opt-2_pkg_preinst() { use ${JAVA_PKG_OPT_USE} && java-utils-2_pkg_preinst } + +fi + +EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst From 1da76fd14a89c1d2dde9a50b6d3cab1cdca92573 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 14:09:23 +0100 Subject: [PATCH 16/18] eclass/mount-boot: Sync with gentoo It's from gentoo commit 33bb454c9678ab13d58662a07a143f1bee47cafe. --- eclass/mount-boot.eclass | 145 ++++++++++++++------------------------- 1 file changed, 51 insertions(+), 94 deletions(-) diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass index 4d886c8d84..3111d9dcb9 100644 --- a/eclass/mount-boot.eclass +++ b/eclass/mount-boot.eclass @@ -1,32 +1,38 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mount-boot.eclass # @MAINTAINER: # base-system@gentoo.org +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: functions for packages that install files into /boot # @DESCRIPTION: # This eclass is really only useful for bootloaders. # # If the live system has a separate /boot partition configured, then this # function tries to ensure that it's mounted in rw mode, exiting with an -# error if it can't. It does nothing if /boot isn't a separate partition. +# error if it can't. It does nothing if /boot isn't a separate partition. + +case ${EAPI:-0} in + 6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac EXPORT_FUNCTIONS pkg_pretend pkg_preinst pkg_postinst pkg_prerm pkg_postrm -# @FUNCTION: mount-boot_disabled +# @FUNCTION: mount-boot_is_disabled # @INTERNAL # @DESCRIPTION: # Detect whether the current environment/build settings are such that we do not # want to mess with any mounts. mount-boot_is_disabled() { - # Since this eclass only deals with /boot, skip things when ROOT is active. - if [[ "${ROOT:-/}" != "/" ]] ; then + # Since this eclass only deals with /boot, skip things when EROOT is active. + if [[ ${EROOT:-/} != / ]] ; then return 0 fi # If we're only building a package, then there's no need to check things. - if [[ "${MERGE_TYPE}" == "buildonly" ]] ; then + if [[ ${MERGE_TYPE} == buildonly ]] ; then return 0 fi @@ -42,115 +48,66 @@ mount-boot_is_disabled() { # @FUNCTION: mount-boot_check_status # @INTERNAL # @DESCRIPTION: -# Figure out what kind of work we need to do in order to have /boot be sane. -# Return values are: -# 0 - Do nothing at all! -# 1 - It's mounted, but is currently ro, so need to remount rw. -# 2 - It's not mounted, so need to mount it rw. +# Check if /boot is sane, i.e., mounted as read-write if on a separate +# partition. Die if conditions are not fulfilled. If nonfatal is used, +# the function will return a non-zero status instead. mount-boot_check_status() { # Get out fast if possible. mount-boot_is_disabled && return 0 # note that /dev/BOOT is in the Gentoo default /etc/fstab file - local fstabstate=$(awk '!/^#|^[[:blank:]]+#|^\/dev\/BOOT/ {print $2}' /etc/fstab | egrep "^/boot$" ) - local procstate=$(awk '$2 ~ /^\/boot$/ {print $2}' /proc/mounts) - local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/\/boot .*,ro,/p') - - if [ -n "${fstabstate}" ] && [ -n "${procstate}" ] ; then - if [ -n "${proc_ro}" ] ; then - echo - einfo "Your boot partition, detected as being mounted at /boot, is read-only." - einfo "It will be remounted in read-write mode temporarily." - return 1 - else - echo - einfo "Your boot partition was detected as being mounted at /boot." - einfo "Files will be installed there for ${PN} to function correctly." - return 0 - fi - elif [ -n "${fstabstate}" ] && [ -z "${procstate}" ] ; then - echo - einfo "Your boot partition was not mounted at /boot, so it will be automounted for you." - einfo "Files will be installed there for ${PN} to function correctly." - return 2 - else - echo + local fstabstate=$(awk '!/^[[:blank:]]*#|^\/dev\/BOOT/ && $2 == "/boot" \ + { print 1; exit }' /etc/fstab || die "awk failed") + + if [[ -z ${fstabstate} ]] ; then einfo "Assuming you do not have a separate /boot partition." return 0 fi -} -mount-boot_pkg_pretend() { - # Get out fast if possible. - mount-boot_is_disabled && return 0 + local procstate=$(awk '$2 == "/boot" { split($4, a, ","); \ + for (i in a) if (a[i] ~ /^r[ow]$/) { print a[i]; break }; exit }' \ + /proc/mounts || die "awk failed") - elog "To avoid automounting and auto(un)installing with /boot," - elog "just export the DONT_MOUNT_BOOT variable." - mount-boot_check_status + if [[ -z ${procstate} ]] ; then + eerror "Your boot partition is not mounted at /boot." + eerror "Please mount it and retry." + die -n "/boot not mounted" + return 1 + fi + + if [[ ${procstate} == ro ]] ; then + eerror "Your boot partition, detected as being mounted at /boot," \ + "is read-only." + eerror "Please remount it as read-write and retry." + die -n "/boot mounted read-only" + return 2 + fi + + einfo "Your boot partition was detected as being mounted at /boot." + einfo "Files will be installed there for ${PN} to function correctly." + return 0 } -mount-boot_mount_boot_partition() { +mount-boot_pkg_pretend() { mount-boot_check_status - case $? in - 0) # Nothing to do. - ;; - 1) # Remount it rw. - mount -o remount,rw /boot - if [ $? -ne 0 ] ; then - echo - eerror "Unable to remount in rw mode. Please do it manually!" - die "Can't remount in rw mode. Please do it manually!" - fi - touch /boot/.e.remount - ;; - 2) # Mount it rw. - mount /boot -o rw - if [ $? -ne 0 ] ; then - echo - eerror "Cannot automatically mount your /boot partition." - eerror "Your boot partition has to be mounted rw before the installation" - eerror "can continue. ${PN} needs to install important files there." - die "Please mount your /boot partition manually!" - fi - touch /boot/.e.mount - ;; - esac } mount-boot_pkg_preinst() { - # Handle older EAPIs. - case ${EAPI:-0} in - [0-3]) mount-boot_pkg_pretend ;; - esac - - mount-boot_mount_boot_partition + mount-boot_check_status } mount-boot_pkg_prerm() { - touch "${ROOT}"/boot/.keep 2>/dev/null - mount-boot_mount_boot_partition - touch "${ROOT}"/boot/.keep 2>/dev/null -} - -mount-boot_umount_boot_partition() { - # Get out fast if possible. - mount-boot_is_disabled && return 0 + mount-boot_check_status - if [ -e /boot/.e.remount ] ; then - einfo "Automatically remounting /boot as ro as it was previously." - rm -f /boot/.e.remount - mount -o remount,ro /boot - elif [ -e /boot/.e.mount ] ; then - einfo "Automatically unmounting /boot as it was previously." - rm -f /boot/.e.mount - umount /boot + if [[ -z ${EPREFIX} ]] \ + && ! ( shopt -s failglob; : "${EROOT}"/boot/.keep* ) 2>/dev/null + then + # Create a .keep file, in case it is shadowed at the mount point + touch "${EROOT}"/boot/.keep 2>/dev/null fi } -mount-boot_pkg_postinst() { - mount-boot_umount_boot_partition -} +# No-op phases for backwards compatibility +mount-boot_pkg_postinst() { :; } -mount-boot_pkg_postrm() { - mount-boot_umount_boot_partition -} +mount-boot_pkg_postrm() { :; } From 6bd11ebb4a9debbe86e76e500af1dcae82e48f6e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Feb 2022 14:09:57 +0100 Subject: [PATCH 17/18] eclass/golang-vcs-snapshot: Sync with gentoo It's from gentoo commit 7f8297d319da8a7fe6680217ad8362b46ac1c95a. --- eclass/golang-vcs-snapshot.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass index 3a35d7e1aa..fb1e3c4a1e 100644 --- a/eclass/golang-vcs-snapshot.eclass +++ b/eclass/golang-vcs-snapshot.eclass @@ -1,12 +1,13 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-vcs-snapshot.eclass # @MAINTAINER: # William Hubbs # @SUPPORTED_EAPIS: 5 6 7 -# @BLURB: support eclass for unpacking VCS snapshot tarballs for -# software written in the Go programming language +# @PROVIDES: golang-base +# @BLURB: eclass to unpack VCS snapshot tarballs for Go software +# @DEPRECATED: go-module.eclass # @DESCRIPTION: # This eclass provides a convenience src_unpack() which unpacks the # first tarball mentioned in SRC_URI to its appropriate location in From fcb4df8159814079f75c43ff501121027af7a88f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 24 Feb 2022 15:06:28 +0100 Subject: [PATCH 18/18] changelog: Add entry --- changelog/updates/2022-02-23-update-pkgs-2015.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/updates/2022-02-23-update-pkgs-2015.md diff --git a/changelog/updates/2022-02-23-update-pkgs-2015.md b/changelog/updates/2022-02-23-update-pkgs-2015.md new file mode 100644 index 0000000000..7b6cf1269a --- /dev/null +++ b/changelog/updates/2022-02-23-update-pkgs-2015.md @@ -0,0 +1 @@ +- bridge-utils ([1.7.1](https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/log/?h=v1.7.1))